You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2015/08/28 17:26:31 UTC
[1/9] syncope git commit: deb packages now work again
Repository: syncope
Updated Branches:
refs/heads/SYNCOPE-156 d9437d37a -> b2eda9980
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/SYNCOPE-156
Commit: 64c5fbd70e7b8b335358d2ae67f8f3397dfef008
Parents: e545928
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Aug 27 08:53:14 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
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
[7/9] syncope git commit: Integration tests working with Glassfish
via jaxrsContentType=application/xml - see SYNCOPE-688
Posted by md...@apache.org.
Integration tests working with Glassfish via jaxrsContentType=application/xml - see SYNCOPE-688
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/716e2ed6
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/716e2ed6
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/716e2ed6
Branch: refs/heads/SYNCOPE-156
Commit: 716e2ed6a0614cf4b9e1882a80b7bb2496b83343
Parents: 8338f8f
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Aug 28 13:15:48 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Aug 28 13:15:48 2015 +0200
----------------------------------------------------------------------
.../serialization/UnwrappedObjectMapper.java | 93 --------------------
.../core/rest/cxf/UnwrappedObjectMapper.java | 85 ++++++++++++++++++
.../src/main/resources/restCXFContext.xml | 2 +-
fit/core-reference/pom.xml | 5 ++
.../fit/core/reference/DomainITCase.java | 6 +-
5 files changed, 95 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/716e2ed6/core/misc/src/main/java/org/apache/syncope/core/misc/serialization/UnwrappedObjectMapper.java
----------------------------------------------------------------------
diff --git a/core/misc/src/main/java/org/apache/syncope/core/misc/serialization/UnwrappedObjectMapper.java b/core/misc/src/main/java/org/apache/syncope/core/misc/serialization/UnwrappedObjectMapper.java
deleted file mode 100644
index 61770e0..0000000
--- a/core/misc/src/main/java/org/apache/syncope/core/misc/serialization/UnwrappedObjectMapper.java
+++ /dev/null
@@ -1,93 +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.
- */
-package org.apache.syncope.core.misc.serialization;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.util.Map;
-
-/**
- * Jackson ObjectMapper that unwraps singleton map values and enable default
- * typing for handling abstract types serialization.
- */
-public class UnwrappedObjectMapper extends ObjectMapper {
-
- private static final long serialVersionUID = -317191546835195103L;
-
- /**
- * Unwraps the given value if it implements the Map interface and contains
- * only a single entry. Otherwise the value is returned unmodified.
- *
- * @param value the potential Map to unwrap
- * @return the unwrapped map or the original value
- */
- private Object unwrapMap(final Object value) {
- if (value instanceof Map) {
- Map<?, ?> map = (Map<?, ?>) value;
- if (map.size() == 1) {
- return map.values().iterator().next();
- }
- }
-
- return value;
- }
-
- @Override
- public void writeValue(final JsonGenerator jgen, final Object value)
- throws IOException {
-
- super.writeValue(jgen, unwrapMap(value));
- }
-
- @Override
- public void writeValue(final File resultFile, final Object value)
- throws IOException {
-
- super.writeValue(resultFile, unwrapMap(value));
- }
-
- @Override
- public void writeValue(final OutputStream out, final Object value)
- throws IOException {
-
- super.writeValue(out, unwrapMap(value));
- }
-
- @Override
- public void writeValue(final Writer w, final Object value)
- throws IOException {
-
- super.writeValue(w, unwrapMap(value));
- }
-
- @Override
- public byte[] writeValueAsBytes(final Object value) throws JsonProcessingException {
- return super.writeValueAsBytes(unwrapMap(value));
- }
-
- @Override
- public String writeValueAsString(final Object value) throws JsonProcessingException {
- return super.writeValueAsString(unwrapMap(value));
- }
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/716e2ed6/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/UnwrappedObjectMapper.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/UnwrappedObjectMapper.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/UnwrappedObjectMapper.java
new file mode 100644
index 0000000..661f3b0
--- /dev/null
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/UnwrappedObjectMapper.java
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+package org.apache.syncope.core.rest.cxf;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.util.Map;
+
+/**
+ * Jackson ObjectMapper that unwraps singleton map values and enable default
+ * typing for handling abstract types serialization.
+ */
+public class UnwrappedObjectMapper extends ObjectMapper {
+
+ private static final long serialVersionUID = -317191546835195103L;
+
+ /**
+ * Unwraps the given value if it implements the Map interface and contains only a single entry, otherwise the
+ * value is returned unmodified.
+ *
+ * @param value the potential Map to unwrap
+ * @return the unwrapped map or the original value
+ */
+ private Object unwrapMap(final Object value) {
+ if (value instanceof Map) {
+ Map<?, ?> map = (Map<?, ?>) value;
+ if (map.size() == 1) {
+ return map.values().iterator().next();
+ }
+ }
+
+ return value;
+ }
+
+ @Override
+ public void writeValue(final JsonGenerator jgen, final Object value) throws IOException {
+ super.writeValue(jgen, unwrapMap(value));
+ }
+
+ @Override
+ public void writeValue(final File resultFile, final Object value) throws IOException {
+ super.writeValue(resultFile, unwrapMap(value));
+ }
+
+ @Override
+ public void writeValue(final OutputStream out, final Object value) throws IOException {
+ super.writeValue(out, unwrapMap(value));
+ }
+
+ @Override
+ public void writeValue(final Writer writer, final Object value) throws IOException {
+ super.writeValue(writer, unwrapMap(value));
+ }
+
+ @Override
+ public byte[] writeValueAsBytes(final Object value) throws JsonProcessingException {
+ return super.writeValueAsBytes(unwrapMap(value));
+ }
+
+ @Override
+ public String writeValueAsString(final Object value) throws JsonProcessingException {
+ return super.writeValueAsString(unwrapMap(value));
+ }
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/716e2ed6/core/rest-cxf/src/main/resources/restCXFContext.xml
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/resources/restCXFContext.xml b/core/rest-cxf/src/main/resources/restCXFContext.xml
index 5155724..b5b75db 100644
--- a/core/rest-cxf/src/main/resources/restCXFContext.xml
+++ b/core/rest-cxf/src/main/resources/restCXFContext.xml
@@ -61,7 +61,7 @@ under the License.
</property>
</bean>
- <bean id="jacksonObjectMapper" class="org.apache.syncope.core.misc.serialization.UnwrappedObjectMapper"/>
+ <bean id="jacksonObjectMapper" class="org.apache.syncope.core.rest.cxf.UnwrappedObjectMapper"/>
<bean id="jsonProvider" class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider">
<property name="mapper" ref="jacksonObjectMapper"/>
</bean>
http://git-wip-us.apache.org/repos/asf/syncope/blob/716e2ed6/fit/core-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index 1339153..2e65089 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -518,6 +518,11 @@ under the License.
<profile>
<id>glassfish-it</id>
+ <properties>
+ <!-- see SYNCOPE-688 -->
+ <jaxrs.content.type>application/xml</jaxrs.content.type>
+ </properties>
+
<dependencies>
<dependency>
<groupId>com.h2database</groupId>
http://git-wip-us.apache.org/repos/asf/syncope/blob/716e2ed6/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DomainITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DomainITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DomainITCase.java
index 51d4aaf..728379a 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DomainITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/DomainITCase.java
@@ -83,14 +83,16 @@ public class DomainITCase extends AbstractITCase {
// 2. attempt to access with old pwd -> fail
try {
- new SyncopeClientFactoryBean().setAddress(ADDRESS).setDomain("Two").
+ new SyncopeClientFactoryBean().
+ setAddress(ADDRESS).setDomain("Two").setContentType(clientFactory.getContentType()).
create(ADMIN_UNAME, "password2").self();
} catch (AccessControlException e) {
assertNotNull(e);
}
// 3. access with new pwd -> succeed
- new SyncopeClientFactoryBean().setAddress(ADDRESS).setDomain("Two").
+ new SyncopeClientFactoryBean().
+ setAddress(ADDRESS).setDomain("Two").setContentType(clientFactory.getContentType()).
create(ADMIN_UNAME, "password3").self();
} finally {
restoreTwo();
[6/9] syncope git commit: [SYNCOPE-686] Fix was not working with
DefaultUserWorkflowAdapter
Posted by md...@apache.org.
[SYNCOPE-686] Fix was not working with DefaultUserWorkflowAdapter
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8338f8fa
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8338f8fa
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8338f8fa
Branch: refs/heads/SYNCOPE-156
Commit: 8338f8fa4586f9f87368772ab060c39cd18352df
Parents: 02d4888
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Aug 28 13:00:35 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Aug 28 13:00:35 2015 +0200
----------------------------------------------------------------------
.../workflow/java/DefaultUserWorkflowAdapter.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/8338f8fa/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultUserWorkflowAdapter.java b/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultUserWorkflowAdapter.java
index 3d56daf..ef40bd5 100644
--- a/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultUserWorkflowAdapter.java
+++ b/core/workflow-java/src/main/java/org/apache/syncope/core/workflow/java/DefaultUserWorkflowAdapter.java
@@ -107,18 +107,19 @@ public class DefaultUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
@Override
protected WorkflowResult<Pair<UserMod, Boolean>> doUpdate(final User user, final UserMod userMod) {
// update password internally only if required
- UserMod actualMod = SerializationUtils.clone(userMod);
- if (actualMod.getPwdPropRequest() != null && !actualMod.getPwdPropRequest().isOnSyncope()) {
- actualMod.setPassword(null);
+ UserMod updatedMod = SerializationUtils.clone(userMod);
+ String updatedPwd = updatedMod.getPassword();
+ if (updatedMod.getPwdPropRequest() != null && !updatedMod.getPwdPropRequest().isOnSyncope()) {
+ updatedMod.setPassword(null);
}
// update User
- PropagationByResource propByRes = dataBinder.update(user, actualMod);
+ PropagationByResource propByRes = dataBinder.update(user, updatedMod);
+ updatedMod.setPassword(updatedPwd);
- User updated = userDAO.save(user);
+ userDAO.save(user);
- userMod.setKey(updated.getKey());
return new WorkflowResult<Pair<UserMod, Boolean>>(
- new ImmutablePair<>(userMod, !user.isSuspended()), propByRes, "update");
+ new ImmutablePair<>(updatedMod, !user.isSuspended()), propByRes, "update");
}
@Override
[5/9] syncope git commit: Embed last CXF improvements about WADL
Posted by md...@apache.org.
Embed last CXF improvements about WADL
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/02d48880
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/02d48880
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/02d48880
Branch: refs/heads/SYNCOPE-156
Commit: 02d4888011b26dfb470136ad621dcfc4bb406e33
Parents: 0272b1e
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Aug 27 17:50:05 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Aug 27 17:50:05 2015 +0200
----------------------------------------------------------------------
common/rest-api/pom.xml | 2 --
core/rest-cxf/src/main/resources/restCXFContext.xml | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/02d48880/common/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/common/rest-api/pom.xml b/common/rest-api/pom.xml
index 7a01834..bbad479 100644
--- a/common/rest-api/pom.xml
+++ b/common/rest-api/pom.xml
@@ -80,10 +80,8 @@ under the License.
<namespacePrefix>syncope</namespacePrefix>
<linkAnyMediaTypeToXmlSchema>true</linkAnyMediaTypeToXmlSchema>
<useJaxbContextForQnames>true</useJaxbContextForQnames>
- <ignoreMessageWriters>true</ignoreMessageWriters>
<addResourceAndMethodIds>true</addResourceAndMethodIds>
<usePathParamsToCompareOperations>false</usePathParamsToCompareOperations>
- <singleResourceMultipleMethods>true</singleResourceMultipleMethods>
<classResourceNames />
<basePackages>org.apache.syncope.common.rest.api.service</basePackages>
<docProvider>org.apache.cxf.maven_plugin.javatowadl.ResourceMapJavaDocProvider</docProvider>
http://git-wip-us.apache.org/repos/asf/syncope/blob/02d48880/core/rest-cxf/src/main/resources/restCXFContext.xml
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/resources/restCXFContext.xml b/core/rest-cxf/src/main/resources/restCXFContext.xml
index b8f8948..5155724 100644
--- a/core/rest-cxf/src/main/resources/restCXFContext.xml
+++ b/core/rest-cxf/src/main/resources/restCXFContext.xml
@@ -53,7 +53,7 @@ under the License.
<map>
<entry>
<key>
- <value>org.apache.syncope.common.lib.to.AbstractPolicyTO</value>
+ <value>org.apache.syncope.common.lib.policy.AbstractPolicyTO</value>
</key>
<value>policies</value>
</entry>
@@ -87,6 +87,7 @@ under the License.
docLocation="classpath:/META-INF/resources/doc/syncope.wadl">
<jaxrs:properties>
<entry key="search.lax.property.match" value="true"/>
+ <entry key="convert.wadl.resources.to.dom" value="false"/>
</jaxrs:properties>
<jaxrs:inInterceptors>
<ref bean="validationInInterceptor"/>
[9/9] syncope git commit: Merge branch 'master' into SYNCOPE-156
Posted by md...@apache.org.
Merge branch 'master' into SYNCOPE-156
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b2eda998
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b2eda998
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b2eda998
Branch: refs/heads/SYNCOPE-156
Commit: b2eda9980521ff3ea38093d0a0d5e30a3fcd082a
Parents: d9437d3 9658f8c
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Fri Aug 28 17:26:04 2015 +0200
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Fri Aug 28 17:26:04 2015 +0200
----------------------------------------------------------------------
.../syncope/common/lib/policy/package-info.java | 23 ++++
common/rest-api/pom.xml | 41 +++---
.../common/rest/api/service/AnyService.java | 38 +-----
.../rest/api/service/AnyTypeClassService.java | 7 -
.../common/rest/api/service/AnyTypeService.java | 7 -
.../rest/api/service/ConnectorService.java | 7 -
.../common/rest/api/service/DomainService.java | 7 -
.../common/rest/api/service/GroupService.java | 10 +-
.../rest/api/service/NotificationService.java | 7 -
.../common/rest/api/service/PolicyService.java | 6 -
.../common/rest/api/service/RealmService.java | 7 -
.../api/service/RelationshipTypeService.java | 7 -
.../common/rest/api/service/ReportService.java | 6 -
.../rest/api/service/ResourceService.java | 13 +-
.../common/rest/api/service/RoleService.java | 7 -
.../common/rest/api/service/SchemaService.java | 9 +-
.../api/service/SecurityQuestionService.java | 7 -
.../common/rest/api/service/SyncopeService.java | 5 +
.../common/rest/api/service/TaskService.java | 6 -
.../rest/api/service/UserSelfService.java | 22 +--
.../common/rest/api/service/UserService.java | 25 +---
.../serialization/UnwrappedObjectMapper.java | 93 -------------
.../main/resources/domains/MasterContent.xml | 2 +-
core/rest-cxf/pom.xml | 135 ++++++++++++++++++-
.../core/rest/cxf/UnwrappedObjectMapper.java | 85 ++++++++++++
.../syncope/core/rest/cxf/WADLServlet.java | 96 -------------
.../main/resources/META-INF/web-fragment.xml | 9 --
.../src/main/resources/restCXFContext.xml | 20 +--
.../src/main/resources/wadl2html/identity.xsl | 28 ++++
.../src/main/resources/wadl2html/index.xsl | 7 +-
.../java/DefaultUserWorkflowAdapter.java | 15 ++-
deb/core/pom.xml | 8 +-
.../src/main/resources/provisioning.properties | 5 +-
fit/core-reference/pom.xml | 15 ++-
.../resources/jboss/domains/MasterDomain.xml | 131 ++++++++++++++++++
.../jboss/persistenceContextEMFactory.xml | 73 ----------
.../WEB-INF/jboss-deployment-structure.xml | 2 +
.../fit/core/reference/DomainITCase.java | 6 +-
pom.xml | 21 +--
39 files changed, 495 insertions(+), 523 deletions(-)
----------------------------------------------------------------------
[2/9] syncope git commit: Finally fixing WADL offline generation and
live browsing
Posted by md...@apache.org.
Finally fixing WADL offline generation and live browsing
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/926e8fd9
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/926e8fd9
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/926e8fd9
Branch: refs/heads/SYNCOPE-156
Commit: 926e8fd90201be8fa31f8c518c73423ae06669e2
Parents: 64c5fbd
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Aug 27 15:45:13 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Aug 27 15:45:13 2015 +0200
----------------------------------------------------------------------
.../syncope/common/lib/policy/package-info.java | 23 ++++
common/rest-api/pom.xml | 43 +++---
.../common/rest/api/service/AnyService.java | 38 +-----
.../rest/api/service/AnyTypeClassService.java | 7 -
.../common/rest/api/service/AnyTypeService.java | 7 -
.../rest/api/service/ConnectorService.java | 7 -
.../common/rest/api/service/DomainService.java | 7 -
.../common/rest/api/service/GroupService.java | 10 +-
.../rest/api/service/NotificationService.java | 7 -
.../common/rest/api/service/PolicyService.java | 6 -
.../common/rest/api/service/RealmService.java | 7 -
.../api/service/RelationshipTypeService.java | 7 -
.../common/rest/api/service/ReportService.java | 6 -
.../rest/api/service/ResourceService.java | 13 +-
.../common/rest/api/service/RoleService.java | 7 -
.../common/rest/api/service/SchemaService.java | 6 -
.../api/service/SecurityQuestionService.java | 7 -
.../common/rest/api/service/SyncopeService.java | 5 +
.../common/rest/api/service/TaskService.java | 6 -
.../rest/api/service/UserSelfService.java | 22 +--
.../common/rest/api/service/UserService.java | 25 +---
core/rest-cxf/pom.xml | 135 ++++++++++++++++++-
.../syncope/core/rest/cxf/WADLServlet.java | 96 -------------
.../main/resources/META-INF/web-fragment.xml | 9 --
.../src/main/resources/restCXFContext.xml | 15 +--
.../src/main/resources/wadl2html/identity.xsl | 28 ++++
.../src/main/resources/wadl2html/index.xsl | 7 +-
pom.xml | 11 +-
28 files changed, 238 insertions(+), 329 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/lib/src/main/java/org/apache/syncope/common/lib/policy/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/policy/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/package-info.java
new file mode 100644
index 0000000..bb26628
--- /dev/null
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/policy/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+@XmlSchema(namespace = SyncopeConstants.NAMESPACE)
+package org.apache.syncope.common.lib.policy;
+
+import javax.xml.bind.annotation.XmlSchema;
+import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/common/rest-api/pom.xml b/common/rest-api/pom.xml
index 16f93e3..7a01834 100644
--- a/common/rest-api/pom.xml
+++ b/common/rest-api/pom.xml
@@ -47,18 +47,6 @@ under the License.
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-extension-search</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-service-description</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.syncope.common</groupId>
@@ -69,17 +57,38 @@ under the License.
<build>
<plugins>
- <!-- Generating javadoc JAR artifact for usage with CXF's WADL generator (for core) -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-java2wadl-plugin</artifactId>
<inherited>true</inherited>
<executions>
<execution>
- <id>attach-javadocs</id>
+ <id>parsejavadoc</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>parsejavadoc</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>process-classes</id>
+ <phase>process-classes</phase>
<goals>
- <goal>jar</goal>
+ <goal>java2wadl</goal>
</goals>
+ <configuration>
+ <applicationTitle>Apache Syncope ${project.version}</applicationTitle>
+ <namespacePrefix>syncope</namespacePrefix>
+ <linkAnyMediaTypeToXmlSchema>true</linkAnyMediaTypeToXmlSchema>
+ <useJaxbContextForQnames>true</useJaxbContextForQnames>
+ <ignoreMessageWriters>true</ignoreMessageWriters>
+ <addResourceAndMethodIds>true</addResourceAndMethodIds>
+ <usePathParamsToCompareOperations>false</usePathParamsToCompareOperations>
+ <singleResourceMultipleMethods>true</singleResourceMultipleMethods>
+ <classResourceNames />
+ <basePackages>org.apache.syncope.common.rest.api.service</basePackages>
+ <docProvider>org.apache.cxf.maven_plugin.javatowadl.ResourceMapJavaDocProvider</docProvider>
+ <attachWadl>true</attachWadl>
+ </configuration>
</execution>
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyService.java
index 1c0fda2..71aa4b6 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyService.java
@@ -30,9 +30,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.mod.AnyMod;
import org.apache.syncope.common.lib.mod.ResourceAssociationMod;
import org.apache.syncope.common.lib.to.AnyTO;
@@ -84,14 +81,8 @@ public interface AnyService<TO extends AnyTO, MOD extends AnyMod> extends JAXRSS
*
* @param anyTO any object to be created
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created any object as well as the any
- * object itself enriched with propagation status information - {@link AnyTO} as <tt>Entity</tt>
+ * object itself enriched with propagation status information - <tt>AnyTO</tt> as <tt>Entity</tt>
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>Location</tt> header of created any object as well as the "
- + "any object itself enriched with propagation status information - "
- + "<tt>AnyTO</tt> as <tt>Entity</tt>")
- })
@POST
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@@ -102,13 +93,8 @@ public interface AnyService<TO extends AnyTO, MOD extends AnyMod> extends JAXRSS
*
* @param anyMod modification to be applied to any object matching the provided key
* @return <tt>Response</tt> object featuring the updated any object enriched with propagation status information
- * - {@link AnyTO} as <tt>Entity</tt>
+ * - <tt>AnyTO</tt> as <tt>Entity</tt>
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring the updated any object enriched with propagation status information - "
- + "<tt>AnyTO</tt> as <tt>Entity</tt>")
- })
@POST
@Path("{key}")
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@@ -120,13 +106,8 @@ public interface AnyService<TO extends AnyTO, MOD extends AnyMod> extends JAXRSS
*
* @param key key of any object to be deleted
* @return <tt>Response</tt> object featuring the deleted any object enriched with propagation status information
- * - {@link AnyTO} as <tt>Entity</tt>
+ * - <tt>AnyTO</tt> as <tt>Entity</tt>
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring the deleted any object enriched with propagation status information - "
- + "<tt>AnyTO</tt> as <tt>Entity</tt>")
- })
@DELETE
@Path("{key}")
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@@ -139,13 +120,8 @@ public interface AnyService<TO extends AnyTO, MOD extends AnyMod> extends JAXRSS
* @param key any object id.
* @param type resource association action type
* @param resourceNames external resources to be used for propagation-related operations
- * @return <tt>Response</tt> object featuring
- * {@link BulkActionResult} as <tt>Entity</tt>
+ * @return <tt>Response</tt> object featuring <tt>BulkActionResult</tt> as <tt>Entity</tt>
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>BulkActionResult</tt> as <tt>Entity</tt>")
- })
@POST
@Path("{key}/deassociate/{type}")
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@@ -161,12 +137,8 @@ public interface AnyService<TO extends AnyTO, MOD extends AnyMod> extends JAXRSS
* @param key any object id.
* @param type resource association action type
* @param associationMod external resources to be used for propagation-related operations
- * @return <tt>Response</tt> object featuring {@link BulkActionResult} as <tt>Entity</tt>
+ * @return <tt>Response</tt> object featuring <tt>BulkActionResult</tt> as <tt>Entity</tt>
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>BulkActionResult</tt> as <tt>Entity</tt>")
- })
@POST
@Path("{key}/associate/{type}")
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyTypeClassService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyTypeClassService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyTypeClassService.java
index 43c3d23..454652e 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyTypeClassService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyTypeClassService.java
@@ -30,9 +30,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.to.AnyTypeClassTO;
/**
@@ -67,10 +64,6 @@ public interface AnyTypeClassService extends JAXRSService {
* @param anyTypeClassTO anyTypeClass to be created
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created anyTypeClass
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>Location</tt> header of created anyTypeClass")
- })
@POST
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
Response create(@NotNull AnyTypeClassTO anyTypeClassTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyTypeService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyTypeService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyTypeService.java
index c4a8c02..8f01fc1 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyTypeService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/AnyTypeService.java
@@ -30,9 +30,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.to.AnyTypeTO;
/**
@@ -67,10 +64,6 @@ public interface AnyTypeService extends JAXRSService {
* @param anyTypeTO anyType to be created
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created anyType
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>Location</tt> header of created anyType")
- })
@POST
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
Response create(@NotNull AnyTypeTO anyTypeTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ConnectorService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ConnectorService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ConnectorService.java
index 66da67c..b523758 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ConnectorService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ConnectorService.java
@@ -32,9 +32,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.to.BulkAction;
import org.apache.syncope.common.lib.to.BulkActionResult;
import org.apache.syncope.common.lib.to.ConnBundleTO;
@@ -148,10 +145,6 @@ public interface ConnectorService extends JAXRSService {
* @param connInstanceTO connector instance to be created
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created connector instance
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>Location</tt> header of created connector instance")
- })
@POST
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
Response create(@NotNull ConnInstanceTO connInstanceTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/DomainService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/DomainService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/DomainService.java
index 4076dc1..a37c643 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/DomainService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/DomainService.java
@@ -30,9 +30,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.to.DomainTO;
/**
@@ -67,10 +64,6 @@ public interface DomainService extends JAXRSService {
* @param domainTO domain to be created
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created domain
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>Location</tt> header of created domain")
- })
@POST
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
Response create(@NotNull DomainTO domainTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/GroupService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/GroupService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/GroupService.java
index 7d48b46..569c0b6 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/GroupService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/GroupService.java
@@ -23,9 +23,6 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.mod.GroupMod;
import org.apache.syncope.common.lib.to.GroupTO;
@@ -36,16 +33,11 @@ import org.apache.syncope.common.lib.to.GroupTO;
public interface GroupService extends AnyService<GroupTO, GroupMod> {
/**
- * This method is similar to {@link #read(Long)}, but uses different authentication handling to ensure that a user
+ * This method is similar to <tt>read()</tt>, but uses different authentication handling to ensure that a user
* can read his own groups.
*
* @return own groups
*/
- @Descriptions({
- @Description(target = DocTarget.METHOD,
- value = "This method is similar to <tt>read()</tt>, but uses different authentication handling to "
- + "ensure that a user can read his own groups.")
- })
@GET
@Path("own")
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/NotificationService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/NotificationService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/NotificationService.java
index ae33d5a..c380d31 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/NotificationService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/NotificationService.java
@@ -30,9 +30,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.to.NotificationTO;
/**
@@ -67,10 +64,6 @@ public interface NotificationService extends JAXRSService {
* @param notificationTO Creates a new notification.
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created notification
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>Location</tt> header of created notification")
- })
@POST
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
Response create(@NotNull NotificationTO notificationTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java
index 55b8747..e35ef7c 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/PolicyService.java
@@ -31,9 +31,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.policy.AbstractPolicyTO;
import org.apache.syncope.common.lib.types.PolicyType;
@@ -73,9 +70,6 @@ public interface PolicyService extends JAXRSService {
* @param <T> response type (extending PolicyTO)
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created policy
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE, value = "Featuring <tt>Location</tt> header of created policy")
- })
@POST
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
<T extends AbstractPolicyTO> Response create(@NotNull T policyTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java
index 74b2333..81111e0 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java
@@ -30,9 +30,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.to.RealmTO;
/**
@@ -68,10 +65,6 @@ public interface RealmService extends JAXRSService {
* @param realmTO new realm.
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created realm
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>Location</tt> header of created realm")
- })
@POST
@Path("{parentPath:.*}")
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RelationshipTypeService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RelationshipTypeService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RelationshipTypeService.java
index 178bb6c..30a7a15 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RelationshipTypeService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RelationshipTypeService.java
@@ -30,9 +30,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.to.RelationshipTypeTO;
/**
@@ -67,10 +64,6 @@ public interface RelationshipTypeService extends JAXRSService {
* @param relationshipTypeTO relationshipType to be created
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created relationshipType
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>Location</tt> header of created relationshipType")
- })
@POST
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
Response create(@NotNull RelationshipTypeTO relationshipTypeTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportService.java
index 44863ba..6d01b2a 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ReportService.java
@@ -33,9 +33,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.to.PagedResult;
import org.apache.syncope.common.lib.to.ReportExecTO;
import org.apache.syncope.common.lib.to.ReportTO;
@@ -88,9 +85,6 @@ public interface ReportService extends JAXRSService {
* @param reportTO report to be created
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created report
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE, value = "Featuring <tt>Location</tt> header of created report")
- })
@POST
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
Response create(@NotNull ReportTO reportTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceService.java
index cac9132..f15bcd5 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/ResourceService.java
@@ -30,9 +30,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.to.BulkAction;
import org.apache.syncope.common.lib.to.BulkActionResult;
import org.apache.syncope.common.lib.to.ConnObjectTO;
@@ -87,10 +84,6 @@ public interface ResourceService extends JAXRSService {
* @param resourceTO Resource to be created
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created resource
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>Location</tt> header of created resource")
- })
@POST
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
Response create(@NotNull ResourceTO resourceTO);
@@ -134,12 +127,8 @@ public interface ResourceService extends JAXRSService {
* @param anyTypeKey any object kind
* @param type resource de-association action type
* @param keys any object keys against which the bulk action will be performed
- * @return <tt>Response</tt> object featuring {@link BulkActionResult} as <tt>Entity</tt>
+ * @return <tt>Response</tt> object featuring <tt>BulkActionResult</tt> as <tt>Entity</tt>
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>BulkActionResult</tt> as <tt>Entity</tt>")
- })
@POST
@Path("{key}/bulkDeassociation/{anyTypeKey}/{type}")
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RoleService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RoleService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RoleService.java
index d6afa1f..36f18e7 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RoleService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RoleService.java
@@ -30,9 +30,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.to.RoleTO;
/**
@@ -67,10 +64,6 @@ public interface RoleService extends JAXRSService {
* @param roleTO role to be created
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created role
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>Location</tt> header of created role")
- })
@POST
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
Response create(@NotNull RoleTO roleTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/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 195e756..e59d7d0 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
@@ -30,9 +30,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.to.AbstractSchemaTO;
import org.apache.syncope.common.lib.types.SchemaType;
@@ -75,9 +72,6 @@ public interface SchemaService extends JAXRSService {
* @param schemaTO schema to be created
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created schema
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE, value = "Featuring <tt>Location</tt> header of created schema")
- })
@POST
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
<T extends AbstractSchemaTO> Response create(@NotNull @PathParam("type") SchemaType type, @NotNull T schemaTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SecurityQuestionService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SecurityQuestionService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SecurityQuestionService.java
index f0dcf27..d0a63f7 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SecurityQuestionService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SecurityQuestionService.java
@@ -30,9 +30,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.to.SecurityQuestionTO;
/**
@@ -67,10 +64,6 @@ public interface SecurityQuestionService extends JAXRSService {
* @param securityQuestionTO security question to be created
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created security question
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>Location</tt> header of created security question")
- })
@POST
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
Response create(@NotNull SecurityQuestionTO securityQuestionTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SyncopeService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SyncopeService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SyncopeService.java
index cdd6dbc..bb5a1a8 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SyncopeService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/SyncopeService.java
@@ -27,6 +27,11 @@ import org.apache.syncope.common.lib.to.SyncopeTO;
@Path("")
public interface SyncopeService extends JAXRSService {
+ /**
+ * Provides information summary about this Apache Syncope deployment's configuration.
+ *
+ * @return information summary about this Apache Syncope deployment's configuration
+ */
@GET
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
SyncopeTO info();
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
index 31b76f4..2665c51 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
@@ -34,9 +34,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.to.AbstractTaskTO;
import org.apache.syncope.common.lib.to.BulkAction;
import org.apache.syncope.common.lib.to.BulkActionResult;
@@ -99,9 +96,6 @@ public interface TaskService extends JAXRSService {
* @param <T> type of taskTO
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created task
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE, value = "Featuring <tt>Location</tt> header of created task")
- })
@POST
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
<T extends SchedTaskTO> Response create(@NotNull T taskTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java
index dd2fe7e..2203a11 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserSelfService.java
@@ -29,9 +29,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.mod.UserMod;
import org.apache.syncope.common.lib.to.UserTO;
@@ -57,13 +54,8 @@ public interface UserSelfService extends JAXRSService {
* @param userTO user to be created
* @param storePassword whether password shall be stored internally
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of self-registered user as well as the user
- * itself - {@link UserTO} as <tt>Entity</tt>
+ * itself - <tt>UserTO</tt> as <tt>Entity</tt>
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>Location</tt> header of self-registered user as well "
- + "as the user itself - {@link UserTO} as <tt>Entity</tt>")
- })
@POST
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@@ -74,12 +66,8 @@ public interface UserSelfService extends JAXRSService {
* Self-updates user.
*
* @param userMod modification to be applied to user matching the provided key
- * @return <tt>Response</tt> object featuring the updated user - {@link UserTO} as <tt>Entity</tt>
+ * @return <tt>Response</tt> object featuring the updated user - <tt>UserTO</tt> as <tt>Entity</tt>
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring the updated user - <tt>UserTO</tt> as <tt>Entity</tt>")
- })
@POST
@Path("{key}")
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@@ -89,12 +77,8 @@ public interface UserSelfService extends JAXRSService {
/**
* Self-deletes user.
*
- * @return <tt>Response</tt> object featuring the deleted user - {@link UserTO} as <tt>Entity</tt>
+ * @return <tt>Response</tt> object featuring the deleted user - <tt>UserTO</tt> as <tt>Entity</tt>
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring the deleted user - <tt>UserTO</tt> as <tt>Entity</tt>")
- })
@DELETE
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
Response delete();
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserService.java
index 418e233..fd0faac 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/UserService.java
@@ -29,9 +29,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
import org.apache.syncope.common.lib.mod.StatusMod;
import org.apache.syncope.common.lib.mod.UserMod;
import org.apache.syncope.common.lib.to.UserTO;
@@ -48,10 +45,6 @@ public interface UserService extends AnyService<UserTO, UserMod> {
* @param key user key
* @return <tt>Response</tt> object featuring HTTP header with username matching the given key
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring HTTP header with username matching the given key")
- })
@OPTIONS
@Path("{key}/username")
Response getUsername(@NotNull @PathParam("key") Long key);
@@ -62,10 +55,6 @@ public interface UserService extends AnyService<UserTO, UserMod> {
* @param username username
* @return <tt>Response</tt> object featuring HTTP header with key matching the given username
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring HTTP header with key matching the given username")
- })
@OPTIONS
@Path("{username}/key")
Response getUserKey(@NotNull @PathParam("username") String username);
@@ -76,13 +65,8 @@ public interface UserService extends AnyService<UserTO, UserMod> {
* @param userTO user to be created
* @param storePassword whether password shall be stored internally
* @return <tt>Response</tt> object featuring <tt>Location</tt> header of created user as well as the user itself
- * enriched with propagation status information - {@link UserTO} as <tt>Entity</tt>
+ * enriched with propagation status information - <tt>UserTO</tt> as <tt>Entity</tt>
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring <tt>Location</tt> header of created user as well as the "
- + "user itself enriched with propagation status information - <tt>UserTO</tt> as <tt>Entity</tt>")
- })
@POST
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
@@ -95,13 +79,8 @@ public interface UserService extends AnyService<UserTO, UserMod> {
*
* @param statusMod status update details
* @return <tt>Response</tt> object featuring the updated user enriched with propagation status information
- * - {@link UserTO} as <tt>Entity</tt>
+ * - <tt>UserTO</tt> as <tt>Entity</tt>
*/
- @Descriptions({
- @Description(target = DocTarget.RESPONSE,
- value = "Featuring the updated user enriched with propagation status information - "
- + "<tt>UserTO</tt> as <tt>Entity</tt>")
- })
@POST
@Path("{key}/status")
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/core/rest-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest-cxf/pom.xml b/core/rest-cxf/pom.xml
index 1651193..89c0de4 100644
--- a/core/rest-cxf/pom.xml
+++ b/core/rest-cxf/pom.xml
@@ -105,12 +105,6 @@ under the License.
</dependency>
<dependency>
- <groupId>org.apache.syncope.common</groupId>
- <artifactId>syncope-common-rest-api</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- </dependency>
- <dependency>
<groupId>org.apache.syncope.core</groupId>
<artifactId>syncope-core-logic</artifactId>
<version>${project.version}</version>
@@ -120,7 +114,7 @@ under the License.
<artifactId>syncope-common-rest-api</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery</artifactId>
@@ -131,6 +125,10 @@ under the License.
</dependency>
<dependency>
<groupId>org.webjars</groupId>
+ <artifactId>jquery-ui-themes</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
<artifactId>highlightjs</artifactId>
</dependency>
</dependencies>
@@ -139,6 +137,129 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.syncope.common</groupId>
+ <artifactId>syncope-common-rest-api</artifactId>
+ <version>${project.version}</version>
+ <type>wadl</type>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+ <dir>${project.build.directory}</dir>
+ <includes>
+ <include>syncope-common-rest-api-${project.version}.wadl</include>
+ </includes>
+ <outputDir>${project.build.directory}/classes/META-INF/resources/doc</outputDir>
+ <stylesheet>${project.build.directory}/classes/wadl2html/identity.xsl</stylesheet>
+ <outputProperties>
+ <outputProperty>
+ <name>indent</name>
+ <value>yes</value>
+ </outputProperty>
+ </outputProperties>
+ <fileMappers>
+ <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
+ <pattern>^.*$</pattern>
+ <replacement>syncope.wadl</replacement>
+ </fileMapper>
+ </fileMappers>
+ </transformationSet>
+ <transformationSet>
+ <dir>${project.build.directory}</dir>
+ <includes>
+ <include>syncope-common-rest-api-${project.version}.wadl</include>
+ </includes>
+ <outputDir>${project.build.directory}/classes/META-INF/resources/doc</outputDir>
+ <stylesheet>${project.build.directory}/classes/wadl2html/index.xsl</stylesheet>
+ <parameters>
+ <parameter>
+ <name>contextPath</name>
+ <value>..</value>
+ </parameter>
+ </parameters>
+ <outputProperties>
+ <outputProperty>
+ <name>indent</name>
+ <value>yes</value>
+ </outputProperty>
+ </outputProperties>
+ <fileMappers>
+ <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
+ <pattern>^.*$</pattern>
+ <replacement>index.html</replacement>
+ </fileMapper>
+ </fileMappers>
+ </transformationSet>
+ <transformationSet>
+ <dir>${project.build.directory}</dir>
+ <includes>
+ <include>syncope-common-rest-api-${project.version}.wadl</include>
+ </includes>
+ <outputDir>${project.build.directory}/classes/META-INF/resources/doc</outputDir>
+ <stylesheet>${project.build.directory}/classes/wadl2html/schema.xsl</stylesheet>
+ <parameters>
+ <parameter>
+ <name>contextPath</name>
+ <value>..</value>
+ </parameter>
+ <parameter>
+ <name>schema-position</name>
+ <value>1</value>
+ </parameter>
+ <parameter>
+ <name>schema-prefix</name>
+ <value>syncope1</value>
+ </parameter>
+ </parameters>
+ <outputProperties>
+ <outputProperty>
+ <name>indent</name>
+ <value>yes</value>
+ </outputProperty>
+ </outputProperties>
+ <fileMappers>
+ <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
+ <pattern>^.*$</pattern>
+ <replacement>schema_1_syncope1.html</replacement>
+ </fileMapper>
+ </fileMappers>
+ </transformationSet>
+ </transformationSets>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WADLServlet.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WADLServlet.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WADLServlet.java
deleted file mode 100644
index e5d5c74..0000000
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/WADLServlet.java
+++ /dev/null
@@ -1,96 +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.
- */
-package org.apache.syncope.core.rest.cxf;
-
-import java.io.IOException;
-import java.net.URL;
-import java.rmi.ServerException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.cocoon.pipeline.CachingPipeline;
-import org.apache.cocoon.pipeline.Pipeline;
-import org.apache.cocoon.sax.SAXPipelineComponent;
-import org.apache.cocoon.sax.component.XMLGenerator;
-import org.apache.cocoon.sax.component.XMLSerializer;
-import org.apache.cocoon.sax.component.XSLTTransformer;
-
-public class WADLServlet extends HttpServlet {
-
- private static final long serialVersionUID = -6737005675471095560L;
-
- private static final Pattern SCHEMA_PATTERN = Pattern.compile("/schema_(.*)_(.*)\\.html");
-
- /**
- * Handles the HTTP <code>GET</code> method.
- *
- * @param request servlet request
- * @param response servlet response
- * @throws ServletException if a servlet-specific error occurs
- * @throws IOException if an I/O error occurs
- */
- @Override
- protected void doGet(final HttpServletRequest request, final HttpServletResponse response)
- throws ServletException, IOException {
-
- String requestURI = request.getRequestURI().substring(
- request.getRequestURI().indexOf(request.getServletPath()) + request.getServletPath().length());
- Matcher schemaMatcher = SCHEMA_PATTERN.matcher(requestURI);
-
- Pipeline<SAXPipelineComponent> pipeline = new CachingPipeline<SAXPipelineComponent>();
- final String wadlURL = request.getRequestURL().
- substring(0, request.getRequestURL().indexOf("/doc")) + "/?_wadl";
- pipeline.addComponent(new XMLGenerator(new URL(wadlURL)));
- if ("/".equals(requestURI)) {
- XSLTTransformer xslt = new XSLTTransformer(getClass().getResource("/wadl2html/index.xsl"));
-
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("contextPath", request.getContextPath());
- xslt.setParameters(parameters);
-
- pipeline.addComponent(xslt);
- } else if (schemaMatcher.matches()) {
- XSLTTransformer xslt = new XSLTTransformer(getClass().getResource("/wadl2html/schema.xsl"));
-
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("contextPath", request.getContextPath());
- parameters.put("schema-position", schemaMatcher.group(1));
- parameters.put("schema-prefix", schemaMatcher.group(2));
- xslt.setParameters(parameters);
-
- pipeline.addComponent(xslt);
- } else {
- throw new ServerException("URL not supported: " + request.getRequestURI());
- }
-
- pipeline.addComponent(XMLSerializer.createHTML4Serializer());
- pipeline.setup(response.getOutputStream());
- try {
- pipeline.execute();
- } catch (Exception e) {
- throw new ServletException(e);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/core/rest-cxf/src/main/resources/META-INF/web-fragment.xml
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/resources/META-INF/web-fragment.xml b/core/rest-cxf/src/main/resources/META-INF/web-fragment.xml
index d5e53ef..e9ded9d 100644
--- a/core/rest-cxf/src/main/resources/META-INF/web-fragment.xml
+++ b/core/rest-cxf/src/main/resources/META-INF/web-fragment.xml
@@ -46,15 +46,6 @@ under the License.
<servlet-name>CXFServlet</servlet-name>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>
- <servlet>
- <servlet-name>WADLServlet</servlet-name>
- <servlet-class>org.apache.syncope.core.rest.cxf.WADLServlet</servlet-class>
- <load-on-startup>2</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>WADLServlet</servlet-name>
- <url-pattern>/rest/doc/*</url-pattern>
- </servlet-mapping>
<filter>
<filter-name>encodingFilter</filter-name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/core/rest-cxf/src/main/resources/restCXFContext.xml
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/resources/restCXFContext.xml b/core/rest-cxf/src/main/resources/restCXFContext.xml
index b26ed2e..b8f8948 100644
--- a/core/rest-cxf/src/main/resources/restCXFContext.xml
+++ b/core/rest-cxf/src/main/resources/restCXFContext.xml
@@ -78,23 +78,13 @@ under the License.
<bean id="searchContextProvider" class="org.apache.cxf.jaxrs.ext.search.SearchContextProvider"/>
- <bean id="wadlGenerator" class="org.apache.cxf.jaxrs.model.wadl.WadlGenerator">
- <property name="applicationTitle" value="Apache Syncope ${syncope.version}"/>
- <property name="namespacePrefix" value="syncope"/>
- <property name="linkJsonToXmlSchema" value="true"/>
- <property name="useJaxbContextForQnames" value="true"/>
- <property name="ignoreMessageWriters" value="true"/>
- <property name="addResourceAndMethodIds" value="true"/>
- <property name="usePathParamsToCompareOperations" value="false"/>
- <property name="javaDocPath" value="/WEB-INF/lib/syncope-common-rest-api-${syncope.version}-javadoc.jar"/>
- </bean>
-
<bean id="addDomainFilter" class="org.apache.syncope.core.rest.cxf.AddDomainFilter"/>
<bean id="addETagFilter" class="org.apache.syncope.core.rest.cxf.AddETagFilter"/>
<jaxrs:server id="restContainer" address="/"
basePackages="org.apache.syncope.common.rest.api.service, org.apache.syncope.core.rest.cxf.service"
- staticSubresourceResolution="true">
+ staticSubresourceResolution="true"
+ docLocation="classpath:/META-INF/resources/doc/syncope.wadl">
<jaxrs:properties>
<entry key="search.lax.property.match" value="true"/>
</jaxrs:properties>
@@ -109,7 +99,6 @@ under the License.
<ref bean="jsonProvider"/>
<ref bean="exceptionMapper"/>
<ref bean="searchContextProvider"/>
- <ref bean="wadlGenerator"/>
<ref bean="addDomainFilter"/>
<ref bean="addETagFilter"/>
</jaxrs:providers>
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/core/rest-cxf/src/main/resources/wadl2html/identity.xsl
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/resources/wadl2html/identity.xsl b/core/rest-cxf/src/main/resources/wadl2html/identity.xsl
new file mode 100644
index 0000000..3678f80
--- /dev/null
+++ b/core/rest-cxf/src/main/resources/wadl2html/identity.xsl
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+ <xsl:template match="node()|@*">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+</xsl:stylesheet>
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/core/rest-cxf/src/main/resources/wadl2html/index.xsl
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/resources/wadl2html/index.xsl b/core/rest-cxf/src/main/resources/wadl2html/index.xsl
index a4809a7..9e37e24 100644
--- a/core/rest-cxf/src/main/resources/wadl2html/index.xsl
+++ b/core/rest-cxf/src/main/resources/wadl2html/index.xsl
@@ -46,7 +46,7 @@
<xsl:value-of select="wadl:doc/@title"/>
</title>
- <link rel="stylesheet" href="{$contextPath}/webjars/jquery-ui/${jquery-ui.version}/jquery-ui.min.css"/>
+ <link rel="stylesheet" href="{$contextPath}/webjars/jquery-ui-themes/${jquery-ui.version}/smoothness/jquery-ui.min.css"/>
<style>
body {
font-family: "Verdana,Arial,sans-serif";
@@ -142,6 +142,7 @@
<th>Prefix</th>
<th>URI</th>
<th>XSD</th>
+ <th>WADL</th>
</tr>
<xsl:apply-templates select="wadl:grammars/xs:schema"/>
</table>
@@ -212,6 +213,10 @@
onClick="window.open('', 'schema', '', true).focus();" target="schema">
<xsl:value-of select="$prefix"/>.xsd</a>
</td>
+ <td>
+ <a href="syncope.wadl"
+ onClick="window.open('', 'wadl', '', true).focus();" target="wadl">syncope.wadl</a>
+ </td>
</tr>
</xsl:template>
http://git-wip-us.apache.org/repos/asf/syncope/blob/926e8fd9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index adc785d..68e2997 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,7 +326,7 @@ under the License.
<connid.ldap.version>1.4.0</connid.ldap.version>
<connid.ad.version>1.2.3</connid.ad.version>
- <cxf.version>3.1.2</cxf.version>
+ <cxf.version>3.1.3-SNAPSHOT</cxf.version>
<camel.version>2.15.3</camel.version>
@@ -371,7 +371,7 @@ under the License.
<log.directory>${project.build.directory}/log</log.directory>
<activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
- <jquery.version>2.1.3</jquery.version>
+ <jquery.version>2.1.4</jquery.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>
<bootstrap.version>3.3.5</bootstrap.version>
@@ -931,6 +931,11 @@ under the License.
</dependency>
<dependency>
<groupId>org.webjars</groupId>
+ <artifactId>jquery-ui-themes</artifactId>
+ <version>${jquery-ui.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
<version>${bootstrap.version}</version>
</dependency>
@@ -1081,7 +1086,7 @@ under the License.
<configuration>
<source>${targetJdk}</source>
<target>${targetJdk}</target>
- <useIncrementalCompilation>false</useIncrementalCompilation>
+ <useIncrementalCompilation>false</useIncrementalCompilation>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
<!--<compilerArgument>-Xlint:unchecked</compilerArgument>-->
[4/9] syncope git commit: Merge from 1_2_X
Posted by md...@apache.org.
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/0272b1ed
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0272b1ed
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0272b1ed
Branch: refs/heads/SYNCOPE-156
Commit: 0272b1ed49a1a902e242b65b3b7ed51e74d674dd
Parents: 926e8fd aa2286b
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Aug 27 17:00:43 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Aug 27 17:00:43 2015 +0200
----------------------------------------------------------------------
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0272b1ed/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 68e2997,07f0891..3b2a66f
--- a/pom.xml
+++ b/pom.xml
@@@ -1140,16 -1148,11 +1140,16 @@@ under the License
<artifactId>net.tirasa.connid.bundles.csvdir</artifactId>
<version>${connid.csvdir.version}</version>
</artifactItem>
- <dependency>
+ <artifactItem>
<groupId>net.tirasa.connid.bundles.db</groupId>
<artifactId>net.tirasa.connid.bundles.db.table</artifactId>
- <version>${connid.db.table.version}</version>
+ <version>${connid.database.version}</version>
- </dependency>
- <dependency>
++ </artifactItem>
++ <artifactItem>
+ <groupId>net.tirasa.connid.bundles.db</groupId>
+ <artifactId>net.tirasa.connid.bundles.db.scriptedsql</artifactId>
+ <version>${connid.database.version}</version>
- </dependency>
+ </artifactItem>
<artifactItem>
<groupId>net.tirasa.connid.bundles</groupId>
<artifactId>net.tirasa.connid.bundles.ldap</artifactId>
[8/9] syncope git commit: Preliminary changes for SYNCOPE-689
Posted by md...@apache.org.
Preliminary changes for SYNCOPE-689
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9658f8c3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9658f8c3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9658f8c3
Branch: refs/heads/SYNCOPE-156
Commit: 9658f8c384543889779cd2c398c8fcc115b43778
Parents: 716e2ed
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Aug 28 16:27:30 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Aug 28 16:27:30 2015 +0200
----------------------------------------------------------------------
fit/core-reference/pom.xml | 10 +-
.../resources/jboss/domains/MasterDomain.xml | 131 +++++++++++++++++++
.../jboss/persistenceContextEMFactory.xml | 73 -----------
.../WEB-INF/jboss-deployment-structure.xml | 2 +
pom.xml | 2 +-
5 files changed, 142 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/9658f8c3/fit/core-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index 2e65089..d9d9227 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -560,6 +560,12 @@ under the License.
<dependencies>
<dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.2.11</version>
+ </dependency>
+
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
@@ -644,9 +650,9 @@ under the License.
<inherited>true</inherited>
<configuration>
<container>
- <containerId>wildfly8x</containerId>
+ <containerId>wildfly9x</containerId>
<zipUrlInstaller>
- <url>http://download.jboss.org/wildfly/8.2.0.Final/wildfly-8.2.0.Final.zip</url>
+ <url>http://download.jboss.org/wildfly/9.0.1.Final/wildfly-9.0.1.Final.zip</url>
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
<extractDir>${project.build.directory}/cargo/extract</extractDir>
</zipUrlInstaller>
http://git-wip-us.apache.org/repos/asf/syncope/blob/9658f8c3/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml b/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml
new file mode 100644
index 0000000..35eacdc
--- /dev/null
+++ b/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:tx="http://www.springframework.org/schema/tx"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/tx
+ http://www.springframework.org/schema/tx/spring-tx.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util.xsd">
+
+ <bean id="MasterContentXML" class="org.apache.syncope.core.misc.spring.ResourceWithFallbackLoader">
+ <property name="primary" value="file:${content.directory}/domains/MasterContent.xml"/>
+ <property name="fallback" value="classpath:domains/MasterContent.xml"/>
+ </bean>
+ <bean id="MasterProperties" class="org.apache.syncope.core.misc.spring.ResourceWithFallbackLoader">
+ <property name="primary" value="file:${content.directory}/domains/Master.properties"/>
+ <property name="fallback" value="classpath:domains/Master.properties"/>
+ </bean>
+ <bean id="MasterDatabaseSchema" class="java.lang.String">
+ <constructor-arg value="${Master.schema}"/>
+ </bean>
+
+ <!-- Use JNDI datasource as default but, when not available, revert to
+ local datasource, with different properties for execution and testing.
+ In any case, get all JDBC connections with a determined isolation level. -->
+ <bean id="MasterDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
+ <property name="jndiName" value="java:comp/env/jdbc/syncopeMasterDataSource"/>
+ <property name="defaultObject" ref="localMasterDataSource"/>
+ </bean>
+
+ <bean id="localMasterDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
+ <property name="driverClassName" value="${Master.driverClassName}"/>
+ <property name="url" value="${Master.url}"/>
+ <property name="username" value="${Master.username}"/>
+ <property name="password" value="${Master.password}"/>
+ <!-- connection pool configuration - transaction isolation, default READ_COMMITTED (see SYNCOPE-202) -->
+ <property name="defaultTransactionIsolation">
+ <util:constant static-field="${Master.pool.defaultTransactionIsolation:java.sql.Connection.TRANSACTION_READ_COMMITTED}"/>
+ </property>
+ <!-- connection pool configuration - default values taken from BasicDataSource default values -->
+ <property name="initialSize" value="${Master.pool.initialSize:0}"/>
+ <property name="maxTotal" value="${Master.pool.maxActive:8}"/>
+ <property name="maxIdle" value="${Master.pool.maxIdle:8}"/>
+ <property name="minIdle" value="${Master.pool.minIdle:0}"/>
+ <property name="maxWaitMillis" value="${Master.pool.maxWait:-1}"/>
+ <property name="validationQuery" value="${Master.pool.validationQuery}"/>
+ <property name="validationQueryTimeout" value="${Master.pool.validationQueryTimeout:-1}"/>
+ <property name="testOnBorrow" value="${Master.pool.testOnBorrow:true}"/>
+ <property name="testOnReturn" value="${Master.pool.testOnReturn:false}"/>
+ <property name="testWhileIdle" value="${Master.pool.testWhileIdle:false}"/>
+ <property name="timeBetweenEvictionRunsMillis" value="${Master.pool.timeBetweenEvictionRunsMillis:-1}"/>
+ <property name="numTestsPerEvictionRun" value="${Master.pool.numTestsPerEvictionRun:3}"/>
+ <property name="minEvictableIdleTimeMillis" value="${Master.pool.minEvictableIdleTimeMillis:1800000}"/>
+ <property name="removeAbandonedOnBorrow" value="${Master.pool.removeAbandoned:false}"/>
+ <property name="removeAbandonedOnMaintenance" value="${Master.pool.removeAbandoned:false}"/>
+ <property name="removeAbandonedTimeout" value="${Master.pool.removeAbandonedTimeout:300}"/>
+ <property name="logAbandoned" value="${Master.pool.logAbandoned:false}"/>
+ </bean>
+
+ <bean class="org.springframework.jdbc.datasource.init.DataSourceInitializer">
+ <property name="dataSource" ref="MasterDataSource"/>
+ <property name="enabled" value="true"/>
+ <property name="databasePopulator">
+ <bean class="org.springframework.jdbc.datasource.init.ResourceDatabasePopulator">
+ <property name="continueOnError" value="true"/>
+ <property name="ignoreFailedDrops" value="true"/>
+ <property name="sqlScriptEncoding" value="UTF-8"/>
+ <property name="scripts">
+ <array>
+ <value type="org.springframework.core.io.Resource">
+ classpath:/audit/${Master.audit.sql}
+ </value>
+ </array>
+ </property>
+ </bean>
+ </property>
+ </bean>
+
+ <bean id="MasterEntityManagerFactory"
+ class="org.apache.syncope.core.persistence.jpa.spring.DomainEntityManagerFactoryBean">
+ <property name="mappingResources">
+ <list>
+ <value>${Master.orm}</value>
+ </list>
+ </property>
+ <property name="persistenceUnitName" value="Master"/>
+ <property name="dataSource" ref="MasterDataSource"/>
+ <property name="jpaVendorAdapter">
+ <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
+ <property name="showSql" value="false"/>
+ <property name="generateDdl" value="true"/>
+ <property name="databasePlatform" value="${Master.databasePlatform}"/>
+ </bean>
+ </property>
+ <property name="commonEntityManagerFactoryConf" ref="commonEMFConf"/>
+ <property name="jpaPropertyMap">
+ <map>
+ <entry key="openjpa.MetaDataFactory"
+ value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly8x/deployments/syncope.war/WEB-INF/classes, Resources=${Master.orm)"/>
+ </map>
+ </property>
+ </bean>
+
+ <bean id="MasterTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+ <property name="entityManagerFactory" ref="MasterEntityManagerFactory"/>
+ <qualifier value="Master"/>
+ </bean>
+
+ <tx:annotation-driven transaction-manager="MasterTransactionManager"/>
+
+</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/9658f8c3/fit/core-reference/src/main/resources/jboss/persistenceContextEMFactory.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/jboss/persistenceContextEMFactory.xml b/fit/core-reference/src/main/resources/jboss/persistenceContextEMFactory.xml
deleted file mode 100644
index 889400a..0000000
--- a/fit/core-reference/src/main/resources/jboss/persistenceContextEMFactory.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="entityManagerFactory"
- class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
- <property name="packagesToScan" value="org.apache.syncope.core.persistence.jpa.entity"/>
- <property name="validationMode" value="NONE"/>
- <property name="mappingResources">
- <list>
- <value>${jpa.orm}</value>
- </list>
- </property>
- <property name="persistenceUnitName" value="syncopePersistenceUnit"/>
- <property name="persistenceUnitPostProcessors">
- <list>
- <bean class="org.apache.syncope.core.persistence.jpa.spring.MultiJarAwarePersistenceUnitPostProcessor"/>
- </list>
- </property>
- <property name="dataSource" ref="dataSource"/>
- <property name="jpaVendorAdapter">
- <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
- <property name="showSql" value="false"/>
- <property name="generateDdl" value="true"/>
- <property name="databasePlatform" value="${jpa.dialect}"/>
- </bean>
- </property>
- <property name="jpaPropertyMap">
- <map>
- <!--<entry key="openjpa.Log" value="SQL=TRACE"/>
- <entry key="openjpa.ConnectionFactoryProperties" value="PrettyPrint=true, PrettyPrintLineLength=80"/>-->
-
- <entry key="openjpa.NontransactionalWrite" value="false"/>
- <entry key="openjpa.AutoDetach" value="close, commit, nontx-read, rollback"/>
-
- <entry key="openjpa.jdbc.SchemaFactory" value="native(ForeignKeys=true)"/>
- <entry key="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict"/>
-
- <entry key="openjpa.ReadLockLevel" value="none"/>
- <entry key="openjpa.WriteLockLevel" value="write"/>
- <entry key="openjpa.LockTimeout" value="30000"/>
-
- <entry key="openjpa.DataCache" value="true" />
- <entry key="openjpa.QueryCache" value="true"/>
- <entry key="openjpa.RemoteCommitProvider" value="sjvm"/>
-
- <entry key="openjpa.MetaDataFactory"
- value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly8x/deployments/syncope.war/WEB-INF/classes, Resources=${jpa.orm})"/>
- </map>
- </property>
- </bean>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/syncope/blob/9658f8c3/fit/core-reference/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/fit/core-reference/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index f47298d..8f753d9 100644
--- a/fit/core-reference/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/fit/core-reference/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -33,6 +33,8 @@ under the License.
<module name="org.hibernate"/>
<module name="org.slf4j"/>
<module name="org.slf4j.impl"/>
+ <module name="org.apache.log4j"/>
+ <module name="org.jboss.log4j.logmanager"/>
</exclusions>
</deployment>
</jboss-deployment-structure>
http://git-wip-us.apache.org/repos/asf/syncope/blob/9658f8c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3b2a66f..a61c8c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,7 +320,7 @@ under the License.
<syncope.version>${project.version}</syncope.version>
<connid.version>1.4.1.0</connid.version>
- <connid.soap.version>1.3.0</connid.soap.version>
+ <connid.soap.version>1.4.0-SNAPSHOT</connid.soap.version>
<connid.database.version>2.2.3-SNAPSHOT</connid.database.version>
<connid.csvdir.version>0.8.2</connid.csvdir.version>
<connid.ldap.version>1.4.0</connid.ldap.version>
[3/9] syncope git commit: Upgrading to CXF 3.0.7-SNAPSHOT to benefit
from latests WADL fixes
Posted by md...@apache.org.
Upgrading to CXF 3.0.7-SNAPSHOT to benefit from latests WADL fixes
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/aa2286b2
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/aa2286b2
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/aa2286b2
Branch: refs/heads/SYNCOPE-156
Commit: aa2286b2c02554452dccfb3b0712cb6398d52fa6
Parents: 39eb575
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Aug 27 16:55:56 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Aug 27 16:55:56 2015 +0200
----------------------------------------------------------------------
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/aa2286b2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6cee0c5..07f0891 100644
--- a/pom.xml
+++ b/pom.xml
@@ -343,7 +343,7 @@ under the License.
<aspectj.version>1.8.6</aspectj.version>
- <cxf.version>3.0.6</cxf.version>
+ <cxf.version>3.0.7-SNAPSHOT</cxf.version>
<spring.version>4.0.9.RELEASE</spring.version>
<spring-security.version>3.2.8.RELEASE</spring-security.version>
<jackson.version>2.4.6</jackson.version>
@@ -1148,11 +1148,11 @@ under the License.
<artifactId>net.tirasa.connid.bundles.csvdir</artifactId>
<version>${connid.csvdir.version}</version>
</artifactItem>
- <dependency>
+ <artifactItem>
<groupId>net.tirasa.connid.bundles.db</groupId>
<artifactId>net.tirasa.connid.bundles.db.table</artifactId>
<version>${connid.db.table.version}</version>
- </dependency>
+ </artifactItem>
<artifactItem>
<groupId>net.tirasa.connid.bundles</groupId>
<artifactId>net.tirasa.connid.bundles.ldap</artifactId>