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/09/03 13:01:45 UTC
[2/7] syncope git commit: MariaDB and MySQL successfully verified
MariaDB and MySQL successfully verified
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1630efc0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1630efc0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1630efc0
Branch: refs/heads/master
Commit: 1630efc09e7371a384edbdbb7d83b49407ad5a2f
Parents: 55b1f41
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Aug 28 16:50:01 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Aug 28 16:50:01 2015 +0200
----------------------------------------------------------------------
fit/core-reference/pom.xml | 7 +++--
.../resources/mariadb/domains/Master.properties | 28 ++++++++++++++++++
.../resources/mariadb/persistence.properties | 30 --------------------
.../resources/mariadb/provisioning.properties | 24 ++++++++++++++++
.../resources/mysql/domains/Master.properties | 28 ++++++++++++++++++
.../main/resources/mysql/persistence.properties | 30 --------------------
.../resources/mysql/provisioning.properties | 24 ++++++++++++++++
7 files changed, 109 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/1630efc0/fit/core-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index d9d9227..82c8742 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -395,7 +395,7 @@ under the License.
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.34</version>
+ <version>5.1.36</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -406,6 +406,9 @@ under the License.
<resources>
<resource>
<directory>src/main/resources</directory>
+ <excludes>
+ <exclude>provisioning.properties</exclude>
+ </excludes>
<filtering>true</filtering>
</resource>
<resource>
@@ -428,7 +431,7 @@ under the License.
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>1.1.8</version>
+ <version>1.1.9</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/syncope/blob/1630efc0/fit/core-reference/src/main/resources/mariadb/domains/Master.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/mariadb/domains/Master.properties b/fit/core-reference/src/main/resources/mariadb/domains/Master.properties
new file mode 100644
index 0000000..39e519a
--- /dev/null
+++ b/fit/core-reference/src/main/resources/mariadb/domains/Master.properties
@@ -0,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=org.mariadb.jdbc.Driver
+Master.url=jdbc:mariadb://localhost:3306/syncope?characterEncoding=UTF-8
+Master.schema=
+Master.username=syncope
+Master.password=syncope
+Master.databasePlatform=org.apache.openjpa.jdbc.sql.MariaDBDictionary
+Master.orm=META-INF/spring-orm.xml
+
+# note: other connection pool settings can also be configured here, see DataSource definition
+Master.pool.validationQuery=SELECT 1
+
+Master.audit.sql=audit.sql
http://git-wip-us.apache.org/repos/asf/syncope/blob/1630efc0/fit/core-reference/src/main/resources/mariadb/persistence.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/mariadb/persistence.properties b/fit/core-reference/src/main/resources/mariadb/persistence.properties
deleted file mode 100644
index b58b72b..0000000
--- a/fit/core-reference/src/main/resources/mariadb/persistence.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.
-content.directory=${conf.directory}
-jpa.driverClassName=org.mariadb.jdbc.Driver
-jpa.url=jdbc:mariadb://localhost:3306/syncope?characterEncoding=UTF-8
-jpa.username=syncope
-jpa.password=syncope
-jpa.dialect=org.apache.openjpa.jdbc.sql.MariaDBDictionary
-jpa.pool.validationQuery=SELECT 1
-jpa.orm=META-INF/spring-orm.xml
-#note: other connection pool settings can also be configured here, see persistenceContext.xml
-quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-quartz.scheduler.idleWaitTime=5000
-quartz.sql=tables_mariadb.sql
-audit.sql=audit.sql
-database.schema=
http://git-wip-us.apache.org/repos/asf/syncope/blob/1630efc0/fit/core-reference/src/main/resources/mariadb/provisioning.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/mariadb/provisioning.properties b/fit/core-reference/src/main/resources/mariadb/provisioning.properties
new file mode 100644
index 0000000..4a0c415
--- /dev/null
+++ b/fit/core-reference/src/main/resources/mariadb/provisioning.properties
@@ -0,0 +1,24 @@
+# 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.
+userProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultUserProvisioningManager
+groupProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultGroupProvisioningManager
+anyObjectProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultAnyObjectProvisioningManager
+virAttrCache=org.apache.syncope.core.provisioning.java.cache.MemoryVirAttrCache
+
+quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+quartz.sql=tables_mariadb.sql
+quartz.scheduler.idleWaitTime=5000
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/1630efc0/fit/core-reference/src/main/resources/mysql/domains/Master.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/mysql/domains/Master.properties b/fit/core-reference/src/main/resources/mysql/domains/Master.properties
new file mode 100644
index 0000000..93eba76
--- /dev/null
+++ b/fit/core-reference/src/main/resources/mysql/domains/Master.properties
@@ -0,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.mysql.jdbc.Driver
+Master.url=jdbc:mysql://localhost:3306/syncope?characterEncoding=UTF-8
+Master.schema=
+Master.username=syncope
+Master.password=syncope
+Master.databasePlatform=org.apache.openjpa.jdbc.sql.MySQLDictionary
+Master.orm=META-INF/spring-orm.xml
+
+# note: other connection pool settings can also be configured here, see DataSource definition
+Master.pool.validationQuery=SELECT 1
+
+Master.audit.sql=audit.sql
http://git-wip-us.apache.org/repos/asf/syncope/blob/1630efc0/fit/core-reference/src/main/resources/mysql/persistence.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/mysql/persistence.properties b/fit/core-reference/src/main/resources/mysql/persistence.properties
deleted file mode 100644
index 0e2f002..0000000
--- a/fit/core-reference/src/main/resources/mysql/persistence.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.
-content.directory=${conf.directory}
-jpa.driverClassName=com.mysql.jdbc.Driver
-jpa.url=jdbc:mysql://localhost:3306/syncope?characterEncoding=UTF-8
-jpa.username=syncope
-jpa.password=syncope
-jpa.dialect=org.apache.openjpa.jdbc.sql.MySQLDictionary
-jpa.pool.validationQuery=SELECT 1
-jpa.orm=META-INF/spring-orm.xml
-#note: other connection pool settings can also be configured here, see persistenceContext.xml
-quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-quartz.scheduler.idleWaitTime=5000
-quartz.sql=tables_mysql.sql
-audit.sql=audit.sql
-database.schema=
http://git-wip-us.apache.org/repos/asf/syncope/blob/1630efc0/fit/core-reference/src/main/resources/mysql/provisioning.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/mysql/provisioning.properties b/fit/core-reference/src/main/resources/mysql/provisioning.properties
new file mode 100644
index 0000000..ac8306a
--- /dev/null
+++ b/fit/core-reference/src/main/resources/mysql/provisioning.properties
@@ -0,0 +1,24 @@
+# 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.
+userProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultUserProvisioningManager
+groupProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultGroupProvisioningManager
+anyObjectProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultAnyObjectProvisioningManager
+virAttrCache=org.apache.syncope.core.provisioning.java.cache.MemoryVirAttrCache
+
+quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+quartz.sql=tables_mysql.sql
+quartz.scheduler.idleWaitTime=5000
\ No newline at end of file