Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FISH-9002 Adjust EE11 Authentication Runner for Epicyro #119

Merged
merged 2 commits into from
Dec 5, 2024
Merged

FISH-9002 Adjust EE11 Authentication Runner for Epicyro #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ef545c
FISH-9002 Adjust for Epicyro implementation
Pandrex247 Dec 2, 2024
1f76c88
FISH-9002 Update readme
Pandrex247 Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions authentication-tck/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ 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=com.sun.jaspic.config.factory.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=org.glassfish.epicyro.config.factory.file.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
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"
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=org.glassfish.epicyro.config.factory.file.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:
Expand All @@ -43,4 +43,4 @@ The following will get around this for the terminal session:

```
Set-ExecutionPolicy -Scope Process -ExecutionPolicy Bypass
```
```
42 changes: 14 additions & 28 deletions authentication-tck/payara-profiles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
<payara.version>7.2024.1.Alpha3-SNAPSHOT</payara.version>
<payara.artifact>payara</payara.artifact>

<!-- Remove this version once Epicyro is integrated and defined in Payara-BOM -->
<epicyro.version>3.1.0</epicyro.version>

<maven-install-plugin.version>3.1.2</maven-install-plugin.version>
<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
<exec-maven-plugin.version>3.3.0</exec-maven-plugin.version>
Expand All @@ -25,8 +22,7 @@
<!-- Properties expected by the TCK -->
<provider.configuration.file>${maven.multiModuleProjectDirectory}${file.separator}spi${file.separator}common${file.separator}ProviderConfiguration.xml</provider.configuration.file>
<log.file.location>${payara.home}${file.separator}glassfish${file.separator}domains${file.separator}domain1${file.separator}logs</log.file.location>
<!-- We will presumably switch to org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory once we have integrated with Epicyro -->
<vendor.authconfig.factory>com.sun.jaspic.config.factory.AuthConfigFileFactory</vendor.authconfig.factory>
<vendor.authconfig.factory>org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory</vendor.authconfig.factory>
<logical.hostname.servlet>server</logical.hostname.servlet>
</properties>
<dependencyManagement>
Expand All @@ -52,15 +48,12 @@
<scope>test</scope>
</dependency>

<!-- Uncomment this dependency once we are actually using Epicyro in Payara -->
<!-- &lt;!&ndash; For the unit tests in /spi/ to be able to instantiate vendor AuthConfigFactory &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.glassfish.epicyro</groupId>-->
<!-- <artifactId>epicyro</artifactId>-->
<!-- &lt;!&ndash; Remove once Epicyro is integrated and defined in Payara-BOM &ndash;&gt;-->
<!-- <version>${epicyro.version}</version>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<!-- For the unit tests in /spi/ to be able to instantiate vendor AuthConfigFactory -->
<dependency>
<groupId>org.glassfish.epicyro</groupId>
<artifactId>epicyro</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -254,9 +247,6 @@

<payara.version>7.2024.1.Alpha3-SNAPSHOT</payara.version>

<!-- Remove this version once Epicyro is integrated and defined in Payara-BOM -->
<epicyro.version>3.1.0</epicyro.version>

<maven-install-plugin.version>3.1.2</maven-install-plugin.version>
<maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
<exec-maven-plugin.version>3.3.0</exec-maven-plugin.version>
Expand All @@ -268,8 +258,7 @@
<!-- Properties expected by the TCK -->
<provider.configuration.file>${maven.multiModuleProjectDirectory}${file.separator}spi${file.separator}common${file.separator}ProviderConfiguration.xml</provider.configuration.file>
<log.file.location>${payara.home}${file.separator}glassfish${file.separator}domains${file.separator}domain1${file.separator}logs</log.file.location>
<!-- We will presumably switch to org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory once we have integrated with Epicyro -->
<vendor.authconfig.factory>com.sun.jaspic.config.factory.AuthConfigFileFactory</vendor.authconfig.factory>
<vendor.authconfig.factory>org.glassfish.epicyro.config.factory.file.AuthConfigFileFactory</vendor.authconfig.factory>
<logical.hostname.servlet>server</logical.hostname.servlet>
</properties>
<dependencyManagement>
Expand All @@ -295,15 +284,12 @@
<scope>test</scope>
</dependency>

<!-- Uncomment this dependency once we are actually using Epicyro in Payara -->
<!-- &lt;!&ndash; For the unit tests in /spi/ to be able to instantiate vendor AuthConfigFactory &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.glassfish.epicyro</groupId>-->
<!-- <artifactId>epicyro</artifactId>-->
<!-- &lt;!&ndash; Remove this version once Epicyro is integrated and defined in Payara-BOM &ndash;&gt;-->
<!-- <version>${epicyro.version}</version>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<!-- For the unit tests in /spi/ to be able to instantiate vendor AuthConfigFactory -->
<dependency>
<groupId>org.glassfish.epicyro</groupId>
<artifactId>epicyro</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down