Repository: syncope Updated Branches: refs/heads/master 4f6c1dac9 -> 8cee38084
Fixing JNDI name for DataSource Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c6262057 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c6262057 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c6262057 Branch: refs/heads/master Commit: c6262057436ec99ee9d6b7b7c6665f824ce32b28 Parents: 4f6c1da Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Tue Jun 13 11:10:33 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Tue Jun 13 13:23:10 2017 +0200 ---------------------------------------------------------------------- .../systemadministration/javaeecontainer.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/c6262057/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc index 4111342..18a049e 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc @@ -40,7 +40,7 @@ domain and MySQL): please also check that the connection parameters are the same [source,xml] .... -<Resource name="jdbc/MasterDataSource" auth="Container" type="javax.sql.DataSource" +<Resource name="jdbc/syncopeMasterDataSource" auth="Container" type="javax.sql.DataSource" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" testWhileIdle="true" testOnBorrow="true" testOnReturn="true" validationQuery="SELECT 1" validationInterval="30000" maxActive="100" minIdle="2" maxWait="10000" initialSize="2" removeAbandonedTimeout="20000" @@ -62,13 +62,13 @@ When using a datasource for internal storage, be sure to add [source,xml] .... <resource-ref> - <res-ref-name>jdbc/MasterDataSource</res-ref-name> - <jndi-name>jdbc/MasterDataSource</jndi-name> + <res-ref-name>jdbc/syncopeMasterDataSource</res-ref-name> + <jndi-name>jdbc/syncopeMasterDataSource</jndi-name> </resource-ref> .... right after `</context-root>` in `core/src/main/webapp/WEB-INF/glassfish-web.xml`, assuming that your Glassfish instance -provides a datasource named `jdbc/MasterDataSource`. +provides a datasource named `jdbc/syncopeMasterDataSource`. ===== Wildfly 9 and 10
