syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [4/4] syncope git commit: Update to Glassfish 5 and Payara Server 5
Date Fri, 27 Jul 2018 13:15:51 GMT
Update to Glassfish 5 and Payara Server 5


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/24db268d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/24db268d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/24db268d

Branch: refs/heads/master
Commit: 24db268ddf8c4902015c8d6ca76342b6819ec2e9
Parents: 150568f
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Fri Jul 27 15:15:30 2018 +0200
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Fri Jul 27 15:15:38 2018 +0200

----------------------------------------------------------------------
 .../main/resources/META-INF/web-fragment.xml    |  2 +-
 fit/core-reference/pom.xml                      | 15 +++++---
 src/main/asciidoc/getting-started/obtain.adoc   |  4 +--
 .../getting-started/systemRequirements.adoc     |  4 +--
 .../systemadministration/dbcp.adoc              |  4 +--
 .../systemadministration/javaeecontainer.adoc   | 36 +++++++++++++++++++-
 6 files changed, 52 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/24db268d/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 1346471..b4d20e5 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
@@ -30,11 +30,11 @@ under the License.
   <servlet>
     <servlet-name>CXFServlet</servlet-name>
     <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
     <init-param>
       <param-name>openapi.context.id</param-name>
       <param-value>openapi.context.id.default</param-value>
     </init-param>
+    <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet-mapping>
     <servlet-name>CXFServlet</servlet-name>

http://git-wip-us.apache.org/repos/asf/syncope/blob/24db268d/fit/core-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index 3ae7087..ccff407 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -1121,7 +1121,12 @@ under the License.
             </exclusion>
           </exclusions>
         </dependency>
-    
+        <dependency>
+          <groupId>org.hibernate.validator</groupId>
+          <artifactId>hibernate-validator</artifactId>
+          <version>6.0.11.Final</version>
+        </dependency>
+
         <dependency>
           <groupId>com.h2database</groupId>
           <artifactId>h2</artifactId>
@@ -1138,9 +1143,9 @@ under the License.
             <inherited>true</inherited>
             <configuration>
               <container>
-                <containerId>glassfish4x</containerId>
+                <containerId>glassfish5x</containerId>
                 <zipUrlInstaller>
-                  <url>http://download.java.net/glassfish/4.1.2/release/glassfish-4.1.2.zip</url>
+                  <url>http://download.oracle.com/glassfish/5.0/release/glassfish-5.0.zip</url>
                   <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
                   <extractDir>${project.build.directory}/cargo/extract</extractDir>
                 </zipUrlInstaller>
@@ -1185,9 +1190,9 @@ under the License.
             <inherited>true</inherited>
             <configuration>
               <container>
-                <containerId>glassfish4x</containerId>
+                <containerId>glassfish5x</containerId>
                 <zipUrlInstaller>
-                  <url>https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/Payara+4.1.2.172/payara-4.1.2.172.zip</url>
+                  <url>https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.182/payara-5.182.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/24db268d/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 cc74338..bb2d65b 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -201,8 +201,8 @@ The actual configuration steps vary significantly depending on the selected
Java
 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://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://git-wip-us.apache.org/repos/asf/syncope/blob/24db268d/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 474c584..ab8e552 100644
--- a/src/main/asciidoc/getting-started/systemRequirements.adoc
+++ b/src/main/asciidoc/getting-started/systemRequirements.adoc
@@ -37,8 +37,8 @@ Apache Syncope {docVersion} requires the latest JDK 8 that is available.
 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^]
+ . https://javaee.github.io/glassfish/[Glassfish 5^]
+ . http://www.payara.fish/[Payara Server 5^]
  . http://www.wildfly.org/[Wildfly 13^]
 
 === Internal Storage

http://git-wip-us.apache.org/repos/asf/syncope/blob/24db268d/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 a544adc..3e59024 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc
@@ -32,6 +32,6 @@ for the Master domain.
 `java:comp/env/jdbc/syncopeMasterDataSource` for the Master domain. +
 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://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://git-wip-us.apache.org/repos/asf/syncope/blob/24db268d/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 e8547bd..9565da6 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
@@ -58,7 +58,41 @@ domain and MySQL): please also check that the connection parameters are
the same
 [CAUTION]
 Be sure to put the corresponding JDBC driver JAR file under `$CATALINA_HOME/lib` for each
datasource defined.
 
-===== Glassfish 4.1 and Payara Server
+===== Glassfish 5 and Payara Server 5
+
+Replace
+
+[source,xml]
+....
+    <dependency>
+      <groupId>org.apache.syncope.core</groupId>
+      <artifactId>syncope-core-persistence-jpa</artifactId>
+    </dependency>
+....
+
+with
+
+[source,xml]
+....
+    <dependency>
+      <groupId>org.apache.syncope.core</groupId>
+      <artifactId>syncope-core-persistence-jpa</artifactId>
+      <version>${syncope.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.bval</groupId>
+          <artifactId>bval-jsr</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate.validator</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>6.0.11.Final</version>
+    </dependency>
+....
+
+in `core/pom.xml`.
 
 When using a datasource for internal storage, be sure to add
 


Mime
View raw message