PostgreSQL successfully verified
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3b0d2ea5 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3b0d2ea5 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3b0d2ea5 Branch: refs/heads/SYNCOPE-156 Commit: 3b0d2ea5e276086e31a286c499d75662f277a3a2 Parents: 1630efc Author: Francesco Chicchiriccò <[email protected]> Authored: Fri Aug 28 16:59:34 2015 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Fri Aug 28 16:59:34 2015 +0200 ---------------------------------------------------------------------- fit/core-reference/pom.xml | 8 +++++- .../postgres/domains/Master.properties | 28 +++++++++++++++++++ .../resources/postgres/persistence.properties | 29 -------------------- .../resources/postgres/provisioning.properties | 24 ++++++++++++++++ 4 files changed, 59 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/3b0d2ea5/fit/core-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 82c8742..a3d825b 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -362,7 +362,7 @@ under the License. <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>9.4-1200-jdbc41</version> + <version>9.4-1201-jdbc41</version> <scope>test</scope> </dependency> </dependencies> @@ -374,6 +374,9 @@ under the License. <resource> <directory>src/main/resources</directory> <filtering>true</filtering> + <excludes> + <exclude>provisioning.properties</exclude> + </excludes> </resource> <resource> <directory>src/main/resources/postgres</directory> @@ -443,6 +446,9 @@ under the License. <resource> <directory>src/main/resources</directory> <filtering>true</filtering> + <excludes> + <exclude>provisioning.properties</exclude> + </excludes> </resource> <resource> <directory>src/main/resources/mariadb</directory> http://git-wip-us.apache.org/repos/asf/syncope/blob/3b0d2ea5/fit/core-reference/src/main/resources/postgres/domains/Master.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/postgres/domains/Master.properties b/fit/core-reference/src/main/resources/postgres/domains/Master.properties new file mode 100644 index 0000000..177e988 --- /dev/null +++ b/fit/core-reference/src/main/resources/postgres/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.postgresql.Driver +Master.url=jdbc:postgresql://localhost:5432/syncope +Master.schema= +Master.username=syncope +Master.password=syncope +Master.databasePlatform=org.apache.openjpa.jdbc.sql.PostgresDictionary +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/3b0d2ea5/fit/core-reference/src/main/resources/postgres/persistence.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/postgres/persistence.properties b/fit/core-reference/src/main/resources/postgres/persistence.properties deleted file mode 100644 index 5afa1a6..0000000 --- a/fit/core-reference/src/main/resources/postgres/persistence.properties +++ /dev/null @@ -1,29 +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.postgresql.Driver -jpa.url=jdbc:postgresql://localhost:5432/syncope -jpa.username=syncope -jpa.password=syncope -jpa.dialect=org.apache.openjpa.jdbc.sql.PostgresDictionary -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.PostgreSQLDelegate -quartz.sql=tables_postgres.sql -audit.sql=audit.sql -database.schema= http://git-wip-us.apache.org/repos/asf/syncope/blob/3b0d2ea5/fit/core-reference/src/main/resources/postgres/provisioning.properties ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/main/resources/postgres/provisioning.properties b/fit/core-reference/src/main/resources/postgres/provisioning.properties new file mode 100644 index 0000000..66340bb --- /dev/null +++ b/fit/core-reference/src/main/resources/postgres/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.PostgreSQLDelegate +quartz.sql=tables_postgres.sql +quartz.scheduler.idleWaitTime=5000 \ No newline at end of file
