You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by co...@apache.org on 2017/06/13 14:16:38 UTC
[2/2] syncope git commit: Fixing a few references to syncopeDataSource
Fixing a few references to syncopeDataSource
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f9031b67
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f9031b67
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f9031b67
Branch: refs/heads/master
Commit: f9031b674f4be7c2994a556626319679e09f9ed5
Parents: 9f979f6
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jun 13 14:54:32 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jun 13 15:16:32 2017 +0100
----------------------------------------------------------------------
deb/core/src/deb/tomcat8/syncope.xml | 4 ++--
src/main/asciidoc/getting-started/obtain.adoc | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9031b67/deb/core/src/deb/tomcat8/syncope.xml
----------------------------------------------------------------------
diff --git a/deb/core/src/deb/tomcat8/syncope.xml b/deb/core/src/deb/tomcat8/syncope.xml
index 7581654..b06a129 100644
--- a/deb/core/src/deb/tomcat8/syncope.xml
+++ b/deb/core/src/deb/tomcat8/syncope.xml
@@ -25,7 +25,7 @@ under the License.
<!-- Sample PostgreSQL Data source
- <Resource name="jdbc/syncopeDataSource" auth="Container"
+ <Resource name="jdbc/syncopeMasterDataSource" auth="Container"
type="javax.sql.DataSource" driverClassName="org.postgresql.Driver"
url="jdbc:postgresql://127.0.0.1:5432/syncope"
username="syncope" password="password" maxActive="20" maxIdle="10"
@@ -34,7 +34,7 @@ under the License.
<!-- https://cwiki.apache.org/confluence/display/SYNCOPE/Run+Syncope+in+real+environments
- <Resource name="jdbc/syncopeDataSource" 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"
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9031b67/src/main/asciidoc/getting-started/obtain.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/getting-started/obtain.adoc b/src/main/asciidoc/getting-started/obtain.adoc
index 84d6efa..1dda45a 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -196,7 +196,7 @@ operating system. +
. http://maven.apache.org/[Apache Maven^] (version 3.0.3 or higher) installed
. one of the supported <<internal-storage,DBMSes>> up and running
. one of the supported <<java-ee-container, Java EE containers>> up and running
- . A datasource with the name `syncopeDataSource` configured in the selected Java EE container, for a database instance in the
+ . A datasource with the name `syncopeMasterDataSource` configured in the selected Java EE container, for a database instance in the
DBMS of choice
[WARNING]