instrumented port in context template; named jndi datasource resource after application id

templates/default/context.xml.erb

@@ -2,8 +2,8 @@
         debug="5" reloadable="true" crossContext="true" allowLinking="true">
   <Environment name="appEnvironment" value="<%= node['app_environment'] %>"
           type="java.lang.String" override="false"/>
-  <Resource name="jdbc/<%= @database['database'] %>" auth="Container" type="javax.sql.DataSource"
+  <Resource name="jdbc/<%= @app %>" auth="Container" type="javax.sql.DataSource"
                maxActive="<%= @database['max_active'] %>" maxIdle="<%= @database['max_idle'] %>" maxWait="<%= @database['max_wait'] %>"
                username="<%= @database['username'] %>" password="<%= @database['password'] %>" driverClassName="<%= @database['driver'] %>"
-               url="jdbc:<%= @database['adapter'] %>://<%= @host %>:3306/<%= @database['database'] %>"/>
+               url="jdbc:<%= @database['adapter'] %>://<%= @host %>:<%= @database['port'] %>/<%= @database['database'] %>"/>
 </Context>