[SYNCOPE-640] Merge from master
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5886fdc4 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5886fdc4 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5886fdc4 Branch: refs/heads/master Commit: 5886fdc4585f16496cbccf028c04e08fe997c4ba Parents: 0178549 838c6a8 Author: Francesco Chicchiriccò <[email protected]> Authored: Fri Feb 13 15:35:24 2015 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Fri Feb 13 15:35:24 2015 +0100 ---------------------------------------------------------------------- .../org/apache/syncope/installer/enums/DBs.java | 3 +++ .../installer/files/PersistenceProperties.java | 19 ++++++++++++++++--- .../installer/processes/PersistenceProcess.java | 8 ++++++-- .../installer/utilities/DriverLoader.java | 12 ++++++++++-- .../validators/PersistenceValidator.java | 2 +- 5 files changed, 36 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/5886fdc4/installer/src/main/java/org/apache/syncope/installer/files/PersistenceProperties.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/5886fdc4/installer/src/main/java/org/apache/syncope/installer/processes/PersistenceProcess.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/5886fdc4/installer/src/main/java/org/apache/syncope/installer/utilities/DriverLoader.java ---------------------------------------------------------------------- diff --cc installer/src/main/java/org/apache/syncope/installer/utilities/DriverLoader.java index 41982f8,936fd91..64e02f7 --- a/installer/src/main/java/org/apache/syncope/installer/utilities/DriverLoader.java +++ b/installer/src/main/java/org/apache/syncope/installer/utilities/DriverLoader.java @@@ -22,15 -22,15 +22,14 @@@ import java.net.Authenticator import java.net.MalformedURLException; import java.net.PasswordAuthentication; import org.apache.syncope.installer.enums.DBs; -- import java.net.URL; import java.net.URLClassLoader; 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";; + "http://repo1.maven.org/maven2/postgresql/postgresql/9.1-901.jdbc4/postgresql-9.1-901.jdbc4.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";; http://git-wip-us.apache.org/repos/asf/syncope/blob/5886fdc4/installer/src/main/java/org/apache/syncope/installer/validators/PersistenceValidator.java ----------------------------------------------------------------------
