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 2016/09/12 14:52:01 UTC
[2/2] syncope git commit: Advancing to 2.1.0-SNAPSHOT,
setting min req to JDK 1.8, upgrading Tycho and CXF
Advancing to 2.1.0-SNAPSHOT, setting min req to JDK 1.8, upgrading Tycho and CXF
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4f058c35
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4f058c35
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4f058c35
Branch: refs/heads/master
Commit: 4f058c357be27d9a256a4d1b7e75fcd387f14913
Parents: 8c192fc
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Thu Aug 25 15:57:02 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Mon Sep 12 16:49:42 2016 +0200
----------------------------------------------------------------------
.travis.yml | 4 +-
archetype/pom.xml | 2 +-
.../archetype-resources/console/pom.xml | 2 +-
.../archetype-resources/enduser/pom.xml | 2 +-
client/cli/pom.xml | 2 +-
client/console/pom.xml | 2 +-
.../console/BookmarkablePageLinkBuilder.java | 11 +-
.../syncope/client/console/pages/BasePage.java | 8 +-
.../client/console/widgets/ApprovalsWidget.java | 2 +-
.../console/widgets/CompletenessWidget.java | 13 +-
client/enduser/pom.xml | 2 +-
client/lib/pom.xml | 2 +-
client/pom.xml | 2 +-
common/lib/pom.xml | 2 +-
.../syncope/common/lib/SyncopeConstants.java | 4 +-
.../syncope/common/lib/info/package-info.java | 6 +-
.../syncope/common/lib/jaxb/package-info.java | 6 +-
.../apache/syncope/common/lib/package-info.java | 2 +-
.../syncope/common/lib/patch/package-info.java | 6 +-
.../syncope/common/lib/policy/package-info.java | 6 +-
.../syncope/common/lib/report/package-info.java | 6 +-
.../syncope/common/lib/search/package-info.java | 6 +-
.../syncope/common/lib/to/package-info.java | 6 +-
.../syncope/common/lib/types/package-info.java | 6 +-
common/pom.xml | 2 +-
common/rest-api/pom.xml | 5 +-
core/logic/pom.xml | 2 +-
core/migration/pom.xml | 2 +-
core/persistence-api/pom.xml | 2 +-
core/persistence-jpa/pom.xml | 2 +-
core/pom.xml | 2 +-
core/provisioning-api/pom.xml | 2 +-
core/provisioning-java/pom.xml | 2 +-
core/rest-cxf/pom.xml | 10 +-
.../rest/cxf/ExtendedSwagger2Serializers.java | 191 +++----------------
.../syncope/core/rest/cxf/Swagger2Feature.java | 175 -----------------
.../core/rest/cxf/Swagger2Serializers.java | 36 ----
.../main/resources/META-INF/web-fragment.xml | 2 +-
.../src/main/resources/restCXFContext.xml | 7 +-
core/spring/pom.xml | 2 +-
core/workflow-activiti/pom.xml | 2 +-
core/workflow-api/pom.xml | 2 +-
core/workflow-java/pom.xml | 2 +-
deb/console/pom.xml | 2 +-
deb/core/pom.xml | 2 +-
deb/enduser/pom.xml | 2 +-
deb/pom.xml | 2 +-
ext/camel/client-console/pom.xml | 2 +-
ext/camel/common-lib/pom.xml | 2 +-
ext/camel/logic/pom.xml | 2 +-
ext/camel/persistence-api/pom.xml | 2 +-
ext/camel/persistence-jpa/pom.xml | 2 +-
ext/camel/pom.xml | 2 +-
ext/camel/provisioning-api/pom.xml | 2 +-
ext/camel/provisioning-camel/pom.xml | 2 +-
ext/camel/rest-api/pom.xml | 2 +-
ext/camel/rest-cxf/pom.xml | 2 +-
ext/pom.xml | 2 +-
ext/swagger-ui/pom.xml | 2 +-
fit/build-tools/pom.xml | 2 +-
fit/console-reference/pom.xml | 2 +-
fit/core-reference/pom.xml | 2 +-
.../src/main/resources/jboss/restCXFContext.xml | 22 +--
fit/enduser-reference/pom.xml | 2 +-
fit/pom.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../pom.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
ide/eclipse/pom.xml | 2 +-
.../category.xml | 2 +-
.../org.apache.syncope.ide.eclipse.site/pom.xml | 2 +-
ide/pom.xml | 2 +-
installer/pom.xml | 2 +-
pom.xml | 12 +-
src/main/asciidoc/getting-started/obtain.adoc | 3 +-
.../systemadministration/javaeecontainer.adoc | 6 +-
standalone/pom.xml | 2 +-
standalone/src/main/resources/setenv.bat | 2 +-
standalone/src/main/resources/setenv.sh | 2 +-
79 files changed, 171 insertions(+), 496 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b9c0cea..01bf6f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,9 +19,9 @@ cache:
- $HOME/.m2
language: java
jdk:
- - openjdk7
+ - openjdk8
before_install:
- - echo 'MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m"' >~/.mavenrc
+ - echo 'MAVEN_OPTS="-Xms512m -Xmx1024m"' >~/.mavenrc
# default install is mvn install --quiet -DskipTests=true
install: mvn --show-version --quiet -P all,skipTests
script:
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/archetype/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/pom.xml b/archetype/pom.xml
index f02f7f8..6408cd9 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Archetype</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/archetype/src/main/resources/archetype-resources/console/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/src/main/resources/archetype-resources/console/pom.xml b/archetype/src/main/resources/archetype-resources/console/pom.xml
index 5913a03..8b38e29 100644
--- a/archetype/src/main/resources/archetype-resources/console/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/console/pom.xml
@@ -278,7 +278,7 @@ ORYX.Editor.createByUrl = function(modelUrl){"/>
<cargo.tomcat.ajp.port>${cargo.tomcat.ajp.port}</cargo.tomcat.ajp.port>
<cargo.rmi.port>${cargo.rmi.port}</cargo.rmi.port>
- <cargo.jvmargs>-noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=256m</cargo.jvmargs>
+ <cargo.jvmargs>-noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC</cargo.jvmargs>
</properties>
</configuration>
<deployables>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/archetype/src/main/resources/archetype-resources/enduser/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/src/main/resources/archetype-resources/enduser/pom.xml b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
index 0c962d6..f3ba241 100644
--- a/archetype/src/main/resources/archetype-resources/enduser/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
@@ -221,7 +221,7 @@ under the License.
<cargo.tomcat.ajp.port>${cargo.tomcat.ajp.port}</cargo.tomcat.ajp.port>
<cargo.rmi.port>${cargo.rmi.port}</cargo.rmi.port>
- <cargo.jvmargs>-noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=256m</cargo.jvmargs>
+ <cargo.jvmargs>-noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC</cargo.jvmargs>
</properties>
</configuration>
<deployables>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/client/cli/pom.xml
----------------------------------------------------------------------
diff --git a/client/cli/pom.xml b/client/cli/pom.xml
index c87aac2..b6d185a 100644
--- a/client/cli/pom.xml
+++ b/client/cli/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-client</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Client CLI</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/client/console/pom.xml
----------------------------------------------------------------------
diff --git a/client/console/pom.xml b/client/console/pom.xml
index 812070f..9a567c3 100644
--- a/client/console/pom.xml
+++ b/client/console/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-client</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Client Console</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/client/console/src/main/java/org/apache/syncope/client/console/BookmarkablePageLinkBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/BookmarkablePageLinkBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/BookmarkablePageLinkBuilder.java
index 91d753a..fe87a88 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/BookmarkablePageLinkBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/BookmarkablePageLinkBuilder.java
@@ -23,16 +23,17 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
public final class BookmarkablePageLinkBuilder {
- public static <T> BookmarkablePageLink<T> build(
- final String key, final Class<? extends BasePage> defaultPageClass) {
+ public static <T extends BasePage> BookmarkablePageLink<T> build(
+ final String key, final Class<T> defaultPageClass) {
return build(key, key, defaultPageClass);
}
- public static <T> BookmarkablePageLink<T> build(
- final String key, final String id, final Class<? extends BasePage> defaultPageClass) {
+ public static <T extends BasePage> BookmarkablePageLink<T> build(
+ final String key, final String id, final Class<T> defaultPageClass) {
- Class<? extends BasePage> pageClass = SyncopeConsoleApplication.get().getPageClass(key);
+ @SuppressWarnings("unchecked")
+ Class<T> pageClass = (Class<T>) SyncopeConsoleApplication.get().getPageClass(key);
return new BookmarkablePageLink<>(
id,
pageClass == null ? defaultPageClass : pageClass);
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
index aa30144..2335b23 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
@@ -164,7 +164,7 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware {
liContainer = new WebMarkupContainer(getLIContainerId("realms"));
body.add(liContainer);
- BookmarkablePageLink<Page> link = BookmarkablePageLinkBuilder.build("realms", Realms.class);
+ BookmarkablePageLink<? extends BasePage> link = BookmarkablePageLinkBuilder.build("realms", Realms.class);
MetaDataRoleAuthorizationStrategy.authorize(link, WebPage.ENABLE, StandardEntitlement.REALM_LIST);
liContainer.add(link);
@@ -259,7 +259,7 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware {
}
});
body.add(new Label("domain", SyncopeConsoleSession.get().getDomain()));
- body.add(new BookmarkablePageLink<Page>("logout", Logout.class));
+ body.add(new BookmarkablePageLink<>("logout", Logout.class));
// set 'active' menu item for everything but extensions
// 1. check if current class is set to top-level menu
@@ -306,8 +306,8 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware {
}
// Extensions
- ClassPathScanImplementationLookup classPathScanImplementationLookup
- = (ClassPathScanImplementationLookup) SyncopeConsoleApplication.get().
+ ClassPathScanImplementationLookup classPathScanImplementationLookup =
+ (ClassPathScanImplementationLookup) SyncopeConsoleApplication.get().
getServletContext().getAttribute(ConsoleInitializer.CLASSPATH_LOOKUP);
List<Class<? extends BaseExtPage>> extPageClasses = classPathScanImplementationLookup.getExtPageClasses();
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java
index 3301bb9..d8d8666 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ApprovalsWidget.java
@@ -109,7 +109,7 @@ public class ApprovalsWidget extends AlertWidget<WorkflowFormTO> {
@Override
protected AbstractLink getEventsLink(final String linkid) {
- BookmarkablePageLink<Object> approvals = BookmarkablePageLinkBuilder.build(linkid, Approvals.class);
+ BookmarkablePageLink<Approvals> approvals = BookmarkablePageLinkBuilder.build(linkid, Approvals.class);
MetaDataRoleAuthorizationStrategy.authorize(approvals, WebPage.ENABLE, StandardEntitlement.WORKFLOW_FORM_LIST);
return approvals;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/client/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java
index 99bdca5..ab74021 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/CompletenessWidget.java
@@ -31,7 +31,6 @@ import org.apache.syncope.client.console.pages.Types;
import org.apache.syncope.client.console.topology.Topology;
import org.apache.syncope.common.lib.info.NumbersInfo;
import org.apache.syncope.common.lib.types.StandardEntitlement;
-import org.apache.wicket.Page;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
@@ -48,17 +47,17 @@ public class CompletenessWidget extends BaseWidget {
private final WebMarkupContainer actions;
- private final BookmarkablePageLink<Page> topology;
+ private final BookmarkablePageLink<Topology> topology;
- private final BookmarkablePageLink<Page> policies;
+ private final BookmarkablePageLink<Policies> policies;
- private final BookmarkablePageLink<Page> notifications;
+ private final BookmarkablePageLink<Notifications> notifications;
- private final BookmarkablePageLink<Page> types;
+ private final BookmarkablePageLink<Types> types;
- private final BookmarkablePageLink<Page> securityquestions;
+ private final BookmarkablePageLink<SecurityQuestions> securityquestions;
- private final BookmarkablePageLink<Page> roles;
+ private final BookmarkablePageLink<Roles> roles;
public CompletenessWidget(final String id, final Map<NumbersInfo.ConfItem, Boolean> confCompleteness) {
super(id);
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/client/enduser/pom.xml
----------------------------------------------------------------------
diff --git a/client/enduser/pom.xml b/client/enduser/pom.xml
index 6af95bd..0a461f5 100644
--- a/client/enduser/pom.xml
+++ b/client/enduser/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-client</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Client Enduser</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/client/lib/pom.xml
----------------------------------------------------------------------
diff --git a/client/lib/pom.xml b/client/lib/pom.xml
index e8dc061..39d98da 100644
--- a/client/lib/pom.xml
+++ b/client/lib/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-client</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Client Lib</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index fc447bb..f0e43e7 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Client</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/common/lib/pom.xml
----------------------------------------------------------------------
diff --git a/common/lib/pom.xml b/common/lib/pom.xml
index d9b88bb..27ae939 100644
--- a/common/lib/pom.xml
+++ b/common/lib/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-common</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Common Lib</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java b/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java
index 81f93a0..8d80f6d 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/SyncopeConstants.java
@@ -25,7 +25,9 @@ import java.util.regex.Pattern;
public final class SyncopeConstants {
- public static final String NAMESPACE = "http://syncope.apache.org/2.0";
+ public static final String NS_PREFIX = "syncope2";
+
+ public static final String NS = "http://syncope.apache.org/2.0";
public static final String MASTER_DOMAIN = "Master";
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/common/lib/src/main/java/org/apache/syncope/common/lib/info/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/info/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/info/package-info.java
index fccc6f4..60ef65d 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/info/package-info.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/info/package-info.java
@@ -16,8 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE)
+@XmlSchema(
+ namespace = SyncopeConstants.NS,
+ xmlns = { @XmlNs(prefix = SyncopeConstants.NS_PREFIX,
+ namespaceURI = SyncopeConstants.NS) })
package org.apache.syncope.common.lib.info;
+import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlSchema;
import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/package-info.java
index a04b95d..dd6b260 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/package-info.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/jaxb/package-info.java
@@ -16,8 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE)
+@XmlSchema(
+ namespace = SyncopeConstants.NS,
+ xmlns = { @XmlNs(prefix = SyncopeConstants.NS_PREFIX,
+ namespaceURI = SyncopeConstants.NS) })
package org.apache.syncope.common.lib.jaxb;
+import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlSchema;
import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/common/lib/src/main/java/org/apache/syncope/common/lib/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/package-info.java
index 8eac5d5..43df8b4 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/package-info.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/package-info.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE)
+@XmlSchema(namespace = SyncopeConstants.NS)
package org.apache.syncope.common.lib;
import javax.xml.bind.annotation.XmlSchema;
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/common/lib/src/main/java/org/apache/syncope/common/lib/patch/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/package-info.java
index 426ac6d..2aeca44 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/patch/package-info.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/patch/package-info.java
@@ -16,8 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE)
+@XmlSchema(
+ namespace = SyncopeConstants.NS,
+ xmlns = { @XmlNs(prefix = SyncopeConstants.NS_PREFIX,
+ namespaceURI = SyncopeConstants.NS) })
package org.apache.syncope.common.lib.patch;
+import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlSchema;
import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/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
index bb26628..67952ac 100644
--- 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
@@ -16,8 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE)
+@XmlSchema(
+ namespace = SyncopeConstants.NS,
+ xmlns = { @XmlNs(prefix = SyncopeConstants.NS_PREFIX,
+ namespaceURI = SyncopeConstants.NS) })
package org.apache.syncope.common.lib.policy;
+import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlSchema;
import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/common/lib/src/main/java/org/apache/syncope/common/lib/report/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/report/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/report/package-info.java
index bc452c1..9d6a5da 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/report/package-info.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/report/package-info.java
@@ -16,8 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE)
+@XmlSchema(
+ namespace = SyncopeConstants.NS,
+ xmlns = { @XmlNs(prefix = SyncopeConstants.NS_PREFIX,
+ namespaceURI = SyncopeConstants.NS) })
package org.apache.syncope.common.lib.report;
+import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlSchema;
import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/common/lib/src/main/java/org/apache/syncope/common/lib/search/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/search/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/search/package-info.java
index ff6b5e7..5b06db0 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/search/package-info.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/search/package-info.java
@@ -16,8 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE)
+@XmlSchema(
+ namespace = SyncopeConstants.NS,
+ xmlns = { @XmlNs(prefix = SyncopeConstants.NS_PREFIX,
+ namespaceURI = SyncopeConstants.NS) })
package org.apache.syncope.common.lib.search;
+import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlSchema;
import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/common/lib/src/main/java/org/apache/syncope/common/lib/to/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/package-info.java
index b02ed8f..7467695 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/package-info.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/package-info.java
@@ -16,8 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE)
+@XmlSchema(
+ namespace = SyncopeConstants.NS,
+ xmlns = { @XmlNs(prefix = SyncopeConstants.NS_PREFIX,
+ namespaceURI = SyncopeConstants.NS) })
package org.apache.syncope.common.lib.to;
+import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlSchema;
import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/common/lib/src/main/java/org/apache/syncope/common/lib/types/package-info.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/package-info.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/package-info.java
index 80cb87f..6d6cd5c 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/package-info.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/package-info.java
@@ -16,8 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-@XmlSchema(namespace = SyncopeConstants.NAMESPACE)
+@XmlSchema(
+ namespace = SyncopeConstants.NS,
+ xmlns = { @XmlNs(prefix = SyncopeConstants.NS_PREFIX,
+ namespaceURI = SyncopeConstants.NS) })
package org.apache.syncope.common.lib.types;
+import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlSchema;
import org.apache.syncope.common.lib.SyncopeConstants;
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index dadf7a0..d0aff35 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Common</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/common/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/common/rest-api/pom.xml b/common/rest-api/pom.xml
index de49287..3ddbe91 100644
--- a/common/rest-api/pom.xml
+++ b/common/rest-api/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-common</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Common REST API</name>
@@ -138,7 +138,8 @@ under the License.
</goals>
<configuration>
<applicationTitle>Apache Syncope ${project.version}</applicationTitle>
- <namespacePrefix>syncope</namespacePrefix>
+ <namespacePrefix>syncope2</namespacePrefix>
+ <incrementNamespacePrefix>false</incrementNamespacePrefix>
<linkAnyMediaTypeToXmlSchema>true</linkAnyMediaTypeToXmlSchema>
<useJaxbContextForQnames>true</useJaxbContextForQnames>
<addResourceAndMethodIds>true</addResourceAndMethodIds>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/logic/pom.xml
----------------------------------------------------------------------
diff --git a/core/logic/pom.xml b/core/logic/pom.xml
index f6fde87..1d6e81c 100644
--- a/core/logic/pom.xml
+++ b/core/logic/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-core</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Core Logic</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/migration/pom.xml
----------------------------------------------------------------------
diff --git a/core/migration/pom.xml b/core/migration/pom.xml
index 7f106b2..dcca9d3 100644
--- a/core/migration/pom.xml
+++ b/core/migration/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-core</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Core Migration</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/persistence-api/pom.xml
----------------------------------------------------------------------
diff --git a/core/persistence-api/pom.xml b/core/persistence-api/pom.xml
index 948a535..fa14bbe 100644
--- a/core/persistence-api/pom.xml
+++ b/core/persistence-api/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-core</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Core Persistence API</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/persistence-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/pom.xml b/core/persistence-jpa/pom.xml
index 88fa2bc..72b5ad2 100644
--- a/core/persistence-jpa/pom.xml
+++ b/core/persistence-jpa/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-core</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Core Persistence JPA</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 0da40dc..9af2e48 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Core</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/provisioning-api/pom.xml
----------------------------------------------------------------------
diff --git a/core/provisioning-api/pom.xml b/core/provisioning-api/pom.xml
index b3d71b6..4092a09 100644
--- a/core/provisioning-api/pom.xml
+++ b/core/provisioning-api/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-core</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Core Provisioning API</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/provisioning-java/pom.xml
----------------------------------------------------------------------
diff --git a/core/provisioning-java/pom.xml b/core/provisioning-java/pom.xml
index cd6436e..852cd06 100644
--- a/core/provisioning-java/pom.xml
+++ b/core/provisioning-java/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-core</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Core Provisioning Java</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/rest-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/core/rest-cxf/pom.xml b/core/rest-cxf/pom.xml
index 218a9b6..d011ebd 100644
--- a/core/rest-cxf/pom.xml
+++ b/core/rest-cxf/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-core</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Core REST CXF</name>
@@ -241,7 +241,7 @@ under the License.
</parameter>
<parameter>
<name>schema-prefix</name>
- <value>syncope1</value>
+ <value>syncope2</value>
</parameter>
</parameters>
<outputProperties>
@@ -253,7 +253,7 @@ under the License.
<fileMappers>
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper">
<pattern>^.*$</pattern>
- <replacement>schema_1_syncope1.html</replacement>
+ <replacement>schema_1_syncope2.html</replacement>
</fileMapper>
</fileMappers>
</transformationSet>
@@ -276,8 +276,8 @@ under the License.
<replace file="${project.build.directory}/generated/wadl/index.html" token="../webjars/jquery-ui/$/jquery-ui.min.js" value="http://code.jquery.com/ui/${jquery-ui.version}/jquery-ui.min.js" />
<replace file="${project.build.directory}/generated/wadl/index.html" token="../webjars/jquery-ui-themes/$/smoothness/jquery-ui.min.css" value="https://code.jquery.com/ui/${jquery-ui.version}/themes/smoothness/jquery-ui.css" />
- <replace file="${project.build.directory}/generated/wadl/schema_1_syncope1.html" token="../webjars/highlightjs/$/highlight.min.js" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/highlight.min.js" />
- <replace file="${project.build.directory}/generated/wadl/schema_1_syncope1.html" token="../webjars/highlightjs/$/styles/default.min.css" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/styles/default.min.css" />
+ <replace file="${project.build.directory}/generated/wadl/schema_1_syncope2.html" token="../webjars/highlightjs/$/highlight.min.js" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/highlight.min.js" />
+ <replace file="${project.build.directory}/generated/wadl/schema_1_syncope2.html" token="../webjars/highlightjs/$/styles/default.min.css" value="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightjs.version}/styles/default.min.css" />
<copy todir="${site.deploymentBaseDir}/rest/2.0">
<fileset dir="${project.build.directory}/generated/wadl" />
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/ExtendedSwagger2Serializers.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/ExtendedSwagger2Serializers.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/ExtendedSwagger2Serializers.java
index 0bdd107..b9a20b2 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/ExtendedSwagger2Serializers.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/ExtendedSwagger2Serializers.java
@@ -18,193 +18,46 @@
*/
package org.apache.syncope.core.rest.cxf;
-import io.swagger.jaxrs.listing.SwaggerSerializers;
-import io.swagger.models.HttpMethod;
-import io.swagger.models.Operation;
-import io.swagger.models.Path;
-import io.swagger.models.Swagger;
-import io.swagger.models.Tag;
import io.swagger.models.parameters.HeaderParameter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
+import io.swagger.models.parameters.Parameter;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import org.apache.commons.collections4.ComparatorUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.cxf.jaxrs.ext.MessageContext;
-import org.apache.cxf.jaxrs.model.ClassResourceInfo;
-import org.apache.cxf.jaxrs.model.OperationResourceInfo;
-import org.apache.cxf.jaxrs.model.doc.DocumentationProvider;
-import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+import org.apache.cxf.jaxrs.swagger.DefaultSwagger2Serializers;
+import org.apache.cxf.jaxrs.swagger.Swagger2Serializers;
import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.rest.api.RESTHeaders;
import org.apache.syncope.core.persistence.api.DomainsHolder;
import org.apache.syncope.core.spring.ApplicationContextProvider;
-public class ExtendedSwagger2Serializers extends SwaggerSerializers implements Swagger2Serializers {
+public class ExtendedSwagger2Serializers extends DefaultSwagger2Serializers implements Swagger2Serializers {
- protected boolean dynamicBasePath;
-
- protected boolean replaceTags;
-
- protected DocumentationProvider javadocProvider;
-
- protected List<ClassResourceInfo> cris;
-
- @Override
- public void setDynamicBasePath(final boolean dynamicBasePath) {
- this.dynamicBasePath = dynamicBasePath;
- }
-
- @Override
- public void setReplaceTags(final boolean replaceTags) {
- this.replaceTags = replaceTags;
- }
-
- @Override
- public void setJavadocProvider(final DocumentationProvider javadocProvider) {
- this.javadocProvider = javadocProvider;
- }
-
- @Override
- public void setClassResourceInfos(final List<ClassResourceInfo> classResourceInfos) {
- this.cris = classResourceInfos;
- }
+ private List<String> domains;
@Override
- public void writeTo(
- final Swagger data,
- final Class<?> type,
- final Type genericType,
- final Annotation[] annotations,
- final MediaType mediaType,
- final MultivaluedMap<String, Object> headers,
- final OutputStream out) throws IOException {
-
- if (dynamicBasePath) {
- MessageContext ctx = JAXRSUtils.createContextValue(
- JAXRSUtils.getCurrentMessage(), null, MessageContext.class);
- data.setBasePath(StringUtils.substringBeforeLast(ctx.getHttpServletRequest().
- getRequestURI(), "/"));
- }
-
- if (replaceTags || javadocProvider != null) {
- List<String> domains = new ArrayList<>(
+ protected void addParameters(final List<Parameter> parameters) {
+ if (domains == null) {
+ domains = new ArrayList<>(
ApplicationContextProvider.getApplicationContext().
getBean(DomainsHolder.class).getDomains().keySet());
-
- Map<String, ClassResourceInfo> operations = new HashMap<>();
- Map<Pair<String, String>, OperationResourceInfo> methods = new HashMap<>();
- for (ClassResourceInfo cri : cris) {
- for (OperationResourceInfo ori : cri.getMethodDispatcher().getOperationResourceInfos()) {
- String normalizedPath = getNormalizedPath(
- cri.getURITemplate().getValue(), ori.getURITemplate().getValue());
-
- operations.put(normalizedPath, cri);
- methods.put(ImmutablePair.of(ori.getHttpMethod(), normalizedPath), ori);
- }
- }
-
- if (replaceTags && data.getTags() != null) {
- data.getTags().clear();
- }
- for (final Map.Entry<String, Path> entry : data.getPaths().entrySet()) {
- Tag tag = null;
- if (replaceTags && operations.containsKey(entry.getKey())) {
- ClassResourceInfo cri = operations.get(entry.getKey());
-
- tag = new Tag();
- String tagName = StringUtils.removeStart(cri.getURITemplate().getValue(), "/");
- tag.setName(StringUtils.isEmpty(tagName) ? "_" : tagName);
- if (javadocProvider != null) {
- tag.setDescription(javadocProvider.getClassDoc(cri));
- }
-
- data.addTag(tag);
- }
-
- for (Map.Entry<HttpMethod, Operation> subentry : entry.getValue().getOperationMap().entrySet()) {
- if (replaceTags && tag != null) {
- subentry.getValue().setTags(Collections.singletonList(tag.getName()));
- }
-
- Pair<String, String> key = ImmutablePair.of(subentry.getKey().name(), entry.getKey());
- if (methods.containsKey(key) && javadocProvider != null) {
- OperationResourceInfo ori = methods.get(key);
-
- subentry.getValue().setSummary(javadocProvider.getMethodDoc(ori));
-
- boolean domainHeaderParameterFound = false;
- for (int i = 0; i < subentry.getValue().getParameters().size(); i++) {
- subentry.getValue().getParameters().get(i).
- setDescription(javadocProvider.getMethodParameterDoc(ori, i));
-
- if (subentry.getValue().getParameters().get(i) instanceof HeaderParameter
- && RESTHeaders.DOMAIN.equals(
- subentry.getValue().getParameters().get(i).getName())) {
-
- domainHeaderParameterFound = true;
- }
- }
- if (!domainHeaderParameterFound) {
- HeaderParameter domainHeaderParameter = new HeaderParameter();
- domainHeaderParameter.setName(RESTHeaders.DOMAIN);
- domainHeaderParameter.setRequired(true);
- domainHeaderParameter.setType("string");
- domainHeaderParameter.setEnum(domains);
- domainHeaderParameter.setDefault(SyncopeConstants.MASTER_DOMAIN);
-
- subentry.getValue().getParameters().add(domainHeaderParameter);
- }
-
- if (subentry.getValue().getResponses() != null
- && !subentry.getValue().getResponses().isEmpty()) {
-
- subentry.getValue().getResponses().entrySet().iterator().next().getValue().
- setDescription(javadocProvider.getMethodResponseDoc(ori));
- }
- }
- }
- }
}
- if (replaceTags && data.getTags() != null) {
- Collections.sort(data.getTags(), new Comparator<Tag>() {
-
- @Override
- public int compare(final Tag tag1, final Tag tag2) {
- return ComparatorUtils.<String>naturalComparator().compare(tag1.getName(), tag2.getName());
- }
- });
- }
-
- super.writeTo(data, type, genericType, annotations, mediaType, headers, out);
- }
- protected String getNormalizedPath(final String classResourcePath, final String operationResourcePath) {
- StringBuilder normalizedPath = new StringBuilder();
+ boolean domainHeaderParameterFound = false;
+ for (int i = 0; i < parameters.size(); i++) {
+ if (parameters.get(i) instanceof HeaderParameter
+ && RESTHeaders.DOMAIN.equals(parameters.get(i).getName())) {
- String[] segments = org.apache.commons.lang3.StringUtils.split(classResourcePath + operationResourcePath,
- "/");
- for (String segment : segments) {
- if (!org.apache.commons.lang3.StringUtils.isEmpty(segment)) {
- normalizedPath.append("/").append(segment);
+ domainHeaderParameterFound = true;
}
}
- // Adapt to Swagger's path expression
- if (normalizedPath.toString().endsWith(":.*}")) {
- normalizedPath.setLength(normalizedPath.length() - 4);
- normalizedPath.append('}');
+ if (!domainHeaderParameterFound) {
+ HeaderParameter domainHeaderParameter = new HeaderParameter();
+ domainHeaderParameter.setName(RESTHeaders.DOMAIN);
+ domainHeaderParameter.setRequired(true);
+ domainHeaderParameter.setType("string");
+ domainHeaderParameter.setEnum(domains);
+ domainHeaderParameter.setDefault(SyncopeConstants.MASTER_DOMAIN);
+
+ parameters.add(domainHeaderParameter);
}
- return StringUtils.EMPTY.equals(normalizedPath.toString()) ? "/" : normalizedPath.toString();
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java
deleted file mode 100644
index e01d7e2..0000000
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Feature.java
+++ /dev/null
@@ -1,175 +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 io.swagger.jaxrs.config.BeanConfig;
-import io.swagger.jaxrs.config.DefaultReaderConfig;
-import io.swagger.jaxrs.config.ReaderConfig;
-import io.swagger.jaxrs.listing.ApiListingResource;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Pattern;
-import javax.servlet.ServletContext;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.PreMatching;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.cxf.Bus;
-import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
-import org.apache.cxf.jaxrs.ext.MessageContext;
-import org.apache.cxf.jaxrs.model.ClassResourceInfo;
-import org.apache.cxf.jaxrs.provider.ServerProviderFactory;
-import org.apache.cxf.jaxrs.utils.InjectionUtils;
-
-/**
- * Automatically loads available javadocs from class loader (when {@link java.net.URLClassLoader}).
- */
-public class Swagger2Feature extends org.apache.cxf.jaxrs.swagger.Swagger2Feature {
-
- @Override
- public void initialize(final Server server, final Bus bus) {
- URL[] javaDocURLs = JavaDocUtils.getJavaDocURLs();
- if (javaDocURLs != null) {
- super.setJavaDocURLs(javaDocURLs);
- }
-
- super.initialize(server, bus);
- }
-
- // ------- Remove the code below this point when CXF 3.1.8 is available -----
- private Swagger2Serializers swagger2Serializers;
-
- public void setSwagger2Serializers(final Swagger2Serializers swagger2Serializers) {
- this.swagger2Serializers = swagger2Serializers;
- }
-
- @Override
- protected void addSwaggerResource(final Server server, final Bus bus) {
- List<Object> swaggerResources = new LinkedList<>();
- ApiListingResource apiListingResource = new ApiListingResource();
- swaggerResources.add(apiListingResource);
- if (SWAGGER_UI_RESOURCE_ROOT != null) {
- swaggerResources.add(new SwaggerUIService());
- bus.setProperty("swagger.service.ui.available", "true");
- }
- JAXRSServiceFactoryBean sfb =
- (JAXRSServiceFactoryBean) server.getEndpoint().get(JAXRSServiceFactoryBean.class.getName());
- sfb.setResourceClassesFromBeans(swaggerResources);
-
- List<ClassResourceInfo> cris = sfb.getClassResourceInfo();
-
- List<Object> providers = new ArrayList<>();
- for (ClassResourceInfo cri : cris) {
- if (ApiListingResource.class == cri.getResourceClass()) {
- InjectionUtils.injectContextProxies(cri, apiListingResource);
- }
- }
- if (SWAGGER_UI_RESOURCE_ROOT != null) {
- providers.add(new SwaggerUIFilter());
- }
-
- if (swagger2Serializers != null) {
- swagger2Serializers.setJavadocProvider(javadocProvider);
- swagger2Serializers.setClassResourceInfos(cris);
- providers.add(swagger2Serializers);
- }
-
- providers.add(new ReaderConfigFilter());
- ((ServerProviderFactory) server.getEndpoint().get(
- ServerProviderFactory.class.getName())).setUserProviders(providers);
-
- BeanConfig beanConfig = new BeanConfig();
- beanConfig.setResourcePackage(getResourcePackage());
- beanConfig.setVersion(getVersion());
- String basePath = getBasePath();
- beanConfig.setBasePath(basePath);
- beanConfig.setHost(getHost());
- beanConfig.setSchemes(getSchemes());
- beanConfig.setTitle(getTitle());
- beanConfig.setDescription(getDescription());
- beanConfig.setContact(getContact());
- beanConfig.setLicense(getLicense());
- beanConfig.setLicenseUrl(getLicenseUrl());
- beanConfig.setTermsOfServiceUrl(getTermsOfServiceUrl());
- beanConfig.setScan(isScan());
- beanConfig.setPrettyPrint(isPrettyPrint());
- beanConfig.setFilterClass(getFilterClass());
- }
-
- protected class ReaderConfigFilter implements ContainerRequestFilter {
-
- @Context
- protected MessageContext mc;
-
- @Override
- public void filter(final ContainerRequestContext requestContext) throws IOException {
- ServletContext servletContext = mc.getServletContext();
- if (servletContext != null && servletContext.getAttribute(ReaderConfig.class.getName()) == null) {
- if (mc.getServletConfig() != null
- && Boolean.valueOf(mc.getServletConfig().getInitParameter("scan.all.resources"))) {
- addReaderConfig(mc.getServletConfig().getInitParameter("ignore.routes"));
- } else if (isScanAllResources()) {
- addReaderConfig(getIgnoreRoutes());
- }
- }
- }
-
- protected void addReaderConfig(final String ignoreRoutesParam) {
- DefaultReaderConfig rc = new DefaultReaderConfig();
- rc.setScanAllResources(true);
- if (ignoreRoutesParam != null) {
- Set<String> routes = new LinkedHashSet<>();
- for (String route : StringUtils.split(ignoreRoutesParam, ",")) {
- routes.add(route.trim());
- }
- rc.setIgnoredRoutes(routes);
- }
- mc.getServletContext().setAttribute(ReaderConfig.class.getName(), rc);
- }
- }
-
- @PreMatching
- protected static class SwaggerUIFilter implements ContainerRequestFilter {
-
- private static final Pattern PATTERN =
- Pattern.compile(".*[.]js|/css/.*|/images/.*|/lib/.*|.*ico|/fonts/.*");
-
- @Override
- public void filter(final ContainerRequestContext rc) throws IOException {
- if (HttpMethod.GET.equals(rc.getRequest().getMethod())) {
- UriInfo ui = rc.getUriInfo();
- String path = "/" + ui.getPath();
- if (PATTERN.matcher(path).matches()) {
- rc.setRequestUri(URI.create("api-docs" + path));
- }
- }
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Serializers.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Serializers.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Serializers.java
deleted file mode 100644
index 39abf7b..0000000
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/Swagger2Serializers.java
+++ /dev/null
@@ -1,36 +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 io.swagger.models.Swagger;
-import java.util.List;
-import javax.ws.rs.ext.MessageBodyWriter;
-import org.apache.cxf.jaxrs.model.ClassResourceInfo;
-import org.apache.cxf.jaxrs.model.doc.DocumentationProvider;
-
-public interface Swagger2Serializers extends MessageBodyWriter<Swagger> {
-
- void setDynamicBasePath(boolean dynamicBasePath);
-
- void setReplaceTags(boolean replaceTags);
-
- void setJavadocProvider(DocumentationProvider javadocProvider);
-
- void setClassResourceInfos(List<ClassResourceInfo> classResourceInfos);
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/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 405139a..9e75b2d 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
@@ -45,7 +45,7 @@ under the License.
<servlet-mapping>
<servlet-name>WADLServlet</servlet-name>
<url-pattern>/index.html</url-pattern>
- <url-pattern>/schema_1_syncope1.html</url-pattern>
+ <url-pattern>/schema_1_syncope2.html</url-pattern>
<url-pattern>/syncope.wadl</url-pattern>
</servlet-mapping>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/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 4f4d12b..5daa96a 100644
--- a/core/rest-cxf/src/main/resources/restCXFContext.xml
+++ b/core/rest-cxf/src/main/resources/restCXFContext.xml
@@ -40,7 +40,7 @@ under the License.
<property name="namespacePrefixes">
<map>
<entry key="http://syncope.apache.org/2.0">
- <value>syncope</value>
+ <value>syncope2</value>
</entry>
</map>
</property>
@@ -91,7 +91,8 @@ under the License.
<bean id="wadlGenerator" class="org.apache.syncope.core.rest.cxf.WadlGenerator">
<property name="applicationTitle" value="Apache Syncope ${syncope.version}"/>
- <property name="namespacePrefix" value="syncope"/>
+ <property name="namespacePrefix" value="syncope2"/>
+ <property name="incrementNamespacePrefix" value="false"/>
<property name="linkAnyMediaTypeToXmlSchema" value="true"/>
<property name="useJaxbContextForQnames" value="true"/>
<property name="addResourceAndMethodIds" value="true"/>
@@ -103,7 +104,7 @@ under the License.
<property name="dynamicBasePath" value="true"/>
<property name="replaceTags" value="true"/>
</bean>
- <bean id="swagger2Feature" class="org.apache.syncope.core.rest.cxf.Swagger2Feature">
+ <bean id="swagger2Feature" class="org.apache.cxf.jaxrs.swagger.Swagger2Feature">
<property name="title" value="Apache Syncope"/>
<property name="version" value="${syncope.version}"/>
<property name="description" value="Apache Syncope ${syncope.version}"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/spring/pom.xml
----------------------------------------------------------------------
diff --git a/core/spring/pom.xml b/core/spring/pom.xml
index 9944f25..c79251e 100644
--- a/core/spring/pom.xml
+++ b/core/spring/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-core</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Core Spring</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/workflow-activiti/pom.xml
----------------------------------------------------------------------
diff --git a/core/workflow-activiti/pom.xml b/core/workflow-activiti/pom.xml
index 117ad2a..2ad6c38 100644
--- a/core/workflow-activiti/pom.xml
+++ b/core/workflow-activiti/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-core</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Core Workflow Activiti</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/workflow-api/pom.xml
----------------------------------------------------------------------
diff --git a/core/workflow-api/pom.xml b/core/workflow-api/pom.xml
index 957afbe..29ac19b 100644
--- a/core/workflow-api/pom.xml
+++ b/core/workflow-api/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-core</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Core Workflow API</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/core/workflow-java/pom.xml
----------------------------------------------------------------------
diff --git a/core/workflow-java/pom.xml b/core/workflow-java/pom.xml
index bd2703e..3d5004b 100644
--- a/core/workflow-java/pom.xml
+++ b/core/workflow-java/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-core</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Core Workflow Java</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/deb/console/pom.xml
----------------------------------------------------------------------
diff --git a/deb/console/pom.xml b/deb/console/pom.xml
index 6cc067d..e7ddb7f 100644
--- a/deb/console/pom.xml
+++ b/deb/console/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-deb</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Deb Console</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/deb/core/pom.xml
----------------------------------------------------------------------
diff --git a/deb/core/pom.xml b/deb/core/pom.xml
index fd8e7bc..31af261 100644
--- a/deb/core/pom.xml
+++ b/deb/core/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-deb</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Deb Core</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/deb/enduser/pom.xml
----------------------------------------------------------------------
diff --git a/deb/enduser/pom.xml b/deb/enduser/pom.xml
index 4c52b9b..083961a 100644
--- a/deb/enduser/pom.xml
+++ b/deb/enduser/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-deb</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Deb Enduser</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/deb/pom.xml
----------------------------------------------------------------------
diff --git a/deb/pom.xml b/deb/pom.xml
index 647325d..3cbbc21 100644
--- a/deb/pom.xml
+++ b/deb/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Deb</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ext/camel/client-console/pom.xml
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/pom.xml b/ext/camel/client-console/pom.xml
index 22bde46..5fdbaeb 100644
--- a/ext/camel/client-console/pom.xml
+++ b/ext/camel/client-console/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope.ext</groupId>
<artifactId>syncope-ext-camel</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Extensions: Camel Client Console</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ext/camel/common-lib/pom.xml
----------------------------------------------------------------------
diff --git a/ext/camel/common-lib/pom.xml b/ext/camel/common-lib/pom.xml
index 0a31e95..88d98dc 100644
--- a/ext/camel/common-lib/pom.xml
+++ b/ext/camel/common-lib/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope.ext</groupId>
<artifactId>syncope-ext-camel</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Extensions: Camel Common Lib</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ext/camel/logic/pom.xml
----------------------------------------------------------------------
diff --git a/ext/camel/logic/pom.xml b/ext/camel/logic/pom.xml
index ed16964..71bcd3e 100644
--- a/ext/camel/logic/pom.xml
+++ b/ext/camel/logic/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope.ext</groupId>
<artifactId>syncope-ext-camel</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Extensions: Camel Logic</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ext/camel/persistence-api/pom.xml
----------------------------------------------------------------------
diff --git a/ext/camel/persistence-api/pom.xml b/ext/camel/persistence-api/pom.xml
index 568f70a..92efa33 100644
--- a/ext/camel/persistence-api/pom.xml
+++ b/ext/camel/persistence-api/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope.ext</groupId>
<artifactId>syncope-ext-camel</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Extensions: Camel Persistence API</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ext/camel/persistence-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/ext/camel/persistence-jpa/pom.xml b/ext/camel/persistence-jpa/pom.xml
index 29c5144..bdfd1d4 100644
--- a/ext/camel/persistence-jpa/pom.xml
+++ b/ext/camel/persistence-jpa/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope.ext</groupId>
<artifactId>syncope-ext-camel</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Extensions: Camel Persistence JPA</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ext/camel/pom.xml
----------------------------------------------------------------------
diff --git a/ext/camel/pom.xml b/ext/camel/pom.xml
index f22e72c..7afdc91 100644
--- a/ext/camel/pom.xml
+++ b/ext/camel/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-ext</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Extensions: Camel</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ext/camel/provisioning-api/pom.xml
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-api/pom.xml b/ext/camel/provisioning-api/pom.xml
index 75ef09a..570a597 100644
--- a/ext/camel/provisioning-api/pom.xml
+++ b/ext/camel/provisioning-api/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope.ext</groupId>
<artifactId>syncope-ext-camel</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Extensions: Camel Provisioning API</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ext/camel/provisioning-camel/pom.xml
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/pom.xml b/ext/camel/provisioning-camel/pom.xml
index 02b83db..e9d8e0a 100644
--- a/ext/camel/provisioning-camel/pom.xml
+++ b/ext/camel/provisioning-camel/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope.ext</groupId>
<artifactId>syncope-ext-camel</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Extensions: Camel Provisioning</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ext/camel/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/ext/camel/rest-api/pom.xml b/ext/camel/rest-api/pom.xml
index 11f3f71..1d09df2 100644
--- a/ext/camel/rest-api/pom.xml
+++ b/ext/camel/rest-api/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope.ext</groupId>
<artifactId>syncope-ext-camel</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Extensions: Camel REST API</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ext/camel/rest-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/ext/camel/rest-cxf/pom.xml b/ext/camel/rest-cxf/pom.xml
index 1d03e45..35043f6 100644
--- a/ext/camel/rest-cxf/pom.xml
+++ b/ext/camel/rest-cxf/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope.ext</groupId>
<artifactId>syncope-ext-camel</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Extensions: Camel REST CXF</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ext/pom.xml
----------------------------------------------------------------------
diff --git a/ext/pom.xml b/ext/pom.xml
index e90bc8a..b2c276a 100644
--- a/ext/pom.xml
+++ b/ext/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Extensions</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ext/swagger-ui/pom.xml
----------------------------------------------------------------------
diff --git a/ext/swagger-ui/pom.xml b/ext/swagger-ui/pom.xml
index 08f9240..f0d2321 100644
--- a/ext/swagger-ui/pom.xml
+++ b/ext/swagger-ui/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-ext</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Extensions: Swagger UI</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/fit/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index 690f179..7eda7de 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-fit</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope FIT Build Tools</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/fit/console-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml
index 85049de..1b17ee4 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-fit</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope FIT Console Reference</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/fit/core-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index 8a1df76..a81ff1e 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-fit</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope FIT Core Reference</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/fit/core-reference/src/main/resources/jboss/restCXFContext.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml
index 1b709b1..7a9bed5 100644
--- a/fit/core-reference/src/main/resources/jboss/restCXFContext.xml
+++ b/fit/core-reference/src/main/resources/jboss/restCXFContext.xml
@@ -40,7 +40,7 @@ under the License.
<property name="namespacePrefixes">
<map>
<entry key="http://syncope.apache.org/2.0">
- <value>syncope</value>
+ <value>syncope2</value>
</entry>
</map>
</property>
@@ -91,7 +91,8 @@ under the License.
<bean id="wadlGenerator" class="org.apache.syncope.core.rest.cxf.WadlGenerator">
<property name="applicationTitle" value="Apache Syncope ${syncope.version}"/>
- <property name="namespacePrefix" value="syncope"/>
+ <property name="namespacePrefix" value="syncope2"/>
+ <property name="incrementNamespacePrefix" value="false"/>
<property name="linkAnyMediaTypeToXmlSchema" value="true"/>
<property name="useJaxbContextForQnames" value="true"/>
<property name="addResourceAndMethodIds" value="true"/>
@@ -108,24 +109,23 @@ under the License.
<bean id="extendedSwagger2Serializers" class="org.apache.syncope.core.rest.cxf.ExtendedSwagger2Serializers">
<property name="dynamicBasePath" value="true"/>
<property name="replaceTags" value="true"/>
+ <property name="javaDocPaths">
+ <list>
+ <value>/WEB-INF/lib/syncope-common-rest-api-${syncope.version}-javadoc.jar</value>
+ <value>/WEB-INF/lib/syncope-ext-camel-rest-api-${syncope.version}-javadoc.jar</value>
+ </list>
+ </property>
</bean>
- <bean id="swagger2Feature" class="org.apache.syncope.core.rest.cxf.Swagger2Feature">
+ <bean id="swagger2Feature" class="org.apache.cxf.jaxrs.swagger.Swagger2Feature">
<property name="title" value="Apache Syncope"/>
<property name="version" value="${syncope.version}"/>
<property name="description" value="Apache Syncope ${syncope.version}"/>
- <property name="contact" value="dev@syncope.apache.org"/>
+ <property name="contact" value="dev@syncope.apache.org"/>
<property name="resourcePackage" value="org.apache.syncope.common.rest.api.service"/>
<property name="scanAllResources" value="true"/>
<property name="activateOnlyIfJaxrsSupported" value="true"/>
- <property name="javaDocPaths">
- <list>
- <value>/WEB-INF/lib/syncope-common-rest-api-${syncope.version}-javadoc.jar</value>
- <value>/WEB-INF/lib/syncope-ext-camel-rest-api-${syncope.version}-javadoc.jar</value>
- </list>
- </property>
-
<property name="swagger2Serializers" ref="extendedSwagger2Serializers"/>
</bean>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/fit/enduser-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml
index bf41ff6..8b8d413 100644
--- a/fit/enduser-reference/pom.xml
+++ b/fit/enduser-reference/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-fit</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope FIT Enduser Reference</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/fit/pom.xml
----------------------------------------------------------------------
diff --git a/fit/pom.xml b/fit/pom.xml
index 7041e69..39e21cb 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope FIT</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/META-INF/MANIFEST.MF b/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/META-INF/MANIFEST.MF
index 62a392c..6151537 100644
--- a/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/META-INF/MANIFEST.MF
+++ b/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Apache Syncope Eclipse Plugin
Bundle-SymbolicName: org.apache.syncope.ide.eclipse.plugin;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-Activator: org.apache.syncope.ide.eclipse.plugin.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/pom.xml
----------------------------------------------------------------------
diff --git a/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/pom.xml b/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/pom.xml
index a45a415..3999eb5 100644
--- a/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/pom.xml
+++ b/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope.ide</groupId>
<artifactId>syncope-ide-eclipse</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.tests/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.tests/META-INF/MANIFEST.MF b/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.tests/META-INF/MANIFEST.MF
index 54434b9..fd977a5 100644
--- a/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.tests/META-INF/MANIFEST.MF
+++ b/ide/eclipse/bundles/org.apache.syncope.ide.eclipse.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.apache.syncope.ide.eclipse.tests
Bundle-SymbolicName: org.apache.syncope.ide.eclipse.tests;singleton:=true
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-Vendor:
Bundle-RequiredExecutionEnvironment: J2SE-1.5
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ide/eclipse/pom.xml
----------------------------------------------------------------------
diff --git a/ide/eclipse/pom.xml b/ide/eclipse/pom.xml
index 98291f5..090d968 100644
--- a/ide/eclipse/pom.xml
+++ b/ide/eclipse/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-ide</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope IDE Eclipse</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/category.xml
----------------------------------------------------------------------
diff --git a/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/category.xml b/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/category.xml
index 5efe82f..c01746b 100644
--- a/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/category.xml
+++ b/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/category.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
<site>
- <bundle id="org.apache.syncope.ide.eclipse.plugin" version="2.0.1.qualifier">
+ <bundle id="org.apache.syncope.ide.eclipse.plugin" version="2.1.0.qualifier">
<category name="apachesyncope"/>
</bundle>
<category-def name="apachesyncope" label="Apache Syncope">
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/pom.xml
----------------------------------------------------------------------
diff --git a/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/pom.xml b/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/pom.xml
index 0111fb7..63db841 100644
--- a/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/pom.xml
+++ b/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope.ide</groupId>
<artifactId>syncope-ide-eclipse</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/ide/pom.xml
----------------------------------------------------------------------
diff --git a/ide/pom.xml b/ide/pom.xml
index 5d1ff8c..12ac601 100644
--- a/ide/pom.xml
+++ b/ide/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope IDE</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/installer/pom.xml
----------------------------------------------------------------------
diff --git a/installer/pom.xml b/installer/pom.xml
index e52569a..2a20bfa 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<name>Apache Syncope Installer</name>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aa00691..86eac9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
<groupId>org.apache.syncope</groupId>
<artifactId>syncope</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
@@ -356,7 +356,7 @@ under the License.
<connid.ldap.version>1.5.1</connid.ldap.version>
<connid.ad.version>1.3.2</connid.ad.version>
- <cxf.version>3.1.7</cxf.version>
+ <cxf.version>3.2.0-SNAPSHOT</cxf.version>
<camel.version>2.17.3</camel.version>
@@ -440,7 +440,7 @@ under the License.
<izpack.version>5.0.10</izpack.version>
<httpclient.version>4.3.6</httpclient.version>
<maven-invoker.version>2.1.1</maven-invoker.version>
- <tycho-version>0.23.1</tycho-version>
+ <tycho-version>0.26.0</tycho-version>
<testds.port>1389</testds.port>
<testdb.webport>9082</testdb.webport>
@@ -475,7 +475,7 @@ under the License.
<anonymousKey>anonymousKey</anonymousKey>
<secretKey>1abcdefghilmnopqrstuvz2!</secretKey>
- <targetJdk>1.7</targetJdk>
+ <targetJdk>1.8</targetJdk>
<rootpom.basedir>${basedir}</rootpom.basedir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -1551,7 +1551,7 @@ under the License.
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
<runOrder>alphabetical</runOrder>
- <argLine>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m -Xss256k</argLine>
+ <argLine>-Xms512m -Xmx1024m -Xss256k</argLine>
</configuration>
</plugin>
<plugin>
@@ -1562,7 +1562,7 @@ under the License.
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
<runOrder>alphabetical</runOrder>
- <argLine>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m -Xss256k</argLine>
+ <argLine>-Xms512m -Xmx1024m -Xss256k</argLine>
</configuration>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/syncope/blob/4f058c35/src/main/asciidoc/getting-started/obtain.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/getting-started/obtain.adoc b/src/main/asciidoc/getting-started/obtain.adoc
index 711eb67..361bd59 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -127,8 +127,7 @@ sudo ln -s /usr/share/java/postgresql-jdbc4.jar /usr/share/tomcat8/lib/
[source,bash]
----
JAVA_OPTS="-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server \
- -Xms1536m -Xmx1536m -XX:NewSize=256m -XX:MaxNewSize=256m
- -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
+ -Xms1536m -Xmx1536m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:+DisableExplicitGC"
----
+
Install::