[SYNCOPE-1084] Running MySQL fine with HikariCP
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8cee3808 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8cee3808 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8cee3808 Branch: refs/heads/master Commit: 8cee38084c20592ecb80c5cd0caf3e2127bda6af Parents: be06f86 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Tue Jun 13 12:59:07 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Tue Jun 13 13:23:21 2017 +0200 ---------------------------------------------------------------------- fit/core-reference/pom.xml | 4 ++-- .../src/main/resources/mysql/domains/Master.properties | 2 +- .../systemadministration/dbms.adoc | 4 ++-- .../systemadministration/javaeecontainer.adoc | 10 ++++++---- 4 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/8cee3808/fit/core-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 83454f2..7d395d7 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -524,7 +524,7 @@ under the License. <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.39</version> + <version>5.1.42</version> <scope>test</scope> </dependency> </dependencies> @@ -560,7 +560,7 @@ under the License. <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> - <version>1.5.9</version> + <version>1.6.1</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/syncope/blob/8cee3808/fit/core-reference/src/main/resources/mysql/domains/Master.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/mysql/domains/Master.properties b/fit/core-reference/src/main/resources/mysql/domains/Master.properties index ce7251f..ce09eec 100644 --- a/fit/core-reference/src/main/resources/mysql/domains/Master.properties +++ b/fit/core-reference/src/main/resources/mysql/domains/Master.properties @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. Master.driverClassName=com.mysql.jdbc.Driver -Master.url=jdbc:mysql://localhost:3306/syncope?characterEncoding=UTF-8 +Master.url=jdbc:mysql://localhost:3306/syncope?characterEncoding=UTF-8&relaxAutoCommit=true Master.schema= Master.username=syncope Master.password=syncope http://git-wip-us.apache.org/repos/asf/syncope/blob/8cee3808/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc index 2734785..4849c60 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbms.adoc @@ -64,7 +64,7 @@ In `domains/Master.properties` (for the `Master` domain): .... Master.driverClassName=com.mysql.jdbc.Driver -Master.url=jdbc:mysql://localhost:3306/syncope?characterEncoding=UTF-8 +Master.url=jdbc:mysql://localhost:3306/syncope?characterEncoding=UTF-8&relaxAutoCommit=true Master.schema= Master.username=syncope Master.password=syncope @@ -107,7 +107,7 @@ Master.orm=META-INF/spring-orm.xml .... [WARNING] -This assumes that you have a MySQL instance running on localhost, listening on its default port 3306 with a database +This assumes that you have a MariaDB instance running on localhost, listening on its default port 3306 with a database `syncope` fully accessible by user `syncope` with password `syncope`. ===== Oracle Database http://git-wip-us.apache.org/repos/asf/syncope/blob/8cee3808/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 18a049e..23cc56e 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc @@ -42,10 +42,12 @@ domain and MySQL): please also check that the connection parameters are the same .... <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" - removeAbandoned="true" logAbandoned="true" suspectTimeout="20000" - timeBetweenEvictionRunsMillis="5000" minEvictableIdleTimeMillis="5000" + testOnBorrow="true" testOnReturn="true" + validationQuery="SELECT 1" validationInterval="30000" + maxActive="100" minIdle="2" maxWait="10000" initialSize="2" + removeAbandonedTimeout="20000" removeAbandoned="true" logAbandoned="true" + suspectTimeout="20000" timeBetweenEvictionRunsMillis="5000" + minEvictableIdleTimeMillis="5000" defaultAutoCommit="false" jdbcInterceptors="org.apache.tomcat.jdbc.pool.interceptor.ConnectionState; org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer" username="syncope" password="syncope" driverClassName="com.mysql.jdbc.Driver"
