From 073955a2445d8a061ed8892a5dfab01132e2fa1e Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 14 Nov 2024 09:30:13 +0000 Subject: [PATCH 01/22] FISH-9002 First stab Signed-off-by: Andrew Pielage --- authentication-tck/README.md | 21 ++ authentication-tck/payara-profile.xml | 12 +- authentication-tck/pom-old-tck-run.xml | 355 ------------------ authentication-tck/pom.xml | 216 +++++++++++ authentication-tck/replaceCustomProfile.ps1 | 1 + authentication-tck/replaceCustomProfile.sh | 2 + authentication-tck/run-tck.sh | 20 - pom.xml | 2 + .../jakarta-authentication-tck/pom.xml | 80 ++++ tck-download/pom.xml | 1 + 10 files changed, 331 insertions(+), 379 deletions(-) create mode 100644 authentication-tck/README.md delete mode 100644 authentication-tck/pom-old-tck-run.xml create mode 100644 authentication-tck/pom.xml create mode 100644 authentication-tck/replaceCustomProfile.ps1 create mode 100644 authentication-tck/replaceCustomProfile.sh delete mode 100644 authentication-tck/run-tck.sh create mode 100644 tck-download/jakarta-authentication-tck/pom.xml diff --git a/authentication-tck/README.md b/authentication-tck/README.md new file mode 100644 index 0000000..c5daefc --- /dev/null +++ b/authentication-tck/README.md @@ -0,0 +1,21 @@ +# Jakarta Authentication TCK Runner + +## Prerequisite + +Download and install the TCK into your local Maven repo. +From the top-level directory: `mvn clean install -pl . -pl tck-download -pl tck-download/jakarta-authentication-tck -Pjakarta-staging` + +## Test Execution + +To execute the full TCK against a managed Payara Server, run from the module directory + +``` +mvn clean verify -Ppayara-server-managed +``` + +If on Windows, you may encounter an error where the powershell script cannot be executed due to the local execution policy. +The following will get around this for the terminal session: + +``` +Set-ExecutionPolicy -Scope Process -ExecutionPolicy Bypass +``` diff --git a/authentication-tck/payara-profile.xml b/authentication-tck/payara-profile.xml index 08dbc50..ab0dd5a 100644 --- a/authentication-tck/payara-profile.xml +++ b/authentication-tck/payara-profile.xml @@ -3,9 +3,13 @@ ${maven.multiModuleProjectDirectory}/target - 6.2022.1.Alpha5-SNAPSHOT + 7.2024.1.Alpha2-SNAPSHOT payara - 3.0.alpha6 + 4.0.alpha1 + + jakarta.authentication + jakarta.authentication-vendor-api + ${payara.version} @@ -16,7 +20,7 @@ fish.payara.arquillian - payara-client-ee9 + payara-client-ee11 test ${payara.arquillian.container.version} @@ -55,7 +59,7 @@ maven-surefire-plugin - ${payara.root}/payara6 + ${payara.root}/payara7 diff --git a/authentication-tck/pom-old-tck-run.xml b/authentication-tck/pom-old-tck-run.xml deleted file mode 100644 index ed658e9..0000000 --- a/authentication-tck/pom-old-tck-run.xml +++ /dev/null @@ -1,355 +0,0 @@ - - - - - 4.0.0 - - org.eclipse.ee4j.tck.authentication - old-authentication-tck-parent - 3.0.1 - - - glassfish-external-tck-authentication - pom - - Old Jakarta Authentication TCK - run - - - 1.10.11 - ${project.build.directory}/apache-ant-${ant.version} - https://archive.apache.org/dist/ant/binaries/apache-ant-${ant.version}-bin.zip - - ${project.build.directory}/authentication-tck - ${tck.home}/src/com/sun/ts/tests/jaspic - standalone - ${project.build.directory}/payara6 - ${payara.home}/glassfish/bin/asadmin - full - - payara - - org/glassfish/**\:com/sun/enterprise/** - - 4848 - 1527 - 8080 - 8181 - 7676 - 8686 - 3700 - 3920 - 3820 - 2000 - - - - - fish.payara.distributions - ${payara.artifact} - ${payara.version} - zip - test - - - org.eclipse.ee4j.tck.authentication - old-authentication-tck - ${project.version} - zip - - - - - - - com.googlecode.maven-download-plugin - download-maven-plugin - 1.6.7 - - - download-ant - generate-resources - - wget - - - - - ${skipITs} - ${ant.zip.url} - true - ${project.build.directory} - - - - - maven-dependency-plugin - 3.3.0 - - ${skipITs} - - - - unpack-payara - pre-integration-test - - unpack-dependencies - - - ${payara.artifact} - ${project.build.directory} - - - - unpack-tck - pre-integration-test - - unpack-dependencies - - - old-authentication-tck - ${project.build.directory} - - - - - - - maven-antrun-plugin - 3.1.0 - - - org.apache.ant - ant - ${ant.version} - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - - - - - ${skipITs} - - - - prepare-tck-and-payara - pre-integration-test - - - - - - - - - - - - - - - @{key}=@{value}${line.separator} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - ]]> - - - - ]]> - - ]]> - - - - - run - - - - - configure-tck-tests - pre-integration-test - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - run-tck-tests - integration-test - - run - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - platform - - false - - - platform - jaspic_baseline|javaee - - - - - - web - - false - - - web - payara-web - jaspic_web_profile - - - - diff --git a/authentication-tck/pom.xml b/authentication-tck/pom.xml new file mode 100644 index 0000000..73973e9 --- /dev/null +++ b/authentication-tck/pom.xml @@ -0,0 +1,216 @@ + + + + 4.0.0 + + fish.payara.jakarta.tests.tck + tck + 1.0-SNAPSHOT + + + authentication-tck + pom + + TCK: Authentication + + + + ${project.build.directory} + ${user.home}${file.separator}.m2${file.separator}settings.xml + ${env.MAVEN_HOME}${file.separator}bin${file.separator}mvn + + bash + ${basedir}${file.separator}replaceCustomProfile.sh + + + + + fish.payara.jakarta.tests.tck + jakarta-authentication-tck + ${project.version} + zip + + + + + + + maven-install-plugin + + + default-install + none + + + + + + maven-dependency-plugin + + + unpack-tck + pre-integration-test + + unpack + + + ${skipTests} + + + fish.payara.jakarta.tests.tck + jakarta-authentication-tck + zip + ${project.version} + false + + + ${project.build.directory} + + + + + + + + + + windows + + + Windows + + + + ${env.MAVEN_HOME}${file.separator}bin${file.separator}mvn.cmd + powershell.exe + ${basedir}${file.separator}replaceCustomProfile.ps1 + + + + + payara-server-managed + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-server + + unpack + + pre-integration-test + + + true + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + replace-custom-profile-in-tck-pom + pre-integration-test + + exec + + + ${skipTests} + ${scriptExecutor} + ${replaceScript} + + + + run-authentication-tck + integration-test + + exec + + + ${skipTests} + ${maven.executable} + + -B + -e + -s + ${maven.settings.xml} + -f + ${tck.root}/authentication-tck-${jakarta-authentication-tck.version}/tck/pom.xml + clean + verify + -Dpayara.version=${payara.version} + -Dpayara.artifact=${payara.artifact} + -Dmaven-install-plugin.version=${maven-install-plugin.version} + -Darquillian.version=${arquillian.version} + -Dpayara.arquillian.container.version=${payara.arquillian.version} + -Dmaven-failsafe-plugin.version=${maven-failsafe-plugin.version} + -Djunit.version=${junit.version} + -Dmaven-antrun-plugin.version=${maven-antrun-plugin.version} + -Pcustom,!glassfish-ci-managed + -fae + + + C + + + + + + + + + + + + payara-server-remote + + + \ No newline at end of file diff --git a/authentication-tck/replaceCustomProfile.ps1 b/authentication-tck/replaceCustomProfile.ps1 new file mode 100644 index 0000000..8bc5207 --- /dev/null +++ b/authentication-tck/replaceCustomProfile.ps1 @@ -0,0 +1 @@ +(Get-Content .\target\authentication-tck-3.1.0\tck\pom.xml).replace('custom', ('custom' + (Get-Content .\payara-profile.xml))) | Set-Content .\target\authentication-tck-3.1.0\tck\pom.xml \ No newline at end of file diff --git a/authentication-tck/replaceCustomProfile.sh b/authentication-tck/replaceCustomProfile.sh new file mode 100644 index 0000000..b502cbe --- /dev/null +++ b/authentication-tck/replaceCustomProfile.sh @@ -0,0 +1,2 @@ +#!/bin/bash +sed -i "/custom<\/id>/r payara-profile.xml" target/authentication-tck-${VERSION}/tck/pom.xml \ No newline at end of file diff --git a/authentication-tck/run-tck.sh b/authentication-tck/run-tck.sh deleted file mode 100644 index a21a16a..0000000 --- a/authentication-tck/run-tck.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -if [ JAVA_HOME = "" ] ; then - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 -fi -VERSION=3.0.1 - -rm -r target -mkdir target -wget -q https://download.eclipse.org/jakartaee/authentication/3.0/jakarta-authentication-tck-${VERSION}.zip -O target/jakarta-authentication-tck-${VERSION}.zip -unzip -q target/jakarta-authentication-tck-${VERSION}.zip -d target -sed -i "/custom<\/id>/r payara-profile.xml" target/authentication-tck-${VERSION}/tck/pom.xml -cp pom-old-tck-run.xml target/authentication-tck-${VERSION}/tck/old-tck/run/pom.xml - -if [[ "$PROFILE" == "web" || "$PROFILE" == "WEB" ]];then - mvn clean verify surefire-report:report -Pcustom,old-tck,web,\!glassfish-ci-managed -f target/authentication-tck-${VERSION}/tck/pom.xml -Dpayara.artifact=payara-web -else - mvn clean verify surefire-report:report -Pcustom,old-tck,platform,\!glassfish-ci-managed -f target/authentication-tck-${VERSION}/tck/pom.xml -fi - - diff --git a/pom.xml b/pom.xml index 9cfa840..7fb7375 100644 --- a/pom.xml +++ b/pom.xml @@ -110,6 +110,7 @@ 2.1.5 11.0.0 2.0.2 + 3.1.0 full @@ -134,6 +135,7 @@ tck-download activation-tck annotations-tck + authentication-tck authorization-tck batch-tck cdi-langmodel-tck diff --git a/tck-download/jakarta-authentication-tck/pom.xml b/tck-download/jakarta-authentication-tck/pom.xml new file mode 100644 index 0000000..92a81bf --- /dev/null +++ b/tck-download/jakarta-authentication-tck/pom.xml @@ -0,0 +1,80 @@ + + + + 4.0.0 + + fish.payara.jakarta.tests.tck + tck-download + 1.0-SNAPSHOT + + + jakarta-authentication-tck + pom + + TCK: Install Jakarta Authentication TCK + + + jakarta-authentication-tck-${jakarta-authentication-tck.version}.zip + https://download.eclipse.org/jakartaee/authentication/3.1/${tck.test.authentication.file} + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + download-authentication-tck + generate-resources + + wget + + + ${tck.tests.authentication.url} + + + + + + maven-install-plugin + + + install-authentication-tck + process-resources + + install-file + + + ${project.build.directory}/${tck.test.authentication.file} + ${project.groupId} + ${project.artifactId} + ${project.version} + zip + true + + + + + + + diff --git a/tck-download/pom.xml b/tck-download/pom.xml index c22130c..66d2328 100644 --- a/tck-download/pom.xml +++ b/tck-download/pom.xml @@ -50,6 +50,7 @@ jakarta-concurrency-tck jakarta-core-profile-tck jakarta-inject-tck + jakarta-authentication-tck From c596893371571fe7c2a5e4a1fa45ce6b484ea77b Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 14 Nov 2024 09:45:38 +0000 Subject: [PATCH 02/22] FISH-9002 Correct linux script Signed-off-by: Andrew Pielage --- authentication-tck/replaceCustomProfile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/authentication-tck/replaceCustomProfile.sh b/authentication-tck/replaceCustomProfile.sh index b502cbe..ab8e8b3 100644 --- a/authentication-tck/replaceCustomProfile.sh +++ b/authentication-tck/replaceCustomProfile.sh @@ -1,2 +1,2 @@ #!/bin/bash -sed -i "/custom<\/id>/r payara-profile.xml" target/authentication-tck-${VERSION}/tck/pom.xml \ No newline at end of file +sed -i "/custom<\/id>/r payara-profile.xml" target/authentication-tck-3.1.0/tck/pom.xml From 5cfadd278824c8a821fbeb2f1213d2ed565f2123 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 14 Nov 2024 10:55:46 +0000 Subject: [PATCH 03/22] FISH-9002 Remove unnecessary plugin versions Signed-off-by: Andrew Pielage --- authentication-tck/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/authentication-tck/pom.xml b/authentication-tck/pom.xml index 73973e9..0ed0db9 100644 --- a/authentication-tck/pom.xml +++ b/authentication-tck/pom.xml @@ -188,12 +188,7 @@ verify -Dpayara.version=${payara.version} -Dpayara.artifact=${payara.artifact} - -Dmaven-install-plugin.version=${maven-install-plugin.version} - -Darquillian.version=${arquillian.version} -Dpayara.arquillian.container.version=${payara.arquillian.version} - -Dmaven-failsafe-plugin.version=${maven-failsafe-plugin.version} - -Djunit.version=${junit.version} - -Dmaven-antrun-plugin.version=${maven-antrun-plugin.version} -Pcustom,!glassfish-ci-managed -fae From 5c9b73ff84fa7361a450178e456c232bc1206627 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 14 Nov 2024 11:40:10 +0000 Subject: [PATCH 04/22] FISH-9002 Extra adjustments Need to commit to remove CRLF Signed-off-by: Andrew Pielage --- authentication-tck/payara-profile.xml | 56 +++++++++++++++++++++++++++ authentication-tck/pom.xml | 2 + 2 files changed, 58 insertions(+) diff --git a/authentication-tck/payara-profile.xml b/authentication-tck/payara-profile.xml index ab0dd5a..e0819a8 100644 --- a/authentication-tck/payara-profile.xml +++ b/authentication-tck/payara-profile.xml @@ -56,12 +56,68 @@ + org.apache.maven.plugins maven-surefire-plugin + maven-surefire-plugin.version ${payara.root}/payara7 + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin.version} + + + unpack + pre-integration-test + + install-file + + + + ${payara.root}/payara7/glassfish/modules/jakarta.authentication-api.jar + + ${sigtest.api.groupId} + ${sigtest.api.artifactId} + ${sigtest.api.version} + jar + + + + + + + windows + + + Windows + + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + + + print-test-result + none + + execute + + + + + + + diff --git a/authentication-tck/pom.xml b/authentication-tck/pom.xml index 0ed0db9..2840962 100644 --- a/authentication-tck/pom.xml +++ b/authentication-tck/pom.xml @@ -189,6 +189,8 @@ -Dpayara.version=${payara.version} -Dpayara.artifact=${payara.artifact} -Dpayara.arquillian.container.version=${payara.arquillian.version} + -Dmaven-surefire-plugin.version=${maven-surefire-plugin.version} + -Dmaven-install-plugin.version=${maven-install-plugin.version} -Pcustom,!glassfish-ci-managed -fae From 74aa062bce3ac7f2bb33110a3dffa72589800648 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 14 Nov 2024 11:43:02 +0000 Subject: [PATCH 05/22] Test From aff52d68b5bd8593b9cf1940999a75d48f82b3b8 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 14 Nov 2024 13:30:27 +0000 Subject: [PATCH 06/22] Fix Windows runner Signed-off-by: Andrew Pielage --- authentication-tck/payara-profile.xml | 42 +++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/authentication-tck/payara-profile.xml b/authentication-tck/payara-profile.xml index e0819a8..84a556d 100644 --- a/authentication-tck/payara-profile.xml +++ b/authentication-tck/payara-profile.xml @@ -58,7 +58,7 @@ org.apache.maven.plugins maven-surefire-plugin - maven-surefire-plugin.version + ${maven-surefire-plugin.version} ${payara.root}/payara7 @@ -81,9 +81,7 @@ install-file - - ${payara.root}/payara7/glassfish/modules/jakarta.authentication-api.jar - + ${payara.root}/payara7/glassfish/modules/jakarta.authentication-api.jar ${sigtest.api.groupId} ${sigtest.api.artifactId} ${sigtest.api.version} @@ -102,22 +100,24 @@ Windows - - - - org.codehaus.gmaven - groovy-maven-plugin - 2.1.1 - - - print-test-result - none - - execute - - - - - + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + + + print-test-result + none + + execute + + + + + + From 852186d0773235f6d745fce43ada5c62ec44f633 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 15 Nov 2024 15:59:24 +0000 Subject: [PATCH 07/22] Windows remote profile mostly working Signed-off-by: Andrew Pielage --- authentication-tck/README.md | 25 +- authentication-tck/payara-profile.xml | 123 -------- authentication-tck/payara-profiles.xml | 295 ++++++++++++++++++++ authentication-tck/pom.xml | 78 +++++- authentication-tck/replaceCustomProfile.ps1 | 1 - authentication-tck/replaceCustomProfile.sh | 2 - authentication-tck/replaceScript.ps1 | 5 + authentication-tck/replaceScript.sh | 2 + pom.xml | 2 +- 9 files changed, 389 insertions(+), 144 deletions(-) delete mode 100644 authentication-tck/payara-profile.xml create mode 100644 authentication-tck/payara-profiles.xml delete mode 100644 authentication-tck/replaceCustomProfile.ps1 delete mode 100644 authentication-tck/replaceCustomProfile.sh create mode 100644 authentication-tck/replaceScript.ps1 create mode 100644 authentication-tck/replaceScript.sh diff --git a/authentication-tck/README.md b/authentication-tck/README.md index c5daefc..5ec6b89 100644 --- a/authentication-tck/README.md +++ b/authentication-tck/README.md @@ -7,10 +7,29 @@ From the top-level directory: `mvn clean install -pl . -pl tck-download -pl tck- ## Test Execution -To execute the full TCK against a managed Payara Server, run from the module directory +### Managed Server Profile +NOTE: The payara-server-managed doesn't work on Windows. +The `create-system-properties` asadmin command doesn't play well with Windows. + +To execute the full TCK against a managed Payara Server, run from the module directory, replacing the payara.version property. + +``` +mvn clean verify -Ppayara-server-managed -Dpayara.version=${payaraVersion} +``` + +### Remote Server Profile + +To execute the full TCK against a remote Payara Server installation, start your Payara Server and run the follow asadmin command against it, replacing ${tckDir} and ${payaraHome}: ``` -mvn clean verify -Ppayara-server-managed +create-system-properties j2eelogin.name=j2ee:j2eelogin.password=j2ee:provider.configuration.file=${tckDir}/spi/common/ProviderConfiguration.xml:vendor.authconfig.factory=org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory:log.file.location=${payaraHome}/glassfish/domains/domain1/logs +``` + +NOTE: On Windows you will need to escape the ':' and '\' characters that will be present on your path variables, due to how the `create-system-properties` parses these characters + +Run the TCK with the following command from the module directory, providing the path to the payaraHome and replacing the payara.version property: +``` +mvn clean verify -Ppayara-server-managed -Dpayara.home=${payaraHome} -Dpayara.version=${payaraVersion} ``` If on Windows, you may encounter an error where the powershell script cannot be executed due to the local execution policy. @@ -18,4 +37,4 @@ The following will get around this for the terminal session: ``` Set-ExecutionPolicy -Scope Process -ExecutionPolicy Bypass -``` +``` \ No newline at end of file diff --git a/authentication-tck/payara-profile.xml b/authentication-tck/payara-profile.xml deleted file mode 100644 index 84a556d..0000000 --- a/authentication-tck/payara-profile.xml +++ /dev/null @@ -1,123 +0,0 @@ - - true - - - ${maven.multiModuleProjectDirectory}/target - 7.2024.1.Alpha2-SNAPSHOT - payara - 4.0.alpha1 - - jakarta.authentication - jakarta.authentication-vendor-api - ${payara.version} - - - - fish.payara.arquillian - arquillian-payara-server-managed - ${payara.arquillian.container.version} - test - - - fish.payara.arquillian - payara-client-ee11 - test - ${payara.arquillian.container.version} - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - process-test-classes - - unpack - - - ${payara.root} - ${payara.root}/dependency-maven-plugin-markers - - - fish.payara.distributions - ${payara.artifact} - ${payara.version} - zip - false - ${payara.root} - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - ${payara.root}/payara7 - - - - - - org.apache.maven.plugins - maven-install-plugin - ${maven-install-plugin.version} - - - unpack - pre-integration-test - - install-file - - - ${payara.root}/payara7/glassfish/modules/jakarta.authentication-api.jar - ${sigtest.api.groupId} - ${sigtest.api.artifactId} - ${sigtest.api.version} - jar - - - - - - - - - windows - - - Windows - - - - - - - org.codehaus.gmaven - groovy-maven-plugin - 2.1.1 - - - print-test-result - none - - execute - - - - - - - - diff --git a/authentication-tck/payara-profiles.xml b/authentication-tck/payara-profiles.xml new file mode 100644 index 0000000..a2136ba --- /dev/null +++ b/authentication-tck/payara-profiles.xml @@ -0,0 +1,295 @@ + + payara-server-managed + + ${maven.multiModuleProjectDirectory}${file.separator}target/payara7 + + ${payara.home}${file.separator}glassfish${file.separator}bin${file.separator}asadmin${script.extension} + + ${skipTests} + ${skipTests} + + 7.2024.1.Alpha3-SNAPSHOT + payara + 4.0.alpha1 + + 3.1.2 + 3.3.1 + 3.3.0 + + jakarta.authentication + jakarta.authentication-vendor-api + ${payara.version} + + + ${maven.multiModuleProjectDirectory}${file.separator}spi${file.separator}common${file.separator}ProviderConfiguration.xml + ${payara.home}${file.separator}glassfish${file.separator}domains${file.separator}domain1${file.separator}logs + org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory + server + + + + fish.payara.arquillian + arquillian-payara-server-managed + ${payara.arquillian.container.version} + test + + + fish.payara.arquillian + payara-client-ee11 + test + ${payara.arquillian.container.version} + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-payara-server + process-test-classes + + unpack + + + + + fish.payara.distributions + ${payara.artifact} + ${payara.version} + zip + false + ${maven.multiModuleProjectDirectory}${file.separator}target + + + + + + + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin.version} + + + install-payara-bundled-authentication-api-for-sigtest + pre-integration-test + + install-file + + false + + ${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}jakarta.authentication-api.jar + ${sigtest.api.groupId} + ${sigtest.api.artifactId} + ${sigtest.api.version} + jar + + + + + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + start-payara-server-for-config + pre-integration-test + + exec + + + ${skipServerStartStop} + ${payara.asadmin} + + start-domain + + + + + create-expected-tck-properties + pre-integration-test + + exec + + + ${skipConfig} + ${payara.asadmin} + + create-system-properties + j2eelogin.name=j2ee:j2eelogin.password=j2ee:provider.configuration.file=${provider.configuration.file}:vendor.authconfig.factory=${vendor.authconfig.factory}:log.file.location=${log.file.location} + + + + + stop-payara-server-after-config + pre-integration-test + + exec + + + ${skipServerStartStop} + ${payara.asadmin} + + stop-domain + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + default-test + none + + + run-test-in-integration-phase + integration-test + + test + + + + + + ${payara.home} + ${provider.configuration.file} + ${vendor.authconfig.factory} + ${log.file.location} + ${logical.hostname.servlet} + + + + + + + + payara-server-remote + + ${maven.multiModuleProjectDirectory}/target/payara7 + + ${payara.home}${file.separator}glassfish${file.separator}bin${file.separator}asadmin${script.extension} + + ${skipTests} + ${skipTests} + + 4.0.alpha1 + 7.2024.1.Alpha3-SNAPSHOT + + 3.1.2 + 3.3.1 + 3.3.0 + + jakarta.authentication + jakarta.authentication-vendor-api + ${payara.version} + + + ${maven.multiModuleProjectDirectory}${file.separator}spi${file.separator}common${file.separator}ProviderConfiguration.xml + ${payara.home}${file.separator}glassfish${file.separator}domains${file.separator}domain1${file.separator}logs + org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory + server + + + + fish.payara.arquillian + arquillian-payara-server-remote + ${payara.arquillian.container.version} + test + + + fish.payara.arquillian + payara-client-ee11 + test + ${payara.arquillian.container.version} + + + + + + + org.apache.maven.plugins + maven-install-plugin + ${maven-install-plugin.version} + + + install-payara-bundled-authentication-api-for-sigtest + pre-integration-test + + install-file + + false + + ${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}jakarta.authentication-api.jar + ${sigtest.api.groupId} + ${sigtest.api.artifactId} + ${sigtest.api.version} + jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + ${payara.home} + ${provider.configuration.file} + ${vendor.authconfig.factory} + ${log.file.location} + ${logical.hostname.servlet} + + + + + + + + windows + + + Windows + + + + .bat + + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 + + + print-test-result + none + + execute + + + + + + + + + + diff --git a/authentication-tck/pom.xml b/authentication-tck/pom.xml index 2840962..fde8955 100644 --- a/authentication-tck/pom.xml +++ b/authentication-tck/pom.xml @@ -62,7 +62,8 @@ ${env.MAVEN_HOME}${file.separator}bin${file.separator}mvn bash - ${basedir}${file.separator}replaceCustomProfile.sh + sh + ${basedir}${file.separator}replaceScript.${scriptExtension} @@ -111,6 +112,24 @@ + + org.codehaus.mojo + exec-maven-plugin + + + replace-custom-profile-in-tck-pom + pre-integration-test + + exec + + + ${skipTests} + ${scriptExecutor} + ${replaceScript} + + + + @@ -125,7 +144,7 @@ ${env.MAVEN_HOME}${file.separator}bin${file.separator}mvn.cmd powershell.exe - ${basedir}${file.separator}replaceCustomProfile.ps1 + ps1 @@ -157,17 +176,52 @@ exec-maven-plugin - replace-custom-profile-in-tck-pom - pre-integration-test + run-authentication-tck + integration-test exec ${skipTests} - ${scriptExecutor} - ${replaceScript} + ${maven.executable} + + -B + -e + -s + ${maven.settings.xml} + -f + ${tck.root}/authentication-tck-${jakarta-authentication-tck.version}${file.separator}tck${file.separator}pom.xml + clean + verify + -Dpayara.version=${payara.version} + -Dpayara.artifact=${payara.artifact} + -Dpayara.arquillian.container.version=${payara.arquillian.version} + -Dmaven-surefire-plugin.version=${maven-surefire-plugin.version} + -Dmaven-install-plugin.version=${maven-install-plugin.version} + -Dprovider.configuration.file=${tck.root}${file.separator}authentication-tck-${jakarta-authentication-tck.version}${file.separator}tck${file.separator}spi${file.separator}common${file.separator}ProviderConfiguration.xml + -Dexec-maven-plugin.version=3.3.0 + -Ppayara-server-managed,!glassfish-ci-managed + -fae + + + C + + + + + + + + + payara-server-remote + + + + org.codehaus.mojo + exec-maven-plugin + run-authentication-tck integration-test @@ -183,15 +237,16 @@ -s ${maven.settings.xml} -f - ${tck.root}/authentication-tck-${jakarta-authentication-tck.version}/tck/pom.xml + ${tck.root}${file.separator}authentication-tck-${jakarta-authentication-tck.version}${file.separator}tck${file.separator}pom.xml clean verify -Dpayara.version=${payara.version} - -Dpayara.artifact=${payara.artifact} + -Dpayara.home=${payara.home} -Dpayara.arquillian.container.version=${payara.arquillian.version} -Dmaven-surefire-plugin.version=${maven-surefire-plugin.version} -Dmaven-install-plugin.version=${maven-install-plugin.version} - -Pcustom,!glassfish-ci-managed + -Dprovider.configuration.file=${tck.root}${file.separator}authentication-tck-${jakarta-authentication-tck.version}${file.separator}tck${file.separator}spi${file.separator}common${file.separator}ProviderConfiguration.xml + -Ppayara-server-remote,!glassfish-ci-managed -fae @@ -204,10 +259,5 @@ - - - - payara-server-remote - \ No newline at end of file diff --git a/authentication-tck/replaceCustomProfile.ps1 b/authentication-tck/replaceCustomProfile.ps1 deleted file mode 100644 index 8bc5207..0000000 --- a/authentication-tck/replaceCustomProfile.ps1 +++ /dev/null @@ -1 +0,0 @@ -(Get-Content .\target\authentication-tck-3.1.0\tck\pom.xml).replace('custom', ('custom' + (Get-Content .\payara-profile.xml))) | Set-Content .\target\authentication-tck-3.1.0\tck\pom.xml \ No newline at end of file diff --git a/authentication-tck/replaceCustomProfile.sh b/authentication-tck/replaceCustomProfile.sh deleted file mode 100644 index ab8e8b3..0000000 --- a/authentication-tck/replaceCustomProfile.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -sed -i "/custom<\/id>/r payara-profile.xml" target/authentication-tck-3.1.0/tck/pom.xml diff --git a/authentication-tck/replaceScript.ps1 b/authentication-tck/replaceScript.ps1 new file mode 100644 index 0000000..dd06071 --- /dev/null +++ b/authentication-tck/replaceScript.ps1 @@ -0,0 +1,5 @@ +(Get-Content .\target\authentication-tck-3.1.0\tck\pom.xml).replace('', (Get-Content .\payara-profiles.xml)) | Set-Content .\target\authentication-tck-3.1.0\tck\pom.xml + +# Remove these properties which activate org.omnifaces:junit-result-listener as it doesn't work with Windows +(Get-Content .\target\authentication-tck-3.1.0\tck\pom.xml).replace('listener', '') | Set-Content .\target\authentication-tck-3.1.0\tck\pom.xml +(Get-Content .\target\authentication-tck-3.1.0\tck\pom.xml).replace('org.omnifaces.junit.ResultListener', '') | Set-Content .\target\authentication-tck-3.1.0\tck\pom.xml \ No newline at end of file diff --git a/authentication-tck/replaceScript.sh b/authentication-tck/replaceScript.sh new file mode 100644 index 0000000..a454d3c --- /dev/null +++ b/authentication-tck/replaceScript.sh @@ -0,0 +1,2 @@ +#!/bin/bash +sed -i "/<\/profiles>/r payara-profiles.xml" target/authentication-tck-3.1.0/tck/pom.xml diff --git a/pom.xml b/pom.xml index 7fb7375..4ea901e 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ ${maven.multiModuleProjectDirectory}${file.separator}target${file.separator}payara7 - 7.2024.1.Alpha2-SNAPSHOT + 7.2024.1.Alpha3-SNAPSHOT ${payara.home}${file.separator}glassfish${file.separator}bin${file.separator}asadmin${script.extension} payara From 10e352f5a13811cd90f90dce8e106c38f872c589 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 15 Nov 2024 16:26:34 +0000 Subject: [PATCH 08/22] FISH-9002 Fix replace script for Linux Signed-off-by: Andrew Pielage --- authentication-tck/replaceScript.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/authentication-tck/replaceScript.sh b/authentication-tck/replaceScript.sh index a454d3c..5b20ad1 100644 --- a/authentication-tck/replaceScript.sh +++ b/authentication-tck/replaceScript.sh @@ -1,2 +1,2 @@ #!/bin/bash -sed -i "/<\/profiles>/r payara-profiles.xml" target/authentication-tck-3.1.0/tck/pom.xml +sed -i -e "/<\/profiles>/r payara-profiles.xml" -e "/<\/profiles>/d" target/authentication-tck-3.1.0/tck/pom.xml \ No newline at end of file From e294ff95ec76b9af7342bd5f03bf7c6acf2dcb11 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 15 Nov 2024 16:33:35 +0000 Subject: [PATCH 09/22] FISH-9002 Only run commands once Signed-off-by: Andrew Pielage --- authentication-tck/payara-profiles.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/authentication-tck/payara-profiles.xml b/authentication-tck/payara-profiles.xml index a2136ba..8190e5a 100644 --- a/authentication-tck/payara-profiles.xml +++ b/authentication-tck/payara-profiles.xml @@ -105,6 +105,7 @@ exec + false ${skipServerStartStop} ${payara.asadmin} @@ -119,6 +120,7 @@ exec + false ${skipConfig} ${payara.asadmin} @@ -134,6 +136,7 @@ exec + false ${skipServerStartStop} ${payara.asadmin} From 51ba259977e9f86271748d60451859719ae21115 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 15 Nov 2024 17:22:30 +0000 Subject: [PATCH 10/22] FISH-9002 Add epicyro dependency Signed-off-by: Andrew Pielage --- authentication-tck/payara-profiles.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/authentication-tck/payara-profiles.xml b/authentication-tck/payara-profiles.xml index 8190e5a..1e34b14 100644 --- a/authentication-tck/payara-profiles.xml +++ b/authentication-tck/payara-profiles.xml @@ -39,6 +39,14 @@ test ${payara.arquillian.container.version} + + + + org.glassfish.epicyro + epicyro + ${epicyro.version} + test + @@ -217,6 +225,14 @@ test ${payara.arquillian.container.version} + + + + org.glassfish.epicyro + epicyro + ${epicyro.version} + test + From 46c69c2da69c74ff58cd1daf46417473bfbfd9d0 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 15 Nov 2024 17:27:31 +0000 Subject: [PATCH 11/22] FISH-9002 Add payara-bom Signed-off-by: Andrew Pielage --- authentication-tck/payara-profiles.xml | 28 ++++++++++++++++++++------ authentication-tck/pom.xml | 2 -- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/authentication-tck/payara-profiles.xml b/authentication-tck/payara-profiles.xml index 1e34b14..3d3ed9a 100644 --- a/authentication-tck/payara-profiles.xml +++ b/authentication-tck/payara-profiles.xml @@ -10,7 +10,6 @@ 7.2024.1.Alpha3-SNAPSHOT payara - 4.0.alpha1 3.1.2 3.3.1 @@ -26,18 +25,27 @@ org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory server + + + + fish.payara.api + payara-bom + ${payara.version} + pom + import + + + fish.payara.arquillian arquillian-payara-server-managed - ${payara.arquillian.container.version} test fish.payara.arquillian payara-client-ee11 test - ${payara.arquillian.container.version} @@ -195,7 +203,6 @@ ${skipTests} ${skipTests} - 4.0.alpha1 7.2024.1.Alpha3-SNAPSHOT 3.1.2 @@ -212,18 +219,27 @@ org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory server + + + + fish.payara.api + payara-bom + ${payara.version} + pom + import + + + fish.payara.arquillian arquillian-payara-server-remote - ${payara.arquillian.container.version} test fish.payara.arquillian payara-client-ee11 test - ${payara.arquillian.container.version} diff --git a/authentication-tck/pom.xml b/authentication-tck/pom.xml index fde8955..c189c1d 100644 --- a/authentication-tck/pom.xml +++ b/authentication-tck/pom.xml @@ -195,7 +195,6 @@ verify -Dpayara.version=${payara.version} -Dpayara.artifact=${payara.artifact} - -Dpayara.arquillian.container.version=${payara.arquillian.version} -Dmaven-surefire-plugin.version=${maven-surefire-plugin.version} -Dmaven-install-plugin.version=${maven-install-plugin.version} -Dprovider.configuration.file=${tck.root}${file.separator}authentication-tck-${jakarta-authentication-tck.version}${file.separator}tck${file.separator}spi${file.separator}common${file.separator}ProviderConfiguration.xml @@ -242,7 +241,6 @@ verify -Dpayara.version=${payara.version} -Dpayara.home=${payara.home} - -Dpayara.arquillian.container.version=${payara.arquillian.version} -Dmaven-surefire-plugin.version=${maven-surefire-plugin.version} -Dmaven-install-plugin.version=${maven-install-plugin.version} -Dprovider.configuration.file=${tck.root}${file.separator}authentication-tck-${jakarta-authentication-tck.version}${file.separator}tck${file.separator}spi${file.separator}common${file.separator}ProviderConfiguration.xml From 5c7cd4351af9b342d2b80eb9b892029961464539 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 15 Nov 2024 17:30:32 +0000 Subject: [PATCH 12/22] FISH-9002 Add epicyro version property Signed-off-by: Andrew Pielage --- authentication-tck/payara-profiles.xml | 4 ++++ authentication-tck/pom.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/authentication-tck/payara-profiles.xml b/authentication-tck/payara-profiles.xml index 3d3ed9a..fc490da 100644 --- a/authentication-tck/payara-profiles.xml +++ b/authentication-tck/payara-profiles.xml @@ -11,6 +11,8 @@ 7.2024.1.Alpha3-SNAPSHOT payara + 3.1.0 + 3.1.2 3.3.1 3.3.0 @@ -205,6 +207,8 @@ 7.2024.1.Alpha3-SNAPSHOT + 3.1.0 + 3.1.2 3.3.1 3.3.0 diff --git a/authentication-tck/pom.xml b/authentication-tck/pom.xml index c189c1d..2158a12 100644 --- a/authentication-tck/pom.xml +++ b/authentication-tck/pom.xml @@ -61,6 +61,8 @@ ${user.home}${file.separator}.m2${file.separator}settings.xml ${env.MAVEN_HOME}${file.separator}bin${file.separator}mvn + 3.1.0 + bash sh ${basedir}${file.separator}replaceScript.${scriptExtension} @@ -197,6 +199,7 @@ -Dpayara.artifact=${payara.artifact} -Dmaven-surefire-plugin.version=${maven-surefire-plugin.version} -Dmaven-install-plugin.version=${maven-install-plugin.version} + -Depicyro.version=${epicyro.version} -Dprovider.configuration.file=${tck.root}${file.separator}authentication-tck-${jakarta-authentication-tck.version}${file.separator}tck${file.separator}spi${file.separator}common${file.separator}ProviderConfiguration.xml -Dexec-maven-plugin.version=3.3.0 -Ppayara-server-managed,!glassfish-ci-managed @@ -243,6 +246,7 @@ -Dpayara.home=${payara.home} -Dmaven-surefire-plugin.version=${maven-surefire-plugin.version} -Dmaven-install-plugin.version=${maven-install-plugin.version} + -Depicyro.version=${epicyro.version} -Dprovider.configuration.file=${tck.root}${file.separator}authentication-tck-${jakarta-authentication-tck.version}${file.separator}tck${file.separator}spi${file.separator}common${file.separator}ProviderConfiguration.xml -Ppayara-server-remote,!glassfish-ci-managed -fae From 6a7af2cdae199ec57977bd1b7b73cefb8d52ec68 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 15 Nov 2024 17:41:59 +0000 Subject: [PATCH 13/22] FISH-9002 Add repositories Signed-off-by: Andrew Pielage --- authentication-tck/payara-profiles.xml | 104 +++++++++++++++++++++++++ pom.xml | 40 ++++++++++ 2 files changed, 144 insertions(+) diff --git a/authentication-tck/payara-profiles.xml b/authentication-tck/payara-profiles.xml index fc490da..4d5bd70 100644 --- a/authentication-tck/payara-profiles.xml +++ b/authentication-tck/payara-profiles.xml @@ -194,6 +194,58 @@ + + + payara-nexus-artifacts + https://nexus.dev.payara.fish/repository/payara-artifacts + + true + + + false + + + + payara-nexus-snapshots + https://nexus.dev.payara.fish/repository/payara-snapshots + + false + + + true + + + + payara-nexus-enterprise-artifacts + https://nexus.dev.payara.fish/repository/payara-enterprise-artifacts-private + + true + + + false + + + + payara-nexus-enterprise-snapshots + https://nexus.dev.payara.fish/repository/payara-enterprise-snapshots-private + + false + + + true + + + + payara-nexus-enterprise-distributions + https://nexus.dev.payara.fish/repository/payara-enterprise + + true + + + false + + + payara-server-remote @@ -298,6 +350,58 @@ + + + payara-nexus-artifacts + https://nexus.dev.payara.fish/repository/payara-artifacts + + true + + + false + + + + payara-nexus-snapshots + https://nexus.dev.payara.fish/repository/payara-snapshots + + false + + + true + + + + payara-nexus-enterprise-artifacts + https://nexus.dev.payara.fish/repository/payara-enterprise-artifacts-private + + true + + + false + + + + payara-nexus-enterprise-snapshots + https://nexus.dev.payara.fish/repository/payara-enterprise-snapshots-private + + false + + + true + + + + payara-nexus-enterprise-distributions + https://nexus.dev.payara.fish/repository/payara-enterprise + + true + + + false + + + windows diff --git a/pom.xml b/pom.xml index 4ea901e..5b8ada4 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,46 @@ false + + payara-nexus-snapshots + https://nexus.dev.payara.fish/repository/payara-snapshots + + false + + + true + + + + payara-nexus-enterprise-artifacts + https://nexus.dev.payara.fish/repository/payara-enterprise-artifacts-private + + true + + + false + + + + payara-nexus-enterprise-snapshots + https://nexus.dev.payara.fish/repository/payara-enterprise-snapshots-private + + false + + + true + + + + payara-nexus-enterprise-distributions + https://nexus.dev.payara.fish/repository/payara-enterprise + + true + + + false + + From bc7dd05e3f78fbff42cd1332b7cc90d5fdec803c Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 21 Nov 2024 10:02:40 +0000 Subject: [PATCH 14/22] FISH-9002 Override webservice client class spi provider and add to classpath Signed-off-by: Andrew Pielage --- authentication-tck/payara-profiles.xml | 6 ++++++ authentication-tck/replaceScript.ps1 | 7 ++++++- authentication-tck/replaceScript.sh | 6 +++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/authentication-tck/payara-profiles.xml b/authentication-tck/payara-profiles.xml index 4d5bd70..9b27d83 100644 --- a/authentication-tck/payara-profiles.xml +++ b/authentication-tck/payara-profiles.xml @@ -183,6 +183,9 @@ + + ${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}webservices.security.jar + ${payara.home} ${provider.configuration.file} @@ -339,6 +342,9 @@ maven-surefire-plugin ${maven-surefire-plugin.version} + + ${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}webservices.security.jar + ${payara.home} ${provider.configuration.file} diff --git a/authentication-tck/replaceScript.ps1 b/authentication-tck/replaceScript.ps1 index dd06071..fac4b88 100644 --- a/authentication-tck/replaceScript.ps1 +++ b/authentication-tck/replaceScript.ps1 @@ -2,4 +2,9 @@ # Remove these properties which activate org.omnifaces:junit-result-listener as it doesn't work with Windows (Get-Content .\target\authentication-tck-3.1.0\tck\pom.xml).replace('listener', '') | Set-Content .\target\authentication-tck-3.1.0\tck\pom.xml -(Get-Content .\target\authentication-tck-3.1.0\tck\pom.xml).replace('org.omnifaces.junit.ResultListener', '') | Set-Content .\target\authentication-tck-3.1.0\tck\pom.xml \ No newline at end of file +(Get-Content .\target\authentication-tck-3.1.0\tck\pom.xml).replace('org.omnifaces.junit.ResultListener', '') | Set-Content .\target\authentication-tck-3.1.0\tck\pom.xml + + +# Not sure if this is the "correct" way to configure this, but this Service Loader is a GlassFish specific class (as in "GlassFish" GlassFish: it's not a part of Metro) +# The class name was changed from what we have in Payara in two commits: https://github.com/eclipse-ee4j/glassfish/commit/0dff8ac0607dbbee94d16d4e7da5c4618b61d295 and https://github.com/eclipse-ee4j/glassfish/commit/5da439185d5d7be1f61fcc201ae3ab53f4fd6a23 +Set-Content .\target\authentication-tck-3.1.0\tck\spi\soap\src\main\resources\META-INF\services\com.sun.xml.ws.assembler.metro.dev.ClientPipelineHook "com.sun.enterprise.security.webservices.ClientPipeCreator" diff --git a/authentication-tck/replaceScript.sh b/authentication-tck/replaceScript.sh index 5b20ad1..0e196b2 100644 --- a/authentication-tck/replaceScript.sh +++ b/authentication-tck/replaceScript.sh @@ -1,2 +1,6 @@ #!/bin/bash -sed -i -e "/<\/profiles>/r payara-profiles.xml" -e "/<\/profiles>/d" target/authentication-tck-3.1.0/tck/pom.xml \ No newline at end of file +sed -i -e "/<\/profiles>/r payara-profiles.xml" -e "/<\/profiles>/d" target/authentication-tck-3.1.0/tck/pom.xml + +# Not sure if this is the "correct" way to configure this, but this Service Loader is a GlassFish specific class (as in "GlassFish" GlassFish: it's not a part of Metro) +# The class name was changed from what we have in Payara in two commits: https://github.com/eclipse-ee4j/glassfish/commit/0dff8ac0607dbbee94d16d4e7da5c4618b61d295 and https://github.com/eclipse-ee4j/glassfish/commit/5da439185d5d7be1f61fcc201ae3ab53f4fd6a23 +echo "com.sun.enterprise.security.webservices.ClientPipeCreator" > target/authentication-tck-3.1.0/tck/spi/soap/src/main/resources/META-INF/services/com.sun.xml.ws.assembler.metro.dev.ClientPipelineHook From dec877882177cf48ab64c6398b37285b8dbbfe15 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 21 Nov 2024 10:15:59 +0000 Subject: [PATCH 15/22] FISH-9002 Use our existing class for now Signed-off-by: Andrew Pielage --- authentication-tck/payara-profiles.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/authentication-tck/payara-profiles.xml b/authentication-tck/payara-profiles.xml index 9b27d83..0ba20f9 100644 --- a/authentication-tck/payara-profiles.xml +++ b/authentication-tck/payara-profiles.xml @@ -24,7 +24,8 @@ ${maven.multiModuleProjectDirectory}${file.separator}spi${file.separator}common${file.separator}ProviderConfiguration.xml ${payara.home}${file.separator}glassfish${file.separator}domains${file.separator}domain1${file.separator}logs - org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory + + com.sun.jaspic.config.factory.AuthConfigFileFactory server @@ -275,7 +276,8 @@ ${maven.multiModuleProjectDirectory}${file.separator}spi${file.separator}common${file.separator}ProviderConfiguration.xml ${payara.home}${file.separator}glassfish${file.separator}domains${file.separator}domain1${file.separator}logs - org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory + + com.sun.jaspic.config.factory.AuthConfigFileFactory server From 1fa16b87e1106fb7c4548e22018ab0d6bf5e09d3 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 21 Nov 2024 10:21:37 +0000 Subject: [PATCH 16/22] FISH-9002 Also update readme Signed-off-by: Andrew Pielage --- authentication-tck/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/authentication-tck/README.md b/authentication-tck/README.md index 5ec6b89..347e69d 100644 --- a/authentication-tck/README.md +++ b/authentication-tck/README.md @@ -22,7 +22,7 @@ mvn clean verify -Ppayara-server-managed -Dpayara.version=${payaraVersion} To execute the full TCK against a remote Payara Server installation, start your Payara Server and run the follow asadmin command against it, replacing ${tckDir} and ${payaraHome}: ``` -create-system-properties j2eelogin.name=j2ee:j2eelogin.password=j2ee:provider.configuration.file=${tckDir}/spi/common/ProviderConfiguration.xml:vendor.authconfig.factory=org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory:log.file.location=${payaraHome}/glassfish/domains/domain1/logs +create-system-properties j2eelogin.name=j2ee:j2eelogin.password=j2ee:provider.configuration.file=${tckDir}/spi/common/ProviderConfiguration.xml:vendor.authconfig.factory=com.sun.jaspic.config.factory.AuthConfigFileFactory:log.file.location=${payaraHome}/glassfish/domains/domain1/logs ``` NOTE: On Windows you will need to escape the ':' and '\' characters that will be present on your path variables, due to how the `create-system-properties` parses these characters From baef03fd81a0412555da7e37313da30f7dfc9ed0 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 21 Nov 2024 10:24:00 +0000 Subject: [PATCH 17/22] FISH-9002 Add explanative comment about tckDir Signed-off-by: Andrew Pielage --- authentication-tck/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/authentication-tck/README.md b/authentication-tck/README.md index 347e69d..c0f5ff0 100644 --- a/authentication-tck/README.md +++ b/authentication-tck/README.md @@ -25,6 +25,8 @@ To execute the full TCK against a remote Payara Server installation, start your create-system-properties j2eelogin.name=j2ee:j2eelogin.password=j2ee:provider.configuration.file=${tckDir}/spi/common/ProviderConfiguration.xml:vendor.authconfig.factory=com.sun.jaspic.config.factory.AuthConfigFileFactory:log.file.location=${payaraHome}/glassfish/domains/domain1/logs ``` +${tckDir} is the directory where the unpacked TCK exists, for example: /home/user/Git/JakartaEE-10-TCK-Runners/authentication-tck/target/authentication-tck-3.1.0/tck + NOTE: On Windows you will need to escape the ':' and '\' characters that will be present on your path variables, due to how the `create-system-properties` parses these characters Run the TCK with the following command from the module directory, providing the path to the payaraHome and replacing the payara.version property: From 0b8eed0f576ffb3263a777a821bad7c85896f8ee Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 21 Nov 2024 10:27:13 +0000 Subject: [PATCH 18/22] FISH-9002 Add Windows example Signed-off-by: Andrew Pielage --- authentication-tck/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/authentication-tck/README.md b/authentication-tck/README.md index c0f5ff0..f887a90 100644 --- a/authentication-tck/README.md +++ b/authentication-tck/README.md @@ -28,6 +28,10 @@ create-system-properties j2eelogin.name=j2ee:j2eelogin.password=j2ee:provider.co ${tckDir} is the directory where the unpacked TCK exists, for example: /home/user/Git/JakartaEE-10-TCK-Runners/authentication-tck/target/authentication-tck-3.1.0/tck NOTE: On Windows you will need to escape the ':' and '\' characters that will be present on your path variables, due to how the `create-system-properties` parses these characters +For example: +``` +create-system-properties "j2eelogin.name=j2ee:j2eelogin.password=j2ee:provider.configuration.file=D\:\\Git\\JakartaEE10-TCK-Runners\\authentication-tck\\target\\authentication-tck-3.1.0\\tck\\spi\\common\\ProviderConfiguration.xml:vendor.authconfig.factory=com.sun.jaspic.config.factory.AuthConfigFileFactory:log.file.location=D\:\\Git\\Payara\\appserver\\distributions\\payara\\target\\stage\\payara7\\glassfish\\domains\\domain1\\logs" +``` Run the TCK with the following command from the module directory, providing the path to the payaraHome and replacing the payara.version property: ``` From 6441dbee855cf3a1e18a1dfb676c8759f57ef24f Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 21 Nov 2024 14:13:34 +0000 Subject: [PATCH 19/22] FISH-9002 Add little TODO comment Signed-off-by: Andrew Pielage --- authentication-tck/payara-profiles.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/authentication-tck/payara-profiles.xml b/authentication-tck/payara-profiles.xml index 0ba20f9..866f32d 100644 --- a/authentication-tck/payara-profiles.xml +++ b/authentication-tck/payara-profiles.xml @@ -11,6 +11,7 @@ 7.2024.1.Alpha3-SNAPSHOT payara + 3.1.0 3.1.2 @@ -55,6 +56,7 @@ org.glassfish.epicyro epicyro + ${epicyro.version} test @@ -263,6 +265,7 @@ 7.2024.1.Alpha3-SNAPSHOT + 3.1.0 3.1.2 @@ -307,6 +310,7 @@ org.glassfish.epicyro epicyro + ${epicyro.version} test From d2da292894b115f5820e35073aa0396ef6729966 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 21 Nov 2024 16:12:07 +0000 Subject: [PATCH 20/22] FISH-9002 Add missing inherited=false Signed-off-by: Andrew Pielage --- authentication-tck/payara-profiles.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/authentication-tck/payara-profiles.xml b/authentication-tck/payara-profiles.xml index 866f32d..c41769c 100644 --- a/authentication-tck/payara-profiles.xml +++ b/authentication-tck/payara-profiles.xml @@ -74,6 +74,7 @@ unpack + false From 074ed2129fa29155a1b6fc3e44374c39a59c4c74 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 21 Nov 2024 16:13:14 +0000 Subject: [PATCH 21/22] FISH-9002 Remove unnecessary test delay Signed-off-by: Andrew Pielage --- authentication-tck/payara-profiles.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/authentication-tck/payara-profiles.xml b/authentication-tck/payara-profiles.xml index c41769c..d61edf2 100644 --- a/authentication-tck/payara-profiles.xml +++ b/authentication-tck/payara-profiles.xml @@ -173,19 +173,6 @@ org.apache.maven.plugins maven-surefire-plugin ${maven-surefire-plugin.version} - - - default-test - none - - - run-test-in-integration-phase - integration-test - - test - - - ${payara.home}${file.separator}glassfish${file.separator}modules${file.separator}webservices.security.jar From 4dd23d8b2d9d0930d9f099d33162a9fde31f6836 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Tue, 26 Nov 2024 09:58:57 +0000 Subject: [PATCH 22/22] FISH-9002 Comment out Epicyro for now as we don't actually use it yet Signed-off-by: Andrew Pielage --- authentication-tck/payara-profiles.xml | 34 ++++++++++++++------------ 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/authentication-tck/payara-profiles.xml b/authentication-tck/payara-profiles.xml index d61edf2..7fda20f 100644 --- a/authentication-tck/payara-profiles.xml +++ b/authentication-tck/payara-profiles.xml @@ -52,14 +52,15 @@ test - - - org.glassfish.epicyro - epicyro - - ${epicyro.version} - test - + + + + + + + + + @@ -294,14 +295,15 @@ test - - - org.glassfish.epicyro - epicyro - - ${epicyro.version} - test - + + + + + + + + +