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/10/05 09:19:37 UTC
[1/2] syncope git commit: Supporting Wildfly 14
Repository: syncope
Updated Branches:
refs/heads/2_1_X 57e2ffcde -> a0345d059
refs/heads/master 9dd0b6603 -> 224303fd2
Supporting Wildfly 14
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a0345d05
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a0345d05
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a0345d05
Branch: refs/heads/2_1_X
Commit: a0345d05976a4992766c6ddc7a0636bb73db8dfa
Parents: 57e2ffc
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 5 11:19:04 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 5 11:19:04 2018 +0200
----------------------------------------------------------------------
fit/core-reference/pom.xml | 4 ++--
.../src/main/resources/jboss/domains/MasterDomain.xml | 2 +-
.../src/main/resources/jboss/domains/TwoDomain.xml | 2 +-
.../test/java/org/apache/syncope/fit/core/UserRequestITCase.java | 2 --
src/main/asciidoc/getting-started/obtain.adoc | 2 +-
.../workingwithapachesyncope/systemadministration/dbcp.adoc | 2 +-
.../systemadministration/javaeecontainer.adoc | 2 +-
src/site/xdoc/building.xml | 2 +-
8 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a0345d05/fit/core-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index 47a142a..8e3cab2 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -1218,7 +1218,7 @@ under the License.
</profile>
<profile>
- <id>jboss-it</id>
+ <id>wildfly-it</id>
<dependencies>
<dependency>
@@ -1281,7 +1281,7 @@ under the License.
<container>
<containerId>wildfly13x</containerId>
<zipUrlInstaller>
- <url>http://download.jboss.org/wildfly/13.0.0.Final/wildfly-13.0.0.Final.zip</url>
+ <url>http://download.jboss.org/wildfly/14.0.1.Final/wildfly-14.0.1.Final.zip</url>
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
<extractDir>${project.build.directory}/cargo/extract</extractDir>
</zipUrlInstaller>
http://git-wip-us.apache.org/repos/asf/syncope/blob/a0345d05/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 e0fb916..eefc77d 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/wildfly12x/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/wildfly13x/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/a0345d05/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 18ad527..a340788 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/wildfly12x/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/wildfly13x/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/a0345d05/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserRequestITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserRequestITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserRequestITCase.java
index 9281bce..ef199be 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserRequestITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserRequestITCase.java
@@ -174,8 +174,6 @@ public class UserRequestITCase extends AbstractITCase {
public void userSelection() {
assumeTrue(FlowableDetector.isFlowableEnabledForUserWorkflow(syncopeService));
- assumeTrue(FlowableDetector.isFlowableEnabledForUserWorkflow(syncopeService));
-
PagedResult<UserRequestForm> forms =
userRequestService.getForms(new UserRequestFormQuery.Builder().build());
int preForms = forms.getTotalCount();
http://git-wip-us.apache.org/repos/asf/syncope/blob/a0345d05/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 b0ea49d..d640127 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -204,7 +204,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 5^]
. https://payara.gitbooks.io/payara-server/content/documentation/user-guides/connection-pools/connection-pools.html[Payara Server 5^]
-. https://docs.jboss.org/author/display/WFLY10/DataSource+configuration[Wildfly 13^]
+. http://docs.wildfly.org/14/Admin_Guide.html#DataSource[Wildfly 14^]
====
[WARNING]
http://git-wip-us.apache.org/repos/asf/syncope/blob/a0345d05/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 3e59024..2d3a704 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^]
* https://payara.gitbooks.io/payara-server/content/documentation/user-guides/connection-pools/connection-pools.html[Payara Server 5^]
- * https://docs.jboss.org/author/display/WFLY10/DataSource+configuration[Wildfly 13^]
\ No newline at end of file
+ * http://docs.wildfly.org/14/Admin_Guide.html#DataSource[Wildfly 14^]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/a0345d05/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 de8205c..7b77408 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
@@ -116,7 +116,7 @@ For better performance under GNU / Linux, do not forget to include
among JVM options.
====
-===== Wildfly 13
+===== Wildfly 14
Add
http://git-wip-us.apache.org/repos/asf/syncope/blob/a0345d05/src/site/xdoc/building.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml
index e95046e..c24b03c 100644
--- a/src/site/xdoc/building.xml
+++ b/src/site/xdoc/building.xml
@@ -160,7 +160,7 @@ under the License.
<h5>Wildfly</h5>
Perform the full test suite by deploying Syncope core in
<a href="http://www.wildfly.org">Wildfly</a> via
- <source>$ mvn -Pjboss-it</source>
+ <source>$ mvn -Pwildfly-it</source>
</subsection>
<subsection name="fit/console-reference">
[2/2] syncope git commit: Supporting Wildfly 14
Posted by il...@apache.org.
Supporting Wildfly 14
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/224303fd
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/224303fd
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/224303fd
Branch: refs/heads/master
Commit: 224303fd2d54edaa489718558b9c80bafcd8b3e4
Parents: 9dd0b66
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 5 11:19:04 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 5 11:19:20 2018 +0200
----------------------------------------------------------------------
fit/core-reference/pom.xml | 4 ++--
.../src/main/resources/jboss/domains/MasterDomain.xml | 2 +-
.../src/main/resources/jboss/domains/TwoDomain.xml | 2 +-
.../test/java/org/apache/syncope/fit/core/UserRequestITCase.java | 2 --
src/main/asciidoc/getting-started/obtain.adoc | 2 +-
.../workingwithapachesyncope/systemadministration/dbcp.adoc | 2 +-
.../systemadministration/javaeecontainer.adoc | 2 +-
src/site/xdoc/building.xml | 2 +-
8 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/224303fd/fit/core-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index dc5e8d1..5cac764 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -1218,7 +1218,7 @@ under the License.
</profile>
<profile>
- <id>jboss-it</id>
+ <id>wildfly-it</id>
<dependencies>
<dependency>
@@ -1281,7 +1281,7 @@ under the License.
<container>
<containerId>wildfly13x</containerId>
<zipUrlInstaller>
- <url>http://download.jboss.org/wildfly/13.0.0.Final/wildfly-13.0.0.Final.zip</url>
+ <url>http://download.jboss.org/wildfly/14.0.1.Final/wildfly-14.0.1.Final.zip</url>
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
<extractDir>${project.build.directory}/cargo/extract</extractDir>
</zipUrlInstaller>
http://git-wip-us.apache.org/repos/asf/syncope/blob/224303fd/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 e0fb916..eefc77d 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/wildfly12x/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/wildfly13x/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/224303fd/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 18ad527..a340788 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/wildfly12x/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/wildfly13x/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/224303fd/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserRequestITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserRequestITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserRequestITCase.java
index 9281bce..ef199be 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserRequestITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserRequestITCase.java
@@ -174,8 +174,6 @@ public class UserRequestITCase extends AbstractITCase {
public void userSelection() {
assumeTrue(FlowableDetector.isFlowableEnabledForUserWorkflow(syncopeService));
- assumeTrue(FlowableDetector.isFlowableEnabledForUserWorkflow(syncopeService));
-
PagedResult<UserRequestForm> forms =
userRequestService.getForms(new UserRequestFormQuery.Builder().build());
int preForms = forms.getTotalCount();
http://git-wip-us.apache.org/repos/asf/syncope/blob/224303fd/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 741d64e..3e094fb 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -204,7 +204,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 5^]
. https://payara.gitbooks.io/payara-server/content/documentation/user-guides/connection-pools/connection-pools.html[Payara Server 5^]
-. https://docs.jboss.org/author/display/WFLY10/DataSource+configuration[Wildfly 13^]
+. http://docs.wildfly.org/14/Admin_Guide.html#DataSource[Wildfly 14^]
====
[WARNING]
http://git-wip-us.apache.org/repos/asf/syncope/blob/224303fd/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 3e59024..2d3a704 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^]
* https://payara.gitbooks.io/payara-server/content/documentation/user-guides/connection-pools/connection-pools.html[Payara Server 5^]
- * https://docs.jboss.org/author/display/WFLY10/DataSource+configuration[Wildfly 13^]
\ No newline at end of file
+ * http://docs.wildfly.org/14/Admin_Guide.html#DataSource[Wildfly 14^]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/224303fd/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 9565da6..ac0fb2c 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
@@ -116,7 +116,7 @@ For better performance under GNU / Linux, do not forget to include
among JVM options.
====
-===== Wildfly 13
+===== Wildfly 14
Add
http://git-wip-us.apache.org/repos/asf/syncope/blob/224303fd/src/site/xdoc/building.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml
index e95046e..c24b03c 100644
--- a/src/site/xdoc/building.xml
+++ b/src/site/xdoc/building.xml
@@ -160,7 +160,7 @@ under the License.
<h5>Wildfly</h5>
Perform the full test suite by deploying Syncope core in
<a href="http://www.wildfly.org">Wildfly</a> via
- <source>$ mvn -Pjboss-it</source>
+ <source>$ mvn -Pwildfly-it</source>
</subsection>
<subsection name="fit/console-reference">