Merge pull request #1026 from phongphan/jndi-prefix-doc-config

Add documentation for jndi: prefix support
playframework · Nov 14, 2016 · 78b0eb0 · 78b0eb0
2 parents 29ea622 + 7f9c01f
commit 78b0eb0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/documentation/manual/configuration.textile b/documentation/manual/configuration.textile
@@ -295,7 +295,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.