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:41 UTC
[3/6] syncope git commit: [SYNCOPE-640] #resolve
[SYNCOPE-640] #resolve
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ec589545
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ec589545
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ec589545
Branch: refs/heads/2_0_X
Commit: ec58954527675f27e204436248e92bb396e3d104
Parents: 4e35b35
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Feb 13 15:32:20 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Feb 13 15:32:20 2015 +0100
----------------------------------------------------------------------
core/pom.xml | 2 +-
.../org/apache/syncope/installer/enums/DBs.java | 3 +++
.../installer/files/PersistenceProperties.java | 16 ++++++++++++++--
.../installer/processes/PersistenceProcess.java | 8 ++++++--
.../syncope/installer/utilities/DriverLoader.java | 11 ++++++++++-
.../installer/validators/PersistenceValidator.java | 2 +-
6 files changed, 35 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/ec589545/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 3fa0e26..5920028 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1161,7 +1161,7 @@ under the License.
<properties>
<jdbcdriver.groupId>org.mariadb.jdbc</jdbcdriver.groupId>
<jdbcdriver.artifactId>mariadb-java-client</jdbcdriver.artifactId>
- <jdbcdriver.version>1.1.7</jdbcdriver.version>
+ <jdbcdriver.version>1.1.8</jdbcdriver.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/syncope/blob/ec589545/installer/src/main/java/org/apache/syncope/installer/enums/DBs.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/enums/DBs.java b/installer/src/main/java/org/apache/syncope/installer/enums/DBs.java
index 714e888..9fcc92e 100644
--- a/installer/src/main/java/org/apache/syncope/installer/enums/DBs.java
+++ b/installer/src/main/java/org/apache/syncope/installer/enums/DBs.java
@@ -22,6 +22,7 @@ public enum DBs {
POSTGRES("postgres"),
MYSQL("mysql"),
+ MARIADB("mariadb"),
SQLSERVER("sqlserver"),
ORACLE("oracle");
@@ -41,6 +42,8 @@ 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;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ec589545/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java b/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java
index c27ac35..0d6c969 100644
--- a/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java
+++ b/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java
@@ -59,6 +59,18 @@ public class PersistenceProperties {
+ "audit.sql=audit.sql\n"
+ "database.schema=\n";
+ public static final String MARIADB = ""
+ + "jpa.driverClassName=org.mariadb.jdbc.Driver\n"
+ + "jpa.url=%s\n"
+ + "jpa.username=%s\n"
+ + "jpa.password=%s\n"
+ + "jpa.dialect=org.apache.openjpa.jdbc.sql.MariaDBDictionary\n"
+ + "jpa.pool.validationQuery=SELECT 1\n"
+ + "quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate\n"
+ + "quartz.sql=tables_mariadb.sql\n"
+ + "audit.sql=audit.sql\n"
+ + "database.schema=\n";
+
public static final String ORACLE = ""
+ "jpa.driverClassName=oracle.jdbc.OracleDriver\n"
+ "jpa.url=%s\n"
@@ -82,8 +94,8 @@ public class PersistenceProperties {
+ "audit.sql=audit.sql\n"
+ "database.schema=\n";
- 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/ec589545/installer/src/main/java/org/apache/syncope/installer/processes/PersistenceProcess.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/processes/PersistenceProcess.java b/installer/src/main/java/org/apache/syncope/installer/processes/PersistenceProcess.java
index 983e3e8..fc99d19 100644
--- a/installer/src/main/java/org/apache/syncope/installer/processes/PersistenceProcess.java
+++ b/installer/src/main/java/org/apache/syncope/installer/processes/PersistenceProcess.java
@@ -71,11 +71,15 @@ public class PersistenceProcess {
persistenceProperties.append(String.format(
PersistenceProperties.MYSQL, persistenceUrl, persistenceUser, persistencePassword));
if (mysqlInnoDB) {
- persistenceProperties.append(PersistenceProperties.QUARTZ_INNO_DB);
+ persistenceProperties.append(PersistenceProperties.MYSQL_QUARTZ_INNO_DB);
} else {
- persistenceProperties.append(PersistenceProperties.QUARTZ);
+ persistenceProperties.append(PersistenceProperties.MYSQL_QUARTZ);
}
break;
+ case MARIADB:
+ persistenceProperties.append(String.format(
+ PersistenceProperties.MARIADB, persistenceUrl, persistenceUser, persistencePassword));
+ break;
case ORACLE:
persistenceProperties.append(String.format(
PersistenceProperties.ORACLE, persistenceUrl, persistenceUser, persistencePassword,
http://git-wip-us.apache.org/repos/asf/syncope/blob/ec589545/installer/src/main/java/org/apache/syncope/installer/utilities/DriverLoader.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/utilities/DriverLoader.java b/installer/src/main/java/org/apache/syncope/installer/utilities/DriverLoader.java
index b495e95..936fd91 100644
--- a/installer/src/main/java/org/apache/syncope/installer/utilities/DriverLoader.java
+++ b/installer/src/main/java/org/apache/syncope/installer/utilities/DriverLoader.java
@@ -29,16 +29,21 @@ import java.sql.Driver;
public final class DriverLoader extends URLClassLoader {
- private final static String POSTGRES_JAR =
+ private final static String POSTGRES_JAR =
"http://repo1.maven.org/maven2/postgresql/postgresql/9.1-901.jdbc3/postgresql-9.1-901.jdbc3.jar";
private final static String MYSQL_JAR =
"http://central.maven.org/maven2/mysql/mysql-connector-java/5.1.34/mysql-connector-java-5.1.34.jar";
+ private final static String MARIADB_JAR =
+ "http://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/1.1.8/mariadb-java-client-1.1.8.jar";
+
private static final String POSTGRES_CLASS_DRIVER = "org.postgresql.Driver";
private static final String MYSQL_CLASS_DRIVER = "com.mysql.jdbc.Driver";
+ private static final String MARIADB_CLASS_DRIVER = "org.mariadb.jdbc.Driver";
+
private DriverLoader(final URL[] urls) {
super(urls);
addURL(urls[0]);
@@ -58,6 +63,10 @@ public final class DriverLoader extends URLClassLoader {
driver = downloadDriver(MYSQL_JAR, MYSQL_CLASS_DRIVER, isProxyEnabled, proxyHost, proxyPort,
proxyUser, proxyPwd);
break;
+ case MARIADB:
+ driver = downloadDriver(MARIADB_JAR, MARIADB_CLASS_DRIVER, isProxyEnabled, proxyHost, proxyPort,
+ proxyUser, proxyPwd);
+ break;
case SQLSERVER:
break;
case ORACLE:
http://git-wip-us.apache.org/repos/asf/syncope/blob/ec589545/installer/src/main/java/org/apache/syncope/installer/validators/PersistenceValidator.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/validators/PersistenceValidator.java b/installer/src/main/java/org/apache/syncope/installer/validators/PersistenceValidator.java
index f76273d..de25fb5 100644
--- a/installer/src/main/java/org/apache/syncope/installer/validators/PersistenceValidator.java
+++ b/installer/src/main/java/org/apache/syncope/installer/validators/PersistenceValidator.java
@@ -82,8 +82,8 @@ public class PersistenceValidator extends AbstractValidator {
switch (selectedDB) {
case POSTGRES:
- return checkConnection(selectedDB);
case MYSQL:
+ case MARIADB:
return checkConnection(selectedDB);
case SQLSERVER:
warning = new StringBuilder("Remember to check your SqlServer db connection");