This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 5aeb2eea0955e05284f1bca6a566ea30f1ac6c99 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Mon Oct 26 11:32:39 2026 +0100 [SYNCOPE-2003] Payara and Wildfly removal --- .github/workflows/fit_Payara.yml | 45 ---- .github/workflows/fit_Wildfly.yml | 45 ---- fit/build-tools/pom.xml | 70 ------ .../src/main/webapp/WEB-INF/payara-web.xml | 28 --- .../src/main/webapp/WEB-INF/payara-web.xml | 31 --- fit/core-reference/pom.xml | 210 ---------------- .../src/main/resources/core-wildfly.properties | 19 -- .../src/main/webapp/WEB-INF/payara-web.xml | 31 --- .../org/apache/syncope/fit/AbstractITCase.java | 24 -- .../apache/syncope/fit/core/UserIssuesITCase.java | 3 - .../src/main/webapp/WEB-INF/payara-web.xml | 31 --- pom.xml | 3 - .../getting-started/systemRequirements.adoc | 2 - .../reference-guide/configuration/deployment.adoc | 270 +-------------------- .../reference-guide/usage/customization.adoc | 4 +- src/site/xdoc/building.xml | 12 - 16 files changed, 5 insertions(+), 823 deletions(-) diff --git a/.github/workflows/fit_Payara.yml b/.github/workflows/fit_Payara.yml deleted file mode 100644 index 65df5e23b2..0000000000 --- a/.github/workflows/fit_Payara.yml +++ /dev/null @@ -1,45 +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 -name: "FIT Payara" - -on: - push: - branches: [master] - pull_request: - # The branches below must be a subset of the branches above - branches: [master] - -jobs: - fit_Payara: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/[email protected] - - name: Setup Java JDK - uses: actions/setup-java@v6 - with: - distribution: 'temurin' - java-version: 25 - - name: Setup Maven - uses: stCarolas/[email protected] - with: - maven-version: 3.9.6 - - name: Build - run: mvn -U -T 1C -P 'skipTests,all' - - name: 'Payara / PostgreSQL' - run: mvn -f fit/core-reference/pom.xml -P payara-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true diff --git a/.github/workflows/fit_Wildfly.yml b/.github/workflows/fit_Wildfly.yml deleted file mode 100644 index 5d9d39ed3d..0000000000 --- a/.github/workflows/fit_Wildfly.yml +++ /dev/null @@ -1,45 +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 -name: "FIT Wildfly" - -on: - push: - branches: [master] - pull_request: - # The branches below must be a subset of the branches above - branches: [master] - -jobs: - fit_Wildfly: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/[email protected] - - name: Setup Java JDK - uses: actions/setup-java@v6 - with: - distribution: 'temurin' - java-version: 25 - - name: Setup Maven - uses: stCarolas/[email protected] - with: - maven-version: 3.9.6 - - name: Build - run: mvn -U -T 1C -P 'skipTests,all' - - name: 'Wildfly / PostgreSQL' - run: mvn -f fit/core-reference/pom.xml -P wildfly-it -Dinvoker.streamLogs=true -Dmodernizer.skip=true -Drat.skip=true -Dcheckstyle.skip=true -Djacoco.skip=true diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml index c524cde0be..3b9deffeec 100644 --- a/fit/build-tools/pom.xml +++ b/fit/build-tools/pom.xml @@ -350,75 +350,5 @@ under the License. </plugins> </build> </profile> - - <profile> - <id>payara</id> - - <dependencies> - <dependency> - <groupId>org.glassfish</groupId> - <artifactId>jakarta.faces</artifactId> - <version>${jakarta.faces.version}</version> - </dependency> - </dependencies> - - <build> - <defaultGoal>clean verify cargo:run</defaultGoal> - - <plugins> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven3-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <container> - <containerId>payara</containerId> - <zipUrlInstaller> - <url>https://repo1.maven.org/maven2/fish/payara/distributions/payara/${payara.version}/payara-${payara.version}.zip</url> - <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir> - <extractDir>${project.build.directory}/cargo/extract</extractDir> - </zipUrlInstaller> - <timeout>300000</timeout> - </container> - <configuration> - <properties> - <cargo.glassfish.removeDefaultDatasource>false</cargo.glassfish.removeDefaultDatasource> - <cargo.jvmargs>-Djdk.util.zip.disableZip64ExtraFieldValidation=true - -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n</cargo.jvmargs> - </properties> - </configuration> - <skip>${skipTests}</skip> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>wildfly</id> - - <build> - <defaultGoal>clean verify cargo:run</defaultGoal> - - <plugins> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven3-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <container> - <containerId>wildfly39x</containerId> - <zipUrlInstaller> - <url>https://github.com/wildfly/wildfly/releases/download/${wildfly.version}/wildfly-${wildfly.version}.zip</url> - <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir> - <extractDir>${project.build.directory}/cargo/extract</extractDir> - </zipUrlInstaller> - <timeout>300000</timeout> - </container> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> diff --git a/fit/build-tools/src/main/webapp/WEB-INF/payara-web.xml b/fit/build-tools/src/main/webapp/WEB-INF/payara-web.xml deleted file mode 100644 index 01ee06417c..0000000000 --- a/fit/build-tools/src/main/webapp/WEB-INF/payara-web.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -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. ---> -<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd";> -<payara-web-app error-url=""> - <context-root>/syncope-fit-build-tools</context-root> - <class-loader delegate="false"/> - <jaxrs-roles-allowed-enabled>false</jaxrs-roles-allowed-enabled> - <jsp-config> - <property name="httpMethods" value="GET,POST,HEAD,PUT,DELETE"/> - </jsp-config> -</payara-web-app> diff --git a/fit/console-reference/src/main/webapp/WEB-INF/payara-web.xml b/fit/console-reference/src/main/webapp/WEB-INF/payara-web.xml deleted file mode 100644 index 6b646d090b..0000000000 --- a/fit/console-reference/src/main/webapp/WEB-INF/payara-web.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -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. ---> -<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd";> -<payara-web-app error-url=""> - <!-- Uncomment this when using JNDI DataSource --> - <!--<resource-ref> - <res-ref-name>jdbc/syncopeMasterDataSource</res-ref-name> - <jndi-name>jdbc/syncopeMasterDataSource</jndi-name> - </resource-ref>--> - <class-loader delegate="false"/> - <jsp-config> - <property name="httpMethods" value="GET,POST,HEAD,PUT,DELETE"/> - </jsp-config> -</payara-web-app> diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index a5d5c32600..8a9b2056ad 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -1221,216 +1221,6 @@ under the License. </build> </profile> - <profile> - <id>payara-it</id> - - <dependencies> - <dependency> - <groupId>org.apache.syncope.core</groupId> - <artifactId>syncope-core-starter</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-tomcat</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-el</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.syncope.core.cache</groupId> - <artifactId>syncope-core-cache-caffeine</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.glassfish</groupId> - <artifactId>jakarta.faces</artifactId> - <version>${jakarta.faces.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-xml</artifactId> - </dependency> - </dependencies> - - <build> - <defaultGoal>clean verify</defaultGoal> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <inherited>true</inherited> - <executions> - <execution> - <id>adjust-buildtools-for-payara</id> - <phase>prepare-package</phase> - <configuration> - <target> - <unzip src="${settings.localRepository}/org/apache/syncope/fit/syncope-fit-build-tools/${project.version}/syncope-fit-build-tools-${project.version}.war" - dest="${project.build.outputDirectory}/syncope-fit-buildtools"/> - <copy file="${settings.localRepository}/org/glassfish/jakarta.faces/${jakarta.faces.version}/jakarta.faces-${jakarta.faces.version}.jar" - todir="${project.build.outputDirectory}/syncope-fit-buildtools/WEB-INF/lib"/> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven3-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <container> - <containerId>payara</containerId> - <zipUrlInstaller> - <url>https://repo1.maven.org/maven2/fish/payara/distributions/payara/${payara.version}/payara-${payara.version}.zip</url> - <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir> - <extractDir>${project.build.directory}/cargo/extract</extractDir> - </zipUrlInstaller> - </container> - <configuration> - <properties> - <cargo.glassfish.removeDefaultDatasource>false</cargo.glassfish.removeDefaultDatasource> - <cargo.jvmargs>-Djdk.util.zip.disableZip64ExtraFieldValidation=true - -Dspring.profiles.active=embedded,payara - -XX:+UseG1GC -Xmx2048m -Xms1024m - --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED - -Dhazelcast.jcache.provider.type=member</cargo.jvmargs> - </properties> - </configuration> - <deployables> - <deployable> - <location>${project.build.outputDirectory}/syncope-fit-buildtools</location> - <properties> - <context>syncope-fit-build-tools</context> - </properties> - </deployable> - <deployable> - <location>${project.build.directory}/${project.build.finalName}</location> - <pingURL>http://localhost:${cargo.servlet.port}/syncope/index.html</pingURL> - <pingTimeout>${cargo.deployable.ping.timeout}</pingTimeout> - <properties> - <context>syncope</context> - </properties> - </deployable> - </deployables> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>wildfly-it</id> - - <dependencies> - <dependency> - <groupId>org.apache.syncope.core</groupId> - <artifactId>syncope-core-starter</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-tomcat</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-el</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-micrometer-metrics</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>jakarta.xml.ws</groupId> - <artifactId>jakarta.xml.ws-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-core</artifactId> - <version>${cxf.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - <version>${cxf.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-policy</artifactId> - <version>${cxf.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-wsdl</artifactId> - <version>${cxf.version}</version> - </dependency> - - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.syncope.client.am</groupId> - <artifactId>syncope-client-am-enduser</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-tomcat</artifactId> - </exclusion> - </exclusions> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <defaultGoal>clean verify</defaultGoal> - - <plugins> - <plugin> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-maven3-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <container> - <containerId>wildfly41x</containerId> - <zipUrlInstaller> - <url>https://github.com/wildfly/wildfly/releases/download/${wildfly.version}/wildfly-preview-${wildfly.version}.zip</url> - <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir> - <extractDir>${project.build.directory}/cargo/extract</extractDir> - </zipUrlInstaller> - </container> - <configuration> - <properties> - <cargo.jvmargs>-Djava.net.preferIPv4Stack=true -Dspring.profiles.active=embedded,wildfly - -XX:+UseG1GC -Xmx2048m -Xms1024m - --add-opens java.base/java.util=ALL-UNNAMED - --add-opens=java.base/java.lang=ALL-UNNAMED - --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED</cargo.jvmargs> - </properties> - </configuration> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>debezium-it</id> diff --git a/fit/core-reference/src/main/resources/core-wildfly.properties b/fit/core-reference/src/main/resources/core-wildfly.properties deleted file mode 100644 index c1bb639f81..0000000000 --- a/fit/core-reference/src/main/resources/core-wildfly.properties +++ /dev/null @@ -1,19 +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. -javadocPaths=/WEB-INF/lib/syncope-common-idrepo-rest-api-${syncope.version}-javadoc.jar,\ -/WEB-INF/lib/syncope-common-idm-rest-api-${syncope.version}-javadoc.jar,\ -/WEB-INF/lib/syncope-common-am-rest-api-${syncope.version}-javadoc.jar diff --git a/fit/core-reference/src/main/webapp/WEB-INF/payara-web.xml b/fit/core-reference/src/main/webapp/WEB-INF/payara-web.xml deleted file mode 100644 index 6b646d090b..0000000000 --- a/fit/core-reference/src/main/webapp/WEB-INF/payara-web.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -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. ---> -<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd";> -<payara-web-app error-url=""> - <!-- Uncomment this when using JNDI DataSource --> - <!--<resource-ref> - <res-ref-name>jdbc/syncopeMasterDataSource</res-ref-name> - <jndi-name>jdbc/syncopeMasterDataSource</jndi-name> - </resource-ref>--> - <class-loader delegate="false"/> - <jsp-config> - <property name="httpMethods" value="GET,POST,HEAD,PUT,DELETE"/> - </jsp-config> -</payara-web-app> diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java index 86c2c9e3db..cbc2ecc210 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/AbstractITCase.java @@ -60,10 +60,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.mutable.Mutable; import org.apache.commons.lang3.mutable.MutableObject; import org.apache.commons.lang3.tuple.Pair; -import org.apache.cxf.configuration.jsse.TLSClientParameters; import org.apache.cxf.jaxrs.client.WebClient; -import org.apache.cxf.transport.http.HTTPConduit; -import org.apache.cxf.transport.https.InsecureTrustManager; import org.apache.syncope.client.lib.SyncopeAnonymousClient; import org.apache.syncope.client.lib.SyncopeClient; import org.apache.syncope.client.lib.SyncopeClientFactoryBean; @@ -406,8 +403,6 @@ public abstract class AbstractITCase { protected static ImpersonationService IMPERSONATION_SERVICE; - protected static boolean IS_DEPLOYED_IN_PAYARA = false; - private static final String POP3_HOST = "localhost"; private static int POP3_PORT; @@ -469,25 +464,6 @@ public abstract class AbstractITCase { assertEquals(ExecStatus.SUCCESS, ExecStatus.valueOf(exec.getStatus())); } - @BeforeAll - public static void jakartaEEContainerCheck() throws IOException { - TLSClientParameters tlsParams = new TLSClientParameters(); - tlsParams.setTrustManagers(InsecureTrustManager.getNoOpX509TrustManagers()); - tlsParams.setDisableCNCheck(true); - - WebClient webClient = WebClient.create("https://localhost:8181/";); - HTTPConduit conduit = WebClient.getConfig(webClient).getHttpConduit(); - conduit.getClient().setConnectionTimeout(2000); - conduit.getClient().setReceiveTimeout(2000); - conduit.setTlsClientParameters(tlsParams); - - try { - IS_DEPLOYED_IN_PAYARA = webClient.get().readEntity(String.class).contains("Payara"); - } catch (Exception e) { - LOG.debug("While checking if Syncope Core is deployed in Payara", e); - } - } - @BeforeAll public static void anonymousSetup() throws IOException { try (InputStream propStream = AbstractITCase.class.getResourceAsStream("/core.properties")) { diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java index d8cb169b28..28c1501365 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java @@ -435,9 +435,6 @@ public class UserIssuesITCase extends AbstractITCase { @Test public void issueSYNCOPE279() { - // see https://github.com/payara/Payara/issues/7203 - assumeFalse(IS_DEPLOYED_IN_PAYARA); - UserCR userCR = UserITCase.getUniqueSample("[email protected]"); userCR.getResources().clear(); userCR.getResources().add(RESOURCE_NAME_TIMEOUT); diff --git a/fit/enduser-reference/src/main/webapp/WEB-INF/payara-web.xml b/fit/enduser-reference/src/main/webapp/WEB-INF/payara-web.xml deleted file mode 100644 index 6b646d090b..0000000000 --- a/fit/enduser-reference/src/main/webapp/WEB-INF/payara-web.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -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. ---> -<!DOCTYPE payara-web-app PUBLIC "-//Payara.fish//DTD Payara Server 4 Servlet 3.0//EN" "https://docs.payara.fish/schemas/payara-web-app_4.dtd";> -<payara-web-app error-url=""> - <!-- Uncomment this when using JNDI DataSource --> - <!--<resource-ref> - <res-ref-name>jdbc/syncopeMasterDataSource</res-ref-name> - <jndi-name>jdbc/syncopeMasterDataSource</jndi-name> - </resource-ref>--> - <class-loader delegate="false"/> - <jsp-config> - <property name="httpMethods" value="GET,POST,HEAD,PUT,DELETE"/> - </jsp-config> -</payara-web-app> diff --git a/pom.xml b/pom.xml index 0974ede778..2eae424c34 100644 --- a/pom.xml +++ b/pom.xml @@ -527,9 +527,6 @@ under the License. <cargo.deployable.ping.timeout>60000</cargo.deployable.ping.timeout> <tomcat.version>11.0.27</tomcat.version> - <wildfly.version>42.0.0.Final</wildfly.version> - <payara.version>7.2026.10</payara.version> - <jakarta.faces.version>4.1.18</jakarta.faces.version> <docker.postgresql.version>18-alpine</docker.postgresql.version> <docker.mysql.version>9</docker.mysql.version> diff --git a/src/main/asciidoc/getting-started/systemRequirements.adoc b/src/main/asciidoc/getting-started/systemRequirements.adoc index 820d0026c1..75935f241e 100644 --- a/src/main/asciidoc/getting-started/systemRequirements.adoc +++ b/src/main/asciidoc/getting-started/systemRequirements.adoc @@ -37,8 +37,6 @@ Apache Syncope {docVersion} requires the latest JDK 25 that is available. Works Apache Syncope {docVersion} is verified with the following Jakarta EE containers: . https://tomcat.apache.org/download-11.cgi[Apache Tomcat 11^] - . https://www.payara.fish/[Payara Server 7^] - . https://www.wildfly.org/[Wildfly Preview 42^] === Internal Storage diff --git a/src/main/asciidoc/reference-guide/configuration/deployment.adoc b/src/main/asciidoc/reference-guide/configuration/deployment.adoc index b6bad2f10f..78f3b411dd 100644 --- a/src/main/asciidoc/reference-guide/configuration/deployment.adoc +++ b/src/main/asciidoc/reference-guide/configuration/deployment.adoc @@ -83,7 +83,7 @@ for example: to change the default HTTP port ==== -==== JavaEE Container +==== JakartaEE Container Deployment into the Jakarta EE containers listed below might require Maven project changes or tweaking some configuration settings. @@ -101,12 +101,10 @@ The database connection pool can be: . Application-managed (default); based on http://brettwooldridge.github.io/HikariCP/[HikariCP^], the related parameters can be tuned in the related <<domains,domain>> configuration file, e.g. `domains/Master.properties`, for the Master domain. -. <<JavaEE Container>>-managed, via the JNDI resource matching the name specified for a given <<domains,domain>>, e.g. +. <<JakartaEE Container>>-managed, via the JNDI resource matching the name specified for a given <<domains,domain>>, e.g. `java:comp/env/jdbc/syncopeMasterDataSource` for the `Master` domain. + -Each JavaEE Container provides its own way to accomplish this task: +Each JakartaEE Container provides its own way to accomplish this task; for example: * https://tomcat.apache.org/tomcat-11.0-doc/jdbc-pool.html[Apache Tomcat 11^] - * https://docs.payara.fish/community/docs/Technical%20Documentation/Payara%20Server%20Documentation/General%20Administration/Administering%20Database%20Connectivity.html[Payara Server 7^] - * https://docs.wildfly.org/42/Admin_Guide.html#DataSource[Wildfly 42^] **** ==== Apache Tomcat 11 @@ -132,265 +130,3 @@ set JAVA_OPTS=-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server \ -Dsyncope.log.dir=C:\opt\syncope\log \ -Xms1536m -Xmx1536m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:+DisableExplicitGC .... - -==== Payara Server 7 - -Add - -[source,xml] -.... - <dependency> - <groupId>org.glassfish</groupId> - <artifactId>jakarta.faces</artifactId> - <version>${jakarta.faces.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-xml</artifactId> - </dependency> -.... - -to `core/pom.xml`, `console/pom.xml`, `enduser/pom.xml` and `wa/pom.xml`, - -then replace - -[source,xml] -.... - <dependency> - <groupId>org.apache.syncope.core</groupId> - <artifactId>syncope-core-starter</artifactId> - </dependency> -.... - -with - -[source,xml] -.... - <dependency> - <groupId>org.apache.syncope.core</groupId> - <artifactId>syncope-core-starter</artifactId> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-tomcat</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-el</artifactId> - </exclusion> - <exclusion> - <groupId>com.github.ben-manes.caffeine</groupId> - <artifactId>jcache</artifactId> - </exclusion> - </exclusions> - </dependency> -.... - -in `core/pom.xml`. - -When using a datasource for internal storage, be sure to add - -[source,xml] -.... -<resource-ref> - <res-ref-name>jdbc/syncopeMasterDataSource</res-ref-name> - <jndi-name>jdbc/syncopeMasterDataSource</jndi-name> -</resource-ref> -.... - -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`. - -[WARNING] -==== -Do not forget to include the following system properties: - -* `-Dsyncope.conf.dir=/opt/syncope/conf` + -(required by Core and WA) -* `-Dsyncope.connid.location=file:/opt/syncope/bundles` + -(required by Core) -* `-Dsyncope.log.dir=/opt/syncope/log` + -(required by all components) -==== - -[TIP] -==== -For better performance under GNU / Linux, do not forget to include the system property: -.... --Djava.security.egd=file:/dev/./urandom -.... -==== - -==== Wildfly 42 - -Add - -[source,xml] -.... - <dependency> - <groupId>jakarta.xml.ws</groupId> - <artifactId>jakarta.xml.ws-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-core</artifactId> - <version>${cxf.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-policy</artifactId> - <version>${cxf.version}</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-wsdl</artifactId> - <version>${cxf.version}</version> - </dependency> -.... - -as additional dependencies in `core/pom.xml` and `wa/pom.xml`, - -then replace - -[source,xml] -.... - <dependency> - <groupId>org.apache.syncope.core</groupId> - <artifactId>syncope-core-starter</artifactId> - </dependency> -.... - -with - -[source,xml] -.... - <dependency> - <groupId>org.apache.syncope.core</groupId> - <artifactId>syncope-core-starter</artifactId> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-tomcat</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-el</artifactId> - </exclusion> - </exclusions> - </dependency> -.... - -in `core/pom.xml` and create - -[source] -.... -javadocPaths=/WEB-INF/lib/syncope-common-idrepo-rest-api-${syncope.version}-javadoc.jar,\ -/WEB-INF/lib/syncope-common-idm-rest-api-${syncope.version}-javadoc.jar,\ -/WEB-INF/lib/syncope-common-am-rest-api-${syncope.version}-javadoc.jar -.... - -as `core/src/main/resources/core-wildfly.properties`. - -In addition, replace - -[source,xml] -.... - <dependency> - <groupId>org.apache.syncope.client.idm</groupId> - <artifactId>syncope-client-idm-console</artifactId> - </dependency> - <dependency> - <groupId>org.apache.syncope.client.am</groupId> - <artifactId>syncope-client-am-console</artifactId> - </dependency> -.... - -with - -[source,xml] -.... - <dependency> - <groupId>org.apache.syncope.client.idm</groupId> - <artifactId>syncope-client-idm-console</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-el</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-tomcat</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.syncope.client.am</groupId> - <artifactId>syncope-client-am-console</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-el</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-tomcat</artifactId> - </exclusion> - </exclusions> - </dependency> -.... - -in `console/pom.xml` and - -[source,xml] -.... - <dependency> - <groupId>org.apache.syncope.client.am</groupId> - <artifactId>syncope-client-am-enduser</artifactId> - </dependency> -.... - -with - -[source,xml] -.... - <dependency> - <groupId>org.apache.syncope.client.am</groupId> - <artifactId>syncope-client-am-enduser</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.tomcat.embed</groupId> - <artifactId>tomcat-embed-el</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-tomcat</artifactId> - </exclusion> - </exclusions> - </dependency> -.... - -in `enduser/pom.xml`. - -Do not forget to include `widlfly` as -https://docs.spring.io/spring-boot/4.0/reference/features/profiles.html[Spring Boot profile^] -for the Core application. - -[WARNING] -==== -Do not forget to include the following system properties: - -* `-Dsyncope.conf.dir=/opt/syncope/conf` + -(required by all components) -* `-Dsyncope.connid.location=file:/opt/syncope/bundles` + -(required by Core) -* `-Dsyncope.log.dir=/opt/syncope/log` + -(required by all components) -==== - -[TIP] -==== -For better performance under GNU / Linux, do not forget to include the system property: -.... --Djava.security.egd=file:/dev/./urandom -.... -==== diff --git a/src/main/asciidoc/reference-guide/usage/customization.adoc b/src/main/asciidoc/reference-guide/usage/customization.adoc index 1280b54186..2bafd6a3ef 100644 --- a/src/main/asciidoc/reference-guide/usage/customization.adoc +++ b/src/main/asciidoc/reference-guide/usage/customization.adoc @@ -39,7 +39,7 @@ for details) allows developers to work comfortably from a single workstation, wi effectively implemented as the `all` https://maven.apache.org/guides/introduction/introduction-to-profiles.html[Maven profile^], where the available optional components and extensions are enabled. + -When deploying the generated artifacts as <<standalone>> or into an external <<javaee-container>> however, the required +When deploying the generated artifacts as <<standalone>> or into an external <<jakartaee-container>> however, the required components and extensions need to be explicitly selected and enabled, as shown in the following text. The artifacts are generated by running the Maven command (with reference to the suggested @@ -239,7 +239,7 @@ https://docs.spring.io/spring-boot/4.0/reference/features/external-config.html[E settings; with above reference: * <<standalone>>: `--spring.config.additional-location=/opt/syncope/conf/` -* <<javaee-container>>: `-Dspring.config.additional-location=/opt/syncope/conf/` +* <<jakartaee-container>>: `-Dspring.config.additional-location=/opt/syncope/conf/` ==== [[customization-core]] diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml index a168be48a8..66841c0f34 100644 --- a/src/site/xdoc/building.xml +++ b/src/site/xdoc/building.xml @@ -172,18 +172,6 @@ under the License. </div> Prform the full test suite against a real <a href="https://neo4j.com/";>Neo4j</a> instance via <source>$ mvn -Pneo4j-it</source> - - <h4>Java EE containers</h4> - - <h5>Payara</h5> - Perform the full test suite by deploying Syncope core in - <a href="http://www.payara.fish/";>Payara</a> via - <source>$ mvn -Ppayara-it</source> - - <h5>Wildfly</h5> - Perform the full test suite by deploying Syncope core in - <a href="http://www.wildfly.org";>Wildfly</a> via - <source>$ mvn -Pwildfly-it</source> <h4>External search engines</h4>
