You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/02/13 15:35:42 UTC
[4/6] syncope git commit: [SYNCOPE-640] Merge from 1_2_X
[SYNCOPE-640] Merge from 1_2_X
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/838c6a8f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/838c6a8f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/838c6a8f
Branch: refs/heads/2_0_X
Commit: 838c6a8fa621d2b6d9b65e6847a9de5a176638df
Parents: 04b0530 ec58954
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Feb 13 15:33:50 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Feb 13 15:33:50 2015 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
.../org/apache/syncope/installer/enums/DBs.java | 3 +++
.../installer/files/PersistenceProperties.java | 19 ++++++++++++++++---
.../installer/processes/PersistenceProcess.java | 8 ++++++--
.../installer/utilities/DriverLoader.java | 11 ++++++++++-
.../validators/PersistenceValidator.java | 2 +-
6 files changed, 37 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/838c6a8f/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/838c6a8f/installer/src/main/java/org/apache/syncope/installer/enums/DBs.java
----------------------------------------------------------------------
diff --cc installer/src/main/java/org/apache/syncope/installer/enums/DBs.java
index db7f8ec,9fcc92e..085b98f
--- a/installer/src/main/java/org/apache/syncope/installer/enums/DBs.java
+++ b/installer/src/main/java/org/apache/syncope/installer/enums/DBs.java
@@@ -41,12 -42,11 +42,14 @@@ public enum DBs
db = POSTGRES;
} else if (MYSQL.getName().equalsIgnoreCase(containerName)) {
db = MYSQL;
+ } else if (MARIADB.getName().equalsIgnoreCase(containerName)) {
+ db = MARIADB;
} else if (ORACLE.getName().equalsIgnoreCase(containerName)) {
db = ORACLE;
+ } else {
+ db = SQLSERVER;
}
+
return db;
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/838c6a8f/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java
----------------------------------------------------------------------
diff --cc installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java
index cba0b61,0d6c969..a5d904f
--- a/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java
+++ b/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java
@@@ -74,17 -88,14 +87,17 @@@ public class PersistenceProperties
+ "jpa.url=%s\n"
+ "jpa.username=%s\n"
+ "jpa.password=%s\n"
- + "jpa.dialect=org.apache.openjpa.jdbc.sql.SQLServerDictionary\n"
- + "quartz.jobstore=org.quartz.impl.jdbcjobstore.MSSQLDelegate\n"
- + "quartz.sql=tables_sqlServer.sql\n"
- + "audit.sql=audit.sql\n"
- + "database.schema=\n";
+ + "jpa.dialect=org.apache.openjpa.jdbc.sql.SQLServerDictionary\n"
+ + "jpa.pool.validationQuery=SELECT 1\n"
+ + "#note: other connection pool settings can also be configured here, see persistenceContext.xml\n"
+ + "quartz.jobstore=org.quartz.impl.jdbcjobstore.MSSQLDelegate\n"
+ + "quartz.scheduler.idleWaitTime=5000\n"
+ + "quartz.sql=tables_sqlServer.sql\n"
+ + "audit.sql=audit_sqlserver.sql\n"
+ + "database.schema=";
- public static final String QUARTZ_INNO_DB = "quartz.sql=tables_mysql_innodb.sql";
+ public static final String MYSQL_QUARTZ_INNO_DB = "quartz.sql=tables_mysql_innodb.sql";
- public static final String QUARTZ = "quartz.sql=tables_mysql.sql";
+ public static final String MYSQL_QUARTZ = "quartz.sql=tables_mysql.sql";
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/838c6a8f/installer/src/main/java/org/apache/syncope/installer/processes/PersistenceProcess.java
----------------------------------------------------------------------