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/11/25 12:31:39 UTC
[3/3] syncope git commit: Merge from 1_2_X
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/84040d6d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/84040d6d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/84040d6d
Branch: refs/heads/master
Commit: 84040d6df62577aab8d5762ae4aca14d2ca43faf
Parents: e9ff5c7 5ad760b
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Nov 25 12:31:30 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Nov 25 12:31:30 2015 +0100
----------------------------------------------------------------------
.../src/main/resources/sqlserver/domains/Master.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/84040d6d/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties
----------------------------------------------------------------------
diff --cc fit/core-reference/src/main/resources/sqlserver/domains/Master.properties
index 3dcce44,0000000..2dedf76
mode 100644,000000..100644
--- a/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties
+++ b/fit/core-reference/src/main/resources/sqlserver/domains/Master.properties
@@@ -1,28 -1,0 +1,28 @@@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+Master.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
- Master.url=jdbc:sqlserver://acacia:1433;database=syncope;selectMethod=cursor;sendStringParametersAsUnicode=false
++Master.url=jdbc:sqlserver://teak:1433;database=syncope;selectMethod=cursor;sendStringParametersAsUnicode=false
+Master.schema=dbo
+Master.username=syncope
+Master.password=syncope
+Master.databasePlatform=org.apache.openjpa.jdbc.sql.SQLServerDictionary
+Master.orm=META-INF/spring-orm-sqlserver.xml
+
+# note: other connection pool settings can also be configured here, see DataSource definition
+Master.pool.validationQuery=SELECT 1
+
+Master.audit.sql=audit_sqlserver.sql