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 2019/12/05 13:07:13 UTC
[syncope] 01/02: Upgrading Payara
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 8747c1679155326a4ff2181fec5a8746baa00457
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Dec 5 08:36:19 2019 +0100
Upgrading Payara
---
fit/core-reference/pom.xml | 16 ++-------
src/main/asciidoc/getting-started/obtain.adoc | 1 -
.../getting-started/systemRequirements.adoc | 1 -
.../systemadministration/dbcp.adoc | 3 +-
.../systemadministration/javaeecontainer.adoc | 38 ++--------------------
5 files changed, 5 insertions(+), 54 deletions(-)
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index 79bfa42..384c79e 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -1499,18 +1499,6 @@ under the License.
<dependencies>
<dependency>
- <groupId>org.apache.syncope.core</groupId>
- <artifactId>syncope-core-persistence-jpa</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</dependency>
@@ -1526,9 +1514,9 @@ under the License.
<inherited>true</inherited>
<configuration>
<container>
- <containerId>glassfish5x</containerId>
+ <containerId>payara</containerId>
<zipUrlInstaller>
- <url>https://repo1.maven.org/maven2/fish/payara/distributions/payara/5.191/payara-5.191.zip</url>
+ <url>https://repo1.maven.org/maven2/fish/payara/distributions/payara/5.194/payara-5.194.zip</url>
<downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
<extractDir>${project.build.directory}/cargo/extract</extractDir>
</zipUrlInstaller>
diff --git a/src/main/asciidoc/getting-started/obtain.adoc b/src/main/asciidoc/getting-started/obtain.adoc
index 75f9f2c..6f63ecb 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -202,7 +202,6 @@ 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 5^]
. https://payara.gitbooks.io/payara-server/content/documentation/user-guides/connection-pools/connection-pools.html[Payara Server 5^]
. http://docs.wildfly.org/14/Admin_Guide.html#DataSource[Wildfly 14^]
====
diff --git a/src/main/asciidoc/getting-started/systemRequirements.adoc b/src/main/asciidoc/getting-started/systemRequirements.adoc
index d88f1fc..d5d745e 100644
--- a/src/main/asciidoc/getting-started/systemRequirements.adoc
+++ b/src/main/asciidoc/getting-started/systemRequirements.adoc
@@ -37,7 +37,6 @@ 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://javaee.github.io/glassfish/[Glassfish 5^]
. http://www.payara.fish/[Payara Server 5^]
. http://www.wildfly.org/[Wildfly 14^]
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc
index 2d3a704..b507384 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/dbcp.adoc
@@ -32,6 +32,5 @@ 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^]
* https://payara.gitbooks.io/payara-server/content/documentation/user-guides/connection-pools/connection-pools.html[Payara Server 5^]
- * http://docs.wildfly.org/14/Admin_Guide.html#DataSource[Wildfly 14^]
\ No newline at end of file
+ * http://docs.wildfly.org/14/Admin_Guide.html#DataSource[Wildfly 14^]
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
index a55bdf1..7099ba2 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/javaeecontainer.adoc
@@ -58,41 +58,7 @@ 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 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`.
+===== Payara Server 5
When using a datasource for internal storage, be sure to add
@@ -104,7 +70,7 @@ When using a datasource for internal storage, be sure to add
</resource-ref>
....
-right after `</context-root>` in `core/src/main/webapp/WEB-INF/glassfish-web.xml`, assuming that your Glassfish instance
+right after `</context-root>` in `core/src/main/webapp/WEB-INF/glassfish-web.xml`, assuming that your Payara Server instance
provides a datasource named `jdbc/syncopeMasterDataSource`.
[TIP]