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 2018/07/27 13:15:49 UTC
[2/4] syncope git commit: Update to Wildfly 13
Update to Wildfly 13
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/150568f5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/150568f5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/150568f5
Branch: refs/heads/master
Commit: 150568f5316dfdd5136fac49d801958a9ad6c639
Parents: ae05884
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Jul 27 11:55:31 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Jul 27 11:55:43 2018 +0200
----------------------------------------------------------------------
fit/build-tools/pom.xml | 2 +-
.../webapp/WEB-INF/jboss-deployment-structure.xml | 1 +
fit/console-reference/pom.xml | 6 +++---
fit/core-reference/pom.xml | 18 ++++++------------
.../main/resources/jboss/domains/MasterDomain.xml | 2 +-
.../main/resources/jboss/domains/TwoDomain.xml | 2 +-
.../webapp/WEB-INF/jboss-deployment-structure.xml | 1 +
fit/enduser-reference/pom.xml | 6 +++---
src/main/asciidoc/getting-started/obtain.adoc | 2 +-
.../getting-started/systemRequirements.adoc | 2 +-
.../systemadministration/dbcp.adoc | 2 +-
.../systemadministration/javaeecontainer.adoc | 8 +-------
12 files changed, 21 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/150568f5/fit/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index 4d14785..b0b5d4a 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -79,7 +79,7 @@ under the License.
<artifactId>cxf-rt-wsdl</artifactId>
<version>${cxf.version}</version>
</dependency>
-
+
<dependency>
<groupId>net.tirasa.connid.bundles.soap</groupId>
<artifactId>soap-utilities</artifactId>
http://git-wip-us.apache.org/repos/asf/syncope/blob/150568f5/fit/build-tools/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
----------------------------------------------------------------------
diff --git a/fit/build-tools/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/fit/build-tools/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index a38b3ba..8ad59c5 100644
--- a/fit/build-tools/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/fit/build-tools/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -26,6 +26,7 @@ under the License.
</exclude-subsystems>
<dependencies>
<module name="org.apache.xalan"/>
+ <module name="org.reactivestreams"/>
</dependencies>
<exclusions>
<module name="javax.ws.soap.api"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/150568f5/fit/console-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml
index 7758c13..8f98203 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -217,7 +217,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>-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
+ <cargo.jvmargs>-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -Xmx1024m -Xms512m</cargo.jvmargs>
</properties>
<configfiles>
<configfile>
@@ -354,7 +354,7 @@ under the License.
<properties>
<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
-Dwicket.configuration=development
- -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
+ -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -Xmx1024m -Xms512m</cargo.jvmargs>
</properties>
</configuration>
</configuration>
@@ -421,7 +421,7 @@ under the License.
-Dwicket.configuration=development
-XXaltjvm=dcevm -javaagent:${settings.localRepository}/org/hotswapagent/hotswap-agent/${hotswap.version}/hotswap-agent-${hotswap.version}.jar=autoHotswap=true,disablePlugin=Spring
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
- -XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
+ -Xmx1024m -Xms512m</cargo.jvmargs>
</properties>
</configuration>
</configuration>
http://git-wip-us.apache.org/repos/asf/syncope/blob/150568f5/fit/core-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index 6b3fe0f..3ae7087 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -295,7 +295,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>-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
+ <cargo.jvmargs>-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -Xmx1024m -Xms512m</cargo.jvmargs>
</properties>
<configfiles>
<configfile>
@@ -1231,12 +1231,6 @@ under the License.
</dependency>
<dependency>
- <groupId>org.reactivestreams</groupId>
- <artifactId>reactive-streams</artifactId>
- <version>1.0.1</version>
- </dependency>
-
- <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
@@ -1268,9 +1262,9 @@ under the License.
<inherited>true</inherited>
<configuration>
<container>
- <containerId>wildfly11x</containerId>
+ <containerId>wildfly12x</containerId>
<zipUrlInstaller>
- <url>http://download.jboss.org/wildfly/11.0.0.Final/wildfly-11.0.0.Final.zip</url>
+ <url>http://download.jboss.org/wildfly/13.0.0.Final/wildfly-13.0.0.Final.zip</url>
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
<extractDir>${project.build.directory}/cargo/extract</extractDir>
</zipUrlInstaller>
@@ -1279,7 +1273,7 @@ under the License.
</container>
<configuration>
<properties>
- <cargo.jvmargs>-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:PermSize=512m -XX:MaxPermSize=1024m -Xmx2048m -Xms1024m</cargo.jvmargs>
+ <cargo.jvmargs>-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -Xmx2048m -Xms1024m</cargo.jvmargs>
</properties>
</configuration>
</configuration>
@@ -1382,7 +1376,7 @@ under the License.
<configuration>
<properties>
<cargo.jvmargs>-Xdebug -Djaxb.debug=true -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
- -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
+ -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -Xmx1024m -Xms512m</cargo.jvmargs>
</properties>
</configuration>
</configuration>
@@ -1430,7 +1424,7 @@ under the License.
<cargo.jvmargs>
-XXaltjvm=dcevm -javaagent:${settings.localRepository}/org/hotswapagent/hotswap-agent/${hotswap.version}/hotswap-agent-${hotswap.version}.jar=autoHotswap=true,disablePlugin=Spring
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
- -XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
+ -Xmx1024m -Xms512m</cargo.jvmargs>
</properties>
</configuration>
</configuration>
http://git-wip-us.apache.org/repos/asf/syncope/blob/150568f5/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
index 517d0ac..e0fb916 100644
--- a/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml
+++ b/fit/core-reference/src/main/resources/jboss/domains/MasterDomain.xml
@@ -101,7 +101,7 @@ under the License.
<property name="jpaPropertyMap">
<map>
<entry key="openjpa.MetaDataFactory"
- value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly11x/deployments/syncope.war/WEB-INF/lib/syncope-core-persistence-jpa-${syncope.version}.jar, Resources=${Master.orm})"/>
+ value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly12x/deployments/syncope.war/WEB-INF/lib/syncope-core-persistence-jpa-${syncope.version}.jar, Resources=${Master.orm})"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/syncope/blob/150568f5/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml b/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml
index 8fe3c0c..18ad527 100644
--- a/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml
+++ b/fit/core-reference/src/main/resources/jboss/domains/TwoDomain.xml
@@ -101,7 +101,7 @@ under the License.
<property name="jpaPropertyMap">
<map>
<entry key="openjpa.MetaDataFactory"
- value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly11x/deployments/syncope.war/WEB-INF/lib/syncope-core-persistence-jpa-${syncope.version}.jar, Resources=${Master.orm})"/>
+ value="jpa(URLs=vfs:${project.build.directory}/cargo/configurations/wildfly12x/deployments/syncope.war/WEB-INF/lib/syncope-core-persistence-jpa-${syncope.version}.jar, Resources=${Master.orm})"/>
</map>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/syncope/blob/150568f5/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 6baecf6..d3443a1 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
@@ -26,6 +26,7 @@ under the License.
</exclude-subsystems>
<dependencies>
<module name="org.apache.xalan"/>
+ <module name="org.reactivestreams"/>
</dependencies>
<exclusions>
<module name="javax.validation.api"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/150568f5/fit/enduser-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml
index 2692849..f962530 100644
--- a/fit/enduser-reference/pom.xml
+++ b/fit/enduser-reference/pom.xml
@@ -300,7 +300,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>-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m</cargo.jvmargs>
+ <cargo.jvmargs>-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC</cargo.jvmargs>
</properties>
<configfiles>
<configfile>
@@ -485,7 +485,7 @@ under the License.
<configuration>
<properties>
<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
- -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m</cargo.jvmargs>
+ -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC</cargo.jvmargs>
</properties>
</configuration>
</configuration>
@@ -567,7 +567,7 @@ under the License.
-Dwicket.configuration=development
-XXaltjvm=dcevm -javaagent:${settings.localRepository}/org/hotswapagent/hotswap-agent/${hotswap.version}/hotswap-agent-${hotswap.version}.jar=autoHotswap=true,disablePlugin=Spring
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
- -XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
+ -Xmx1024m -Xms512m</cargo.jvmargs>
</properties>
</configuration>
</configuration>
http://git-wip-us.apache.org/repos/asf/syncope/blob/150568f5/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 e058d5e..cc74338 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -203,7 +203,7 @@ examples:
. https://tomcat.apache.org/tomcat-9.0-doc/jdbc-pool.html[Apache Tomcat 9^]
. https://javaeesquad.github.io/tutorials/glassfishDatasource/glassFishDatasource.html[Glassfish 4.1^]
. https://payara.gitbooks.io/payara-server/content/documentation/user-guides/connection-pools/connection-pools.html[Payara Server^]
- * https://docs.jboss.org/author/display/WFLY11/DataSource+configuration[Wildfly 11^]
+. https://docs.jboss.org/author/display/WFLY10/DataSource+configuration[Wildfly 13^]
====
[WARNING]
http://git-wip-us.apache.org/repos/asf/syncope/blob/150568f5/src/main/asciidoc/getting-started/systemRequirements.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/getting-started/systemRequirements.adoc b/src/main/asciidoc/getting-started/systemRequirements.adoc
index e20a169..474c584 100644
--- a/src/main/asciidoc/getting-started/systemRequirements.adoc
+++ b/src/main/asciidoc/getting-started/systemRequirements.adoc
@@ -39,7 +39,7 @@ Apache Syncope {docVersion} is verified with the following Java EE containers:
. http://tomcat.apache.org/download-90.cgi[Apache Tomcat 9^]
. https://glassfish.java.net/[Glassfish 4.1^]
. http://www.payara.fish/[Payara Server^]
- . http://www.wildfly.org/[Wildfly 11^]
+ . http://www.wildfly.org/[Wildfly 13^]
=== Internal Storage
http://git-wip-us.apache.org/repos/asf/syncope/blob/150568f5/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc
index 56cbf02..a544adc 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc
@@ -34,4 +34,4 @@ Each JavaEE Container provides its own way to accomplish this task:
* https://tomcat.apache.org/tomcat-9.0-doc/jdbc-pool.html[Apache Tomcat 9^]
* https://javaeesquad.github.io/tutorials/glassfishDatasource/glassFishDatasource.html[Glassfish 4.1^]
* https://payara.gitbooks.io/payara-server/content/documentation/user-guides/connection-pools/connection-pools.html[Payara^]
- * https://docs.jboss.org/author/display/WFLY11/DataSource+configuration[Wildfly 11^]
\ No newline at end of file
+ * https://docs.jboss.org/author/display/WFLY10/DataSource+configuration[Wildfly 13^]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/150568f5/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
index 27a95d9..e8547bd 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
@@ -82,7 +82,7 @@ For better performance under GNU / Linux, do not forget to include
among JVM options.
====
-===== Wildfly 11
+===== Wildfly 13
Add
@@ -113,12 +113,6 @@ Add
<artifactId>cxf-rt-wsdl</artifactId>
<version>${cxf.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.reactivestreams</groupId>
- <artifactId>reactive-streams</artifactId>
- <version>1.0.1</version>
- </dependency>
....
as additional dependencies in `core/pom.xml`, `console/pom.xml` and `enduser/pom.xml`.