Repository: syncope Updated Branches: refs/heads/master e54592850 -> 926e8fd90
deb packages now work again Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/64c5fbd7 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/64c5fbd7 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/64c5fbd7 Branch: refs/heads/master Commit: 64c5fbd70e7b8b335358d2ae67f8f3397dfef008 Parents: e545928 Author: Francesco Chicchiriccò <[email protected]> Authored: Thu Aug 27 08:53:14 2015 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Thu Aug 27 08:53:14 2015 +0200 ---------------------------------------------------------------------- .../syncope/common/rest/api/service/SchemaService.java | 3 +-- .../src/main/resources/domains/MasterContent.xml | 2 +- deb/core/pom.xml | 8 ++------ .../src/main/resources/provisioning.properties | 5 ++++- 4 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/64c5fbd7/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java ---------------------------------------------------------------------- diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java index 68f0f43..195e756 100644 --- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java +++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SchemaService.java @@ -23,7 +23,6 @@ import javax.validation.constraints.NotNull; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; -import javax.ws.rs.MatrixParam; import javax.ws.rs.POST; import javax.ws.rs.PUT; import javax.ws.rs.Path; @@ -66,7 +65,7 @@ public interface SchemaService extends JAXRSService { */ @GET @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - <T extends AbstractSchemaTO> List<T> list(@NotNull @MatrixParam("type") SchemaType type); + <T extends AbstractSchemaTO> List<T> list(@NotNull @PathParam("type") SchemaType type); /** * Creates a new schema. http://git-wip-us.apache.org/repos/asf/syncope/blob/64c5fbd7/core/persistence-jpa/src/main/resources/domains/MasterContent.xml ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/resources/domains/MasterContent.xml b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml index d90518f..92216fd 100644 --- a/core/persistence-jpa/src/main/resources/domains/MasterContent.xml +++ b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml @@ -87,7 +87,7 @@ under the License. <AnyType name="USER" kind="USER"/> <AnyTypeClass name="BaseUser"/> - <AnyType_AnyTypeClass anyType_name="USER" anyTypeClass_name="baseUser"/> + <AnyType_AnyTypeClass anyType_name="USER" anyTypeClass_name="BaseUser"/> <AnyType name="GROUP" kind="GROUP"/> http://git-wip-us.apache.org/repos/asf/syncope/blob/64c5fbd7/deb/core/pom.xml ---------------------------------------------------------------------- diff --git a/deb/core/pom.xml b/deb/core/pom.xml index 767b6b5..c5f7de5 100644 --- a/deb/core/pom.xml +++ b/deb/core/pom.xml @@ -116,12 +116,8 @@ under the License. </resource> <resource> - <directory>${basedir}/../../core/persistence-jpa/src/main/resources</directory> - <includes> - <include>content.xml</include> - <include>persistence.properties</include> - </includes> - <targetPath>${project.build.directory}/etc</targetPath> + <directory>${basedir}/../../core/persistence-jpa/src/main/resources/domains</directory> + <targetPath>${project.build.directory}/etc/domains</targetPath> <filtering>true</filtering> </resource> <resource> http://git-wip-us.apache.org/repos/asf/syncope/blob/64c5fbd7/ext/camel/provisioning-camel/src/main/resources/provisioning.properties ---------------------------------------------------------------------- diff --git a/ext/camel/provisioning-camel/src/main/resources/provisioning.properties b/ext/camel/provisioning-camel/src/main/resources/provisioning.properties index aa843ca..763f666 100644 --- a/ext/camel/provisioning-camel/src/main/resources/provisioning.properties +++ b/ext/camel/provisioning-camel/src/main/resources/provisioning.properties @@ -17,5 +17,8 @@ camel.directory=${conf.directory} userProvisioningManager=org.apache.syncope.core.provisioning.camel.CamelUserProvisioningManager groupProvisioningManager=org.apache.syncope.core.provisioning.camel.CamelGroupProvisioningManager -anyObjectProvisioningManager=org.apache.syncope.core.provisioning.camel.CamelAnObjectProvisioningManager +anyObjectProvisioningManager=org.apache.syncope.core.provisioning.camel.CamelAnyObjectProvisioningManager virAttrCache=org.apache.syncope.core.provisioning.java.cache.MemoryVirAttrCache + +quartz.jobstore=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate +quartz.sql=tables_postgres.sql
