Merge pull request #1029 from phongphan/glassfish-jndi

Detect changed for JNDI datasource which using jndi: prefix and its documentation

Author: asolntsev

documentation/manual/configuration.textile

@@ -266,7 +266,11 @@ To reuse an existing Datasource from your application server:
 
 bc. db=java:/comp/env/jdbc/myDatasource@
 
-If you specify a @Datasource@, the database plugin detects the pattern @db=java:@ and will de-activate the default JDBC system.
+And for application server where Datasource doesn't have @java:@ prefix (Glassfish and its derivative), you could use @jndi:@ instead. The @jndi:@ prefix will be omitted:
+
+bc. db=jndi:jdbc/myDataSource
+
+If you specify a @Datasource@, the database plugin detects the pattern @db=java:@ and @db=jndi:@ and will de-activate the default JDBC system.
 
 Default: none.
 

framework/src/play/db/DBConfig.java

@@ -438,7 +438,8 @@ private boolean changed(String propsPrefix) {
             p.put(propsPrefix + ".pass", "");
         }
 
-        if (p.getProperty(propsPrefix, "").startsWith("java:") && p.getProperty(propsPrefix + ".url") == null) {
+        String datasourceName = p.getProperty(propsPrefix, "");
+        if ((datasourceName.startsWith("java:") || datasourceName.startsWith("jndi:")) && p.getProperty(propsPrefix + ".url") == null) {
             if (datasource == null) {
                 return true;
             }