[1/4] syncope git commit: Fixing JNDI name for DataSource

[ilgrosso]

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ò 
Authored: Tue Jun 13 11:10:33 2017 +0200
Committer: Francesco Chicchiriccò 
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]
 
-
-  jdbc/MasterDataSource
-  jdbc/MasterDataSource
+  jdbc/syncopeMasterDataSource
+  jdbc/syncopeMasterDataSource
 
 
 
 right after `` 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
 

[1/4] syncope git commit: Fixing JNDI name for DataSource

[ilgrosso]

Repository: syncope
Updated Branches:
  refs/heads/2_0_X b6ae826a6 -> 1bf49e3fd


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/ddf2d5ee
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ddf2d5ee
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ddf2d5ee

Branch: refs/heads/2_0_X
Commit: ddf2d5ee90825df1e3fbc77bd67d3f858afff689
Parents: b6ae826
Author: Francesco Chicchiriccò 
Authored: Tue Jun 13 11:10:33 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Tue Jun 13 11:10:33 2017 +0200

--
 .../systemadministration/javaeecontainer.adoc| 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/ddf2d5ee/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 58c4b59..a7ea928 100644
--- 
a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
+++ 
b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
@@ -42,7 +42,7 @@ domain and MySQL): please also check that the connection 
parameters are the same
 
 [source,xml]
 
-
-  jdbc/MasterDataSource
-  jdbc/MasterDataSource
+  jdbc/syncopeMasterDataSource
+  jdbc/syncopeMasterDataSource
 
 
 
 right after `` 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