You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/08/27 17:52:49 UTC
[1/3] syncope git commit: Upgrading to CXF 3.0.7-SNAPSHOT to benefit
from latests WADL fixes
Repository: syncope
Updated Branches:
refs/heads/master 926e8fd90 -> 02d488801
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/master
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>
[2/3] syncope git commit: Merge from 1_2_X
Posted by il...@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/master
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>
[3/3] syncope git commit: Embed last CXF improvements about WADL
Posted by il...@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/master
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"/>