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 2016/12/12 10:44:38 UTC
syncope git commit: SYNCOPE-981 - Oracle/SQLServer configuration does
not work
Repository: syncope
Updated Branches:
refs/heads/master a221f8dd7 -> 367bf6160
SYNCOPE-981 - Oracle/SQLServer configuration does not work
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/367bf616
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/367bf616
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/367bf616
Branch: refs/heads/master
Commit: 367bf616046d9a31bb32529653560926832dbf1d
Parents: a221f8d
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Dec 12 10:44:21 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Dec 12 10:44:21 2016 +0000
----------------------------------------------------------------------
.../org/apache/syncope/installer/files/MasterProperties.java | 5 ++---
.../apache/syncope/installer/processes/PersistenceProcess.java | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/367bf616/installer/src/main/java/org/apache/syncope/installer/files/MasterProperties.java
----------------------------------------------------------------------
diff --git a/installer/src/main/java/org/apache/syncope/installer/files/MasterProperties.java b/installer/src/main/java/org/apache/syncope/installer/files/MasterProperties.java
index b1fb223..259795d 100644
--- a/installer/src/main/java/org/apache/syncope/installer/files/MasterProperties.java
+++ b/installer/src/main/java/org/apache/syncope/installer/files/MasterProperties.java
@@ -70,7 +70,7 @@ public final class MasterProperties {
public static final String ORACLE = ""
+ "Master.driverClassName=oracle.jdbc.OracleDriver\n"
- + "Master.url=jdbc:oracle:thin:@pioppo:1521:orcl\n"
+ + "Master.url=%s\n"
+ "Master.schema=%s\n"
+ "Master.username=%s\n"
+ "Master.password=%s\n"
@@ -81,8 +81,7 @@ public final class MasterProperties {
public static final String SQLSERVER = ""
+ "Master.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver\n"
- + "Master.url=jdbc:sqlserver://acacia:1433;database=syncope;selectMethod=cursor;"
- + "sendStringParametersAsUnicode=false\n"
+ + "Master.url=%s\n"
+ "Master.schema=%s\n"
+ "Master.username=%s\n"
+ "Master.password=%s\n"
http://git-wip-us.apache.org/repos/asf/syncope/blob/367bf616/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 a36b759..801390d 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
@@ -93,13 +93,13 @@ public class PersistenceProcess extends BaseProcess {
case ORACLE:
provisioningProperties.append(ProvisioningProperties.ORACLE);
masterProperties.append(String.format(
- MasterProperties.ORACLE, schema, persistenceUrl, persistenceUser, persistencePassword));
+ MasterProperties.ORACLE, persistenceUrl, schema, persistenceUser, persistencePassword));
break;
case SQLSERVER:
provisioningProperties.append(ProvisioningProperties.SQLSERVER);
masterProperties.append(String.format(
- MasterProperties.SQLSERVER, schema, persistenceUrl, persistenceUser, persistencePassword));
+ MasterProperties.SQLSERVER, persistenceUrl, schema, persistenceUser, persistencePassword));
break;
default: