Merge pull request #23767 from dmatej/sync-6.x-to-master-merge2
Sync 6.x to master
diff --git a/appserver/admingui/common/pom.xml b/appserver/admingui/common/pom.xml
index d58138f..12b3c47 100644
--- a/appserver/admingui/common/pom.xml
+++ b/appserver/admingui/common/pom.xml
@@ -88,7 +88,13 @@
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<scope>provided</scope>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.glassfish.main.admin</groupId>
<artifactId>rest-client</artifactId>
diff --git a/appserver/admingui/jackson-jaxb/pom.xml b/appserver/admingui/jackson-jaxb/pom.xml
index e518718..b529bb9 100644
--- a/appserver/admingui/jackson-jaxb/pom.xml
+++ b/appserver/admingui/jackson-jaxb/pom.xml
@@ -42,14 +42,8 @@
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
@@ -144,7 +138,7 @@
</execution>
</executions>
</plugin>
-
+
<!-- Creates the OSGi MANIFEST.MF file -->
<plugin>
<groupId>org.apache.felix</groupId>
@@ -169,7 +163,7 @@
</instructions>
</configuration>
</plugin>
-
+
<!-- Adds the manifest file created by the org.apache.felix:maven-bundle-plugin -->
<plugin>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/appserver/tests/tck/authentication/pom.xml b/appserver/tests/tck/authentication/pom.xml
new file mode 100644
index 0000000..c387f87
--- /dev/null
+++ b/appserver/tests/tck/authentication/pom.xml
@@ -0,0 +1,328 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.glassfish.main.tests.tck</groupId>
+ <artifactId>tck</artifactId>
+ <version>6.2.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>glassfish-external-tck-authentication</artifactId>
+ <packaging>pom</packaging>
+
+ <name>TCK: authentication</name>
+
+ <properties>
+ <ant.home>${project.build.directory}/apache-ant-${ant.version}</ant.home>
+ <ant.zip.url>https://archive.apache.org/dist/ant/binaries/apache-ant-${ant.version}-bin.zip</ant.zip.url>
+
+ <tck.home>${project.build.directory}/authentication-tck</tck.home>
+ <tck.tests.home>${tck.home}/src/com/sun/ts/tests/jsf</tck.tests.home>
+
+ <glassfish.home>${project.build.directory}/glassfish6</glassfish.home>
+ <glassfish.version>${project.version}</glassfish.version>
+ <glassfish.asadmin>${glassfish.home}/glassfish/bin/asadmin</glassfish.asadmin>
+
+ <jacoco.includes>org/glassfish/**\:com/sun/enterprise/**</jacoco.includes>
+
+ <port.admin>14848</port.admin>
+ <port.derby>11527</port.derby>
+ <port.http>18080</port.http>
+ <port.https>18181</port.https>
+ <port.jms>17676</port.jms>
+ <port.jmx>18686</port.jmx>
+ <port.orb>13700</port.orb>
+ <port.orb.mutual>13920</port.orb.mutual>
+ <port.orb.ssl>13820</port.orb.ssl>
+ <port.harness.log>12000</port.harness.log>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.main.distributions</groupId>
+ <artifactId>glassfish</artifactId>
+ <version>${glassfish.version}</version>
+ <type>zip</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.tests.tck</groupId>
+ <artifactId>jakarta-authentication-tck</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>download-ant</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <skip>${skipITs}</skip>
+ <url>${ant.zip.url}</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <skip>${skipITs}</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>unpack-glassfish</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>glassfish</includeArtifactIds>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-tck</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>jakarta-authentication-tck</includeArtifactIds>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <skip>${skipITs}</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>prepare-tck-and-glassfish</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"
+ classpathref="maven.plugin.classpath" />
+
+ <macrodef name="tck-setting">
+ <attribute name="key" /> <attribute name="value" />
+ <sequential>
+ <replaceregexp file="${tck.home}/bin/ts.jte" byline="true"
+ match="@{key}=.*" replace="@{key}=@{value}" />
+ </sequential>
+ </macrodef>
+
+ <macrodef name="tck-add">
+ <attribute name="key" /> <attribute name="value" />
+ <sequential>
+ <concat append="true" destfile="${tck.home}/bin/ts.jte">@{key}=@{value}${line.separator}</concat>
+ </sequential>
+ </macrodef>
+
+
+ <!-- Change configuration -->
+ <copy file="${tck.home}/bin/ts.jte.jdk11" tofile="${tck.home}/bin/ts.jte" overwrite="true" />
+
+ <tck-setting key="jaspic.home" value="${glassfish.home}/glassfish"/>
+ <tck-setting key="harness.log.traceflag" value="true"/>
+ <tck-setting key="s1as.jvm.options" value="-Dj2eelogin.name=${user}:-Dj2eelogin.password=${password}"/>
+
+ <tck-setting key="webServerHost" value="localhost"/>
+ <tck-setting key="webServerPort" value="${port.http}"/>
+ <tck-setting key="securedWebServicePort" value="${port.https}"/>
+ <tck-setting key="s1as.admin.port" value="${port.admin}"/>
+ <tck-setting key="glassfish.admin.port" value="${port.admin}"/>
+ <tck-setting key="orb.port" value="${port.orb}"/>
+ <tck-setting key="database.port" value="${port.derby}"/>
+ <tck-setting key="harness.log.port" value="${port.harness.log}"/>
+
+ <tck-setting key="report.dir" value="${tck.home}/authenticationreport/authentication"/>
+ <tck-setting key="work.dir" value="${tck.home}/authenticationwork/authentication"/>
+
+ <!--
+ # It's an open question why these settings are not just part of ts.jte to begin with.
+ # It's also an open question why the Authentication TCK insists on these being defined
+ -->
+
+ <tck-add key="persistence.unit.name.2" value="JPATCK2"/>
+ <tck-add key="persistence.unit.name" value="CTS-EM"/>
+ <tck-add key="jakarta.persistence.provider" value="org.eclipse.persistence.jpa.PersistenceProvider"/>
+ <tck-add key="jakarta.persistence.jdbc.driver" value="org.apache.derby.jdbc.ClientDriver"/>
+ <tck-add key="jakarta.persistence.jdbc.url" value="jdbc:derby://localhost:${port.derby}/derbyDB;create=true"/>
+ <tck-add key="jakarta.persistence.jdbc.user" value="cts1"/>
+ <tck-add key="jakarta.persistence.jdbc.password" value="cts1"/>
+ <tck-add key="jpa.provider.implementation.specific.properties" value="eclipselink.logging.level=OFF"/>
+ <tck-add key="persistence.second.level.caching.supported" value="true"/>
+
+ <limit maxwait="60">
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="delete-domain"/>
+ <arg value="domain1" />
+ </exec>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="create-domain"/>
+ <arg value="--domainproperties=domain.adminPort=${port.admin}:domain.instancePort=${port.http}:http.ssl.port=${port.https}:jms.port=${port.jms}:domain.jmxPort=${port.jmx}:orb.listener.port=${port.orb}:orb.ssl.port=${port.orb.ssl}:orb.mutualauth.port=${port.orb.mutual}" />
+ <arg value="--user=admin" />
+ <arg value="--nopassword" />
+ <arg value="domain1" />
+ </exec>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="start-domain"/>
+ </exec>
+
+ <if>
+ <isset property="jacoco.version" />
+ <then>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="create-jvm-options" />
+ <arg value="--port=${port.admin}" />
+ <arg value=""-javaagent\:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco-it.exec,includes=${jacoco.includes}"" />
+ </exec>
+ </then>
+ </if>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="stop-domain"/>
+ <arg value="domain1"/>
+ </exec>
+ </limit>
+ <mkdir dir="${tck.home}/authenticationtckreport"/>
+ <mkdir dir="${tck.home}/authenticationtckreport/authenticationtck"/>
+
+ <replace file="${tck.home}/bin/xml/ts.top.import.xml">
+ <replacetoken><![CDATA[<jvmarg value="-Xmx512m"/>]]></replacetoken>
+ <replacevalue><![CDATA[<jvmarg value="-Xmx512m"/>
+ <jvmarg value="-Djavatest.security.noSecurityManager=true"/>]]></replacevalue>
+ </replace>
+
+ <replace file="${tck.home}/bin/xml/ts.top.import.xml" if:set="suspend-tck" >
+ <replacetoken><![CDATA[<jvmarg value="-Xmx512m"/>]]></replacetoken>
+ <replacevalue><![CDATA[<jvmarg value="-Xmx512m"/>
+ <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=9008"/>]]></replacevalue>
+ </replace>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>configure-tck-tests</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"
+ classpathref="maven.plugin.classpath" />
+ <limit maxwait="20">
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="start-domain"/>
+ </exec>
+ </limit>
+
+ <exec executable="${ant.home}/bin/ant" dir="${tck.home}/bin">
+ <arg value="config.vi" />
+ </exec>
+ <exec executable="${ant.home}/bin/ant" dir="${tck.home}/bin">
+ <arg value="enable.jaspic" />
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+
+
+ <execution>
+ <id>run-tck-tests</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"
+ classpathref="maven.plugin.classpath" />
+
+ <echo level="info" message="Start running all tests" />
+ <exec executable="${ant.home}/bin/ant" dir="${tck.home}/bin" resultproperty="testResult">
+ <arg value="-Dmultiple.tests=${run.test}" if:set="run.test" />
+ <arg value="run.all"/>
+ <env key="LC_ALL" value="C" />
+ </exec>
+
+ <if>
+ <not>
+ <equals arg1="${testResult}" arg2="0" />
+ </not>
+ <then>
+ <echo message="Running tests failed." />
+ <loadfile property="contents" srcFile="${glassfish.home}/glassfish/domains/domain1/logs/server.log" />
+ <echo message="${contents}" />
+ </then>
+ </if>
+
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="stop-domain" />
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/appserver/tests/tck/authorization/pom.xml b/appserver/tests/tck/authorization/pom.xml
index a921b58..53a2bbf 100644
--- a/appserver/tests/tck/authorization/pom.xml
+++ b/appserver/tests/tck/authorization/pom.xml
@@ -149,7 +149,7 @@
<id>prepare-tck-and-glassfish</id>
<phase>pre-integration-test</phase>
<configuration>
- <target>
+ <target xmlns:if="ant:if" xmlns:unless="ant:unless">
<taskdef resource="net/sf/antcontrib/antcontrib.properties"
classpathref="maven.plugin.classpath" />
@@ -225,6 +225,18 @@
</limit>
<mkdir dir="${tck.home}/jacctckreport"/>
<mkdir dir="${tck.home}/jacctckreport/jacctck"/>
+
+ <replace file="${tck.home}/bin/xml/ts.top.import.xml">
+ <replacetoken><![CDATA[<jvmarg value="-Xmx512m"/>]]></replacetoken>
+ <replacevalue><![CDATA[<jvmarg value="-Xmx512m"/>
+ <jvmarg value="-Djavatest.security.noSecurityManager=true"/>]]></replacevalue>
+ </replace>
+
+ <replace file="${tck.home}/bin/xml/ts.top.import.xml" if:set="suspend-tck" >
+ <replacetoken><![CDATA[<jvmarg value="-Xmx512m"/>]]></replacetoken>
+ <replacevalue><![CDATA[<jvmarg value="-Xmx512m"/>
+ <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=9008"/>]]></replacevalue>
+ </replace>
</target>
</configuration>
<goals>
@@ -266,13 +278,13 @@
<goal>run</goal>
</goals>
<configuration>
- <target>
+ <target xmlns:if="ant:if" xmlns:unless="ant:unless">
<taskdef resource="net/sf/antcontrib/antcontrib.properties"
classpathref="maven.plugin.classpath" />
<echo level="info" message="Start running all tests" />
- <exec executable="${ant.home}/bin/ant"
- dir="${tck.tests.home}" resultproperty="testResult">
+ <exec executable="${ant.home}/bin/ant" dir="${tck.tests.home}" resultproperty="testResult">
+ <arg value="-Dmultiple.tests=${run.test}" if:set="run.test" />
<arg value="deploy"/>
<arg value="run.all"/>
<env key="LC_ALL" value="C" />
diff --git a/appserver/tests/tck/faces/pom.xml b/appserver/tests/tck/faces/pom.xml
new file mode 100644
index 0000000..3f74ef1
--- /dev/null
+++ b/appserver/tests/tck/faces/pom.xml
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.glassfish.main.tests.tck</groupId>
+ <artifactId>tck</artifactId>
+ <version>6.2.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>glassfish-external-tck-faces</artifactId>
+ <packaging>pom</packaging>
+
+ <name>TCK: Faces</name>
+
+ <properties>
+ <ant.home>${project.build.directory}/apache-ant-${ant.version}</ant.home>
+ <ant.zip.url>https://archive.apache.org/dist/ant/binaries/apache-ant-${ant.version}-bin.zip</ant.zip.url>
+
+ <tck.home>${project.build.directory}/faces-tck</tck.home>
+ <tck.tests.home>${tck.home}/src/com/sun/ts/tests/jsf</tck.tests.home>
+
+ <glassfish.home>${project.build.directory}/glassfish6</glassfish.home>
+ <glassfish.version>${project.version}</glassfish.version>
+ <glassfish.asadmin>${glassfish.home}/glassfish/bin/asadmin</glassfish.asadmin>
+
+ <jacoco.includes>org/glassfish/**\:com/sun/enterprise/**</jacoco.includes>
+
+ <port.admin>14848</port.admin>
+ <port.derby>11527</port.derby>
+ <port.http>18080</port.http>
+ <port.https>18181</port.https>
+ <port.jms>17676</port.jms>
+ <port.jmx>18686</port.jmx>
+ <port.orb>13700</port.orb>
+ <port.orb.mutual>13920</port.orb.mutual>
+ <port.orb.ssl>13820</port.orb.ssl>
+ <port.harness.log>12000</port.harness.log>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.main.distributions</groupId>
+ <artifactId>glassfish</artifactId>
+ <version>${glassfish.version}</version>
+ <type>zip</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.tests.tck</groupId>
+ <artifactId>jakarta-faces-tck</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>download-ant</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <skip>${skipITs}</skip>
+ <url>${ant.zip.url}</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <skip>${skipITs}</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>unpack-glassfish</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>glassfish</includeArtifactIds>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ <!--
+ <execution>
+ <id>unpack-tck</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>jakarta-faces-tck</includeArtifactIds>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ -->
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <skip>${skipITs}</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>prepare-tck-and-glassfish</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"
+ classpathref="maven.plugin.classpath" />
+
+ <macrodef name="tck-setting">
+ <attribute name="key" /> <attribute name="value" />
+ <sequential>
+ <replaceregexp file="${tck.home}/bin/ts.jte" byline="true"
+ match="@{key}=.*" replace="@{key}=@{value}" />
+ </sequential>
+ </macrodef>
+
+ <!-- Change configuration -->
+ <copy file="${tck.home}/bin/ts.jte.jdk11" tofile="${tck.home}/bin/ts.jte" overwrite="true" />
+
+ <tck-setting key="webServerHost" value="localhost"/>
+ <tck-setting key="webServerPort" value="${port.http}"/>
+ <tck-setting key="securedWebServicePort" value="${port.https}"/>
+ <tck-setting key="s1as.admin.port" value="${port.admin}"/>
+ <tck-setting key="glassfish.admin.port" value="${port.admin}"/>
+ <tck-setting key="orb.port" value="${port.orb}"/>
+ <tck-setting key="database.port" value="${port.derby}"/>
+ <tck-setting key="harness.log.port" value="${port.harness.log}"/>
+
+ <tck-setting key="report.dir" value="${tck.home}/facesreport/faces"/>
+ <tck-setting key="work.dir" value="${tck.home}/faceswork/faces"/>
+
+ <tck-setting key="webServerHome" value="${glassfish.home}/glassfish"/>
+
+ <replaceregexp file="${tck.home}/bin/ts.jte" byline="true"
+ match="webServerHome=/ri/glassfish3/glassfish" replace="webServerHome=${glassfish.home}/glassfish" />
+
+
+ <tck-setting key="impl.vi" value="glassfish"/>
+ <tck-setting key="impl.vi.deploy.dir" value="${webServerHome}/domains/domain1/autodeploy"/>
+ <tck-setting key="impl.deploy.timeout.multiplier" value="960"/>
+
+ <tck-setting key="jsf.classes" value="${webServerHome}/modules/cdi-api.jar;${webServerHome}/modules/jakarta.servlet.jsp.jstl-api.jar;${webServerHome}/modules/jakarta.inject.jar;${webServerHome}/modules/jakarta.faces.jar;${webServerHome}/modules/jakarta.servlet.jsp-api.jar;${webServerHome}/modules/jakarta.servlet-api.jar;${webServerHome}/modules/jakarta.el.jar"/>
+
+ <limit maxwait="60">
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="delete-domain"/>
+ <arg value="domain1" />
+ </exec>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="create-domain"/>
+ <arg value="--domainproperties=domain.adminPort=${port.admin}:domain.instancePort=${port.http}:http.ssl.port=${port.https}:jms.port=${port.jms}:domain.jmxPort=${port.jmx}:orb.listener.port=${port.orb}:orb.ssl.port=${port.orb.ssl}:orb.mutualauth.port=${port.orb.mutual}" />
+ <arg value="--user=admin" />
+ <arg value="--nopassword" />
+ <arg value="domain1" />
+ </exec>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="start-domain"/>
+ </exec>
+
+ <if>
+ <isset property="jacoco.version" />
+ <then>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="create-jvm-options" />
+ <arg value="--port=${port.admin}" />
+ <arg value=""-javaagent\:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco-it.exec,includes=${jacoco.includes}"" />
+ </exec>
+ </then>
+ </if>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="stop-domain"/>
+ <arg value="domain1"/>
+ </exec>
+ </limit>
+ <mkdir dir="${tck.home}/facesreport"/>
+ <mkdir dir="${tck.home}/facesreport/faces"/>
+
+ <replace file="${tck.home}/bin/xml/ts.top.import.xml">
+ <replacetoken><![CDATA[<jvmarg value="-Xmx512m" />]]></replacetoken>
+ <replacevalue><![CDATA[<jvmarg value="-Xmx512m" />
+ <jvmarg value="-Djavatest.security.noSecurityManager=true"/>]]></replacevalue>
+ </replace>
+
+ <replace file="${tck.home}/bin/xml/ts.top.import.xml" if:set="suspend-tck" >
+ <replacetoken><![CDATA[<jvmarg value="-Xmx512m" />]]></replacetoken>
+ <replacevalue><![CDATA[<jvmarg value="-Xmx512m" />
+ <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=9008"/>]]></replacevalue>
+ </replace>
+
+
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>configure-tck-tests</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"
+ classpathref="maven.plugin.classpath" />
+ <limit maxwait="20">
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="start-domain"/>
+ </exec>
+ </limit>
+
+ <exec executable="${ant.home}/bin/ant" dir="${tck.tests.home}">
+ <arg value="-Dutil.dir=${tck.home}" />
+ <arg value="deploy.all" />
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+
+
+ <execution>
+ <id>run-tck-tests</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"
+ classpathref="maven.plugin.classpath" />
+
+ <echo level="info" message="Start running all tests" unless:set="run.test"/>
+ <echo level="info" message="Start running single test" if:set="run.test"/>
+ <exec executable="${ant.home}/bin/ant" dir="${tck.tests.home}" resultproperty="testResult">
+ <arg value="-Dutil.dir=${tck.home}" />
+ <arg value="-Dmultiple.tests=${run.test}" if:set="run.test" />
+ <arg value="runclient"/>
+ <env key="LC_ALL" value="C" />
+ </exec>
+
+ <if>
+ <not>
+ <equals arg1="${testResult}" arg2="0" />
+ </not>
+ <then>
+ <echo message="Running tests failed." />
+ <loadfile property="contents" srcFile="${glassfish.home}/glassfish/domains/domain1/logs/server.log" />
+ <echo message="${contents}" />
+ </then>
+ </if>
+
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="stop-domain" />
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/appserver/tests/tck/pom.xml b/appserver/tests/tck/pom.xml
index fda64ca..65db0f2 100644
--- a/appserver/tests/tck/pom.xml
+++ b/appserver/tests/tck/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021 Contributors to the Eclipse Foundation. All rights reserved.
+ Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -51,4 +51,33 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>tck-all</id>
+ <modules>
+ <module>rest</module>
+ <module>faces</module>
+ <module>authentication</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>tck-rest</id>
+ <modules>
+ <module>rest</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>tck-faces</id>
+ <modules>
+ <module>faces</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>tck-authentication</id>
+ <modules>
+ <module>authentication</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
diff --git a/appserver/tests/tck/rest/pom.xml b/appserver/tests/tck/rest/pom.xml
new file mode 100644
index 0000000..96a5c8d
--- /dev/null
+++ b/appserver/tests/tck/rest/pom.xml
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.glassfish.main.tests.tck</groupId>
+ <artifactId>tck</artifactId>
+ <version>6.2.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>glassfish-external-tck-rest</artifactId>
+ <packaging>pom</packaging>
+
+ <name>TCK: REST</name>
+
+ <properties>
+ <ant.home>${project.build.directory}/apache-ant-${ant.version}</ant.home>
+ <ant.zip.url>https://archive.apache.org/dist/ant/binaries/apache-ant-${ant.version}-bin.zip</ant.zip.url>
+
+ <tck.home>${project.build.directory}/restful-ws-tck</tck.home>
+ <tck.tests.home>${tck.home}/src/com/sun/ts/tests</tck.tests.home>
+
+ <glassfish.home>${project.build.directory}/glassfish6</glassfish.home>
+ <glassfish.version>${project.version}</glassfish.version>
+ <glassfish.asadmin>${glassfish.home}/glassfish/bin/asadmin</glassfish.asadmin>
+
+ <jacoco.includes>org/glassfish/**\:com/sun/enterprise/**</jacoco.includes>
+
+ <port.admin>14848</port.admin>
+ <port.derby>11527</port.derby>
+ <port.http>18080</port.http>
+ <port.https>18181</port.https>
+ <port.jms>17676</port.jms>
+ <port.jmx>18686</port.jmx>
+ <port.orb>13700</port.orb>
+ <port.orb.mutual>13920</port.orb.mutual>
+ <port.orb.ssl>13820</port.orb.ssl>
+ <port.harness.log>12000</port.harness.log>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.main.distributions</groupId>
+ <artifactId>glassfish</artifactId>
+ <version>${glassfish.version}</version>
+ <type>zip</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.tests.tck</groupId>
+ <artifactId>jakarta-rest-tck</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>download-ant</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <skip>${skipITs}</skip>
+ <url>${ant.zip.url}</url>
+ <unpack>true</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <skip>${skipITs}</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>unpack-glassfish</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>glassfish</includeArtifactIds>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-tck</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>jakarta-rest-tck</includeArtifactIds>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <skip>${skipITs}</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>prepare-tck-and-glassfish</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"
+ classpathref="maven.plugin.classpath" />
+
+ <macrodef name="tck-setting">
+ <attribute name="key" /> <attribute name="value" />
+ <sequential>
+ <replaceregexp file="${tck.home}/bin/ts.jte" byline="true"
+ match="^@{key}=.*" replace="@{key}=@{value}" />
+ </sequential>
+ </macrodef>
+
+ <!-- Change configuration -->
+ <copy file="${tck.home}/bin/ts.jte.jdk11" tofile="${tck.home}/bin/ts.jte" overwrite="true" />
+
+ <tck-setting key="webServerHost" value="localhost"/>
+ <tck-setting key="webServerPort" value="${port.http}"/>
+ <tck-setting key="securedWebServicePort" value="${port.https}"/>
+ <tck-setting key="s1as.admin.port" value="${port.admin}"/>
+ <tck-setting key="glassfish.admin.port" value="${port.admin}"/>
+ <tck-setting key="orb.port" value="${port.orb}"/>
+ <tck-setting key="database.port" value="${port.derby}"/>
+ <tck-setting key="harness.log.port" value="${port.harness.log}"/>
+
+ <tck-setting key="report.dir" value="${tck.home}/restreport/rest"/>
+ <tck-setting key="work.dir" value="${tck.home}/restwork/rest"/>
+
+ <tck-setting key="web.home" value="${glassfish.home}/glassfish"/>
+ <tck-setting key="impl.vi" value="glassfish"/>
+ <tck-setting key="impl.vi.deploy.dir" value="${web.home}/domains/domain1/autodeploy"/>
+
+ <tck-setting key="jaxrs_impl_name" value="jersey"/>
+
+ <tck-setting key="jaxrs_impl.classes" value="${web.home}/modules/jakarta.json.jar:${web.home}/modules/jakarta.json.bind-api.jar:${web.home}/modules/jakarta.json.jar:${web.home}/modules/jsonp-jaxrs.jar:${web.home}/modules/jersey-client.jar:${web.home}/modules/jersey-common.jar:${web.home}/modules/jersey-server.jar:${web.home}/modules/jersey-container-servlet.jar:${web.home}/modules/jersey-container-servlet-core.jar:${web.home}/modules/jersey-media-jaxb.jar:${web.home}/modules/jersey-media-sse.jar:${web.home}/modules/jersey-hk2.jar:${web.home}/modules/osgi-resource-locator.jar:${web.home}/modules/jakarta.inject-api.jar:${web.home}/modules/guava.jar:${web.home}/modules/hk2-api.jar:${web.home}/modules/hk2-locator.jar:${web.home}/modules/hk2-utils.jar:${web.home}/modules/javassist.jar:${web.home}/modules/cglib.jar:${web.home}/modules/jakarta.annotation-api.jar:${web.home}/modules/jakarta.xml.bind-api.jar:${web.home}/modules/jakarta.activation.jar"/>
+ <tck-setting key="jaxrs_impl_lib" value="${web.home}/modules/jersey-container-servlet-core.jar"/>
+ <tck-setting key="jaxrs.classes" value="${web.home}/modules/jakarta.ws.rs-api.jar"/>
+ <tck-setting key="servlet_adaptor" value="org/glassfish/jersey/servlet/ServletContainer.class"/>
+ <tck-setting key="servlet.classes" value="${web.home}/modules/jakarta.servlet-api.jar"/>
+
+ <limit maxwait="60">
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="delete-domain"/>
+ <arg value="domain1" />
+ </exec>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="create-domain"/>
+ <arg value="--domainproperties=domain.adminPort=${port.admin}:domain.instancePort=${port.http}:http.ssl.port=${port.https}:jms.port=${port.jms}:domain.jmxPort=${port.jmx}:orb.listener.port=${port.orb}:orb.ssl.port=${port.orb.ssl}:orb.mutualauth.port=${port.orb.mutual}" />
+ <arg value="--user=admin" />
+ <arg value="--nopassword" />
+ <arg value="domain1" />
+ </exec>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="start-domain"/>
+ </exec>
+
+ <if>
+ <isset property="jacoco.version" />
+ <then>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="create-jvm-options" />
+ <arg value="--port=${port.admin}" />
+ <arg value=""-javaagent\:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco-it.exec,includes=${jacoco.includes}"" />
+ </exec>
+ </then>
+ </if>
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="stop-domain"/>
+ <arg value="domain1"/>
+ </exec>
+ </limit>
+ <mkdir dir="${tck.home}/resttckreport"/>
+ <mkdir dir="${tck.home}/resttckreport/resttck"/>
+
+ <replace file="${tck.home}/bin/xml/ts.top.import.xml">
+ <replacetoken><![CDATA[<jvmarg value="-Xmx512m"/>]]></replacetoken>
+ <replacevalue><![CDATA[<jvmarg value="-Xmx512m"/>
+ <jvmarg value="-Djavatest.security.noSecurityManager=true"/>]]></replacevalue>
+ </replace>
+
+ <replace file="${tck.home}/bin/xml/ts.top.import.xml" if:set="suspend-tck" >
+ <replacetoken><![CDATA[<jvmarg value="-Xmx512m"/>]]></replacetoken>
+ <replacevalue><![CDATA[<jvmarg value="-Xmx512m"/>
+ <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=9008"/>]]></replacevalue>
+ </replace>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>configure-tck-tests</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"
+ classpathref="maven.plugin.classpath" />
+ <limit maxwait="20">
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="start-domain"/>
+ </exec>
+ </limit>
+ <exec executable="${ant.home}/bin/ant" dir="${tck.home}/bin">
+ <arg value="config.vi" />
+ <env key="tck.home" value="${tck.home}"/>
+ <env key="TCK_KEYWORDS" value="jaxrs"/>
+ </exec>
+ <exec executable="${ant.home}/bin/ant" dir="${tck.home}/bin">
+ <arg value="deploy.all" />
+ <env key="tck.home" value="${tck.home}"/>
+ <env key="TCK_KEYWORDS" value="jaxrs"/>
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+
+
+ <execution>
+ <id>run-tck-tests</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"
+ classpathref="maven.plugin.classpath" />
+
+ <echo level="info" message="Start running all tests" />
+ <exec executable="${ant.home}/bin/ant" dir="${tck.tests.home}" resultproperty="testResult">
+ <arg value="-Dmultiple.tests=${run.test}" if:set="run.test" />
+ <arg value="runclient"/>
+ <arg value="-Dkeywords=jaxrs.all"/>
+ <env key="LC_ALL" value="C" />
+ </exec>
+
+ <if>
+ <not>
+ <equals arg1="${testResult}" arg2="0" />
+ </not>
+ <then>
+ <echo message="Running tests failed." />
+ <loadfile property="contents" srcFile="${glassfish.home}/glassfish/domains/domain1/logs/server.log" />
+ <echo message="${contents}" />
+ </then>
+ </if>
+
+ <exec executable="${glassfish.asadmin}" dir="${glassfish.home}/glassfish/bin">
+ <arg value="stop-domain" />
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml
new file mode 100644
index 0000000..3de3af2
--- /dev/null
+++ b/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.glassfish.main.tests.tck</groupId>
+ <artifactId>tck-download</artifactId>
+ <version>6.2.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jakarta-authentication-tck</artifactId>
+ <packaging>pom</packaging>
+ <name>TCK: Install Jakarta Authentication TCK</name>
+
+ <properties>
+ <tck.test.authentication.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/jakarta-authentication-tck-2.0.1.zip</tck.test.authentication.url>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>download-authentication-tck</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <url>${tck.test.authentication.url}</url>
+ <unpack>false</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-authentication-tck</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <file>${project.build.directory}/jakarta-authentication-tck-2.0.1.zip</file>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <packaging>zip</packaging>
+ <generatePom>true</generatePom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml
new file mode 100644
index 0000000..f59e677
--- /dev/null
+++ b/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.glassfish.main.tests.tck</groupId>
+ <artifactId>tck-download</artifactId>
+ <version>6.2.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jakarta-faces-tck</artifactId>
+ <packaging>pom</packaging>
+ <name>TCK: Install Jakarta Faces TCK</name>
+
+ <properties>
+ <tck.test.faces.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/jakarta-faces-tck-3.0.1.zip</tck.test.faces.url>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>download-faces-tck</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <url>${tck.test.faces.url}</url>
+ <unpack>false</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-authorization-tck</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <file>${project.build.directory}/jakarta-faces-tck-3.0.1.zip</file>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <packaging>zip</packaging>
+ <generatePom>true</generatePom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml
new file mode 100644
index 0000000..1318673
--- /dev/null
+++ b/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.glassfish.main.tests.tck</groupId>
+ <artifactId>tck-download</artifactId>
+ <version>6.2.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jakarta-rest-tck</artifactId>
+ <packaging>pom</packaging>
+ <name>TCK: Install Jakarta REST TCK</name>
+
+ <properties>
+ <tck.test.rest.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/jakarta-restful-ws-tck-3.0.2.zip</tck.test.rest.url>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>download-rest-tck</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <url>${tck.test.rest.url}</url>
+ <unpack>false</unpack>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-authorization-tck</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>install-file</goal>
+ </goals>
+ <configuration>
+ <file>${project.build.directory}/jakarta-restful-ws-tck-3.0.2.zip</file>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <packaging>zip</packaging>
+ <generatePom>true</generatePom>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/appserver/tests/tck/tck-download/pom.xml b/appserver/tests/tck/tck-download/pom.xml
index 89a962a..c698bec 100644
--- a/appserver/tests/tck/tck-download/pom.xml
+++ b/appserver/tests/tck/tck-download/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021 Contributors to the Eclipse Foundation. All rights reserved.
+ Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -52,4 +52,33 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>tck-all</id>
+ <modules>
+ <module>jakarta-rest-tck</module>
+ <module>jakarta-faces-tck</module>
+ <module>jakarta-authentication-tck</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>tck-rest</id>
+ <modules>
+ <module>jakarta-rest-tck</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>tck-faces</id>
+ <modules>
+ <module>jakarta-faces-tck</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>tck-authentication</id>
+ <modules>
+ <module>jakarta-authentication-tck</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
diff --git a/appserver/web/jersey-ejb-component-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbClassUtilities.java b/appserver/web/jersey-ejb-component-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbClassUtilities.java
index e0c4a9b..a4303ad 100644
--- a/appserver/web/jersey-ejb-component-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbClassUtilities.java
+++ b/appserver/web/jersey-ejb-component-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbClassUtilities.java
@@ -40,8 +40,8 @@
static List<Class<?>> getRemoteAndLocalIfaces(final Class<?> resourceClass) {
final List<Class<?>> allLocalOrRemoteIfaces = new LinkedList<>();
if (resourceClass.isAnnotationPresent(Remote.class)) {
- List<Class<?>> asList = Arrays.asList(resourceClass.getAnnotation(Remote.class).value());
- allLocalOrRemoteIfaces.addAll(asList);
+ List<Class<?>> list = Arrays.asList(resourceClass.getAnnotation(Remote.class).value());
+ allLocalOrRemoteIfaces.addAll(list);
}
if (resourceClass.isAnnotationPresent(Local.class)) {
List<Class<?>> list = Arrays.asList(resourceClass.getAnnotation(Local.class).value());
diff --git a/appserver/web/jersey-ejb-component-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbComponentProvider.java b/appserver/web/jersey-ejb-component-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbComponentProvider.java
index 6ac90c0..285cf44 100644
--- a/appserver/web/jersey-ejb-component-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbComponentProvider.java
+++ b/appserver/web/jersey-ejb-component-provider/src/main/java/org/glassfish/jersey/gf/ejb/internal/EjbComponentProvider.java
@@ -269,7 +269,7 @@
@Override
protected void configure() {
- bind(EjbExceptionMapper.class).to(ExceptionMapper.class).in(Singleton.class);
+ bind(EjbExceptionMapper.class).to(ExceptionMapper.class).in(jakarta.inject.Singleton.class);
}
}
}
diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/JSSESupport.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/JSSESupport.java
index c2052f7..88142a2 100644
--- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/JSSESupport.java
+++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/JSSESupport.java
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
* Copyright (c) 2007-2018 Oracle and/or its affiliates. All rights reserved.
* Copyright 2004 The Apache Software Foundation
*
@@ -19,35 +20,26 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
-import javax.security.cert.X509Certificate;
import org.glassfish.grizzly.Grizzly;
import org.glassfish.grizzly.ssl.SSLSupport;
-/* JSSESupport
-
- Concrete implementation class for JSSE
- Support classes.
-
- This will only work with JDK 1.2 and up since it
- depends on JDK 1.2's certificate support
-
- @author EKR
- @author Craig R. McClanahan
- Parts cribbed from JSSECertCompat
- Parts cribbed from CertificatesValve
+/**
+ * Concrete implementation class for JSSE Support classes.
+ *
+ * @author EKR
+ * @author Craig R. McClanahan
*/
-
class JSSESupport implements SSLSupport {
- /**
- * Default Logger.
- */
private final static Logger logger = Grizzly.logger(JSSESupport.class);
/**
@@ -55,7 +47,7 @@
* when using a cipher suite containing the specified cipher name. The
* underlying data came from the TLS Specification (RFC 2246), Appendix C.
*/
- private static final CipherData ciphers[] = {
+ private static final CipherData[] ciphers = {
new CipherData("_WITH_NULL_", 0),
new CipherData("_WITH_IDEA_CBC_", 128),
new CipherData("_WITH_RC2_CBC_40_", 40),
@@ -70,7 +62,6 @@
protected SSLSocket ssl;
- // START SJSAS 6439313
/**
* The SSLEngine used to support SSL over NIO.
*/
@@ -81,130 +72,119 @@
* The SSLSession contains SSL information.
*/
protected SSLSession session;
- // END SJSAS 6439313
- JSSESupport(SSLSocket sock){
- ssl=sock;
- // START SJSAS 6439313
+ JSSESupport(SSLSocket sock) {
+ ssl = sock;
session = ssl.getSession();
- // END SJSAS 6439313
}
- // START SJSAS 6439313
- JSSESupport(SSLEngine sslEngine){
+
+ JSSESupport(SSLEngine sslEngine) {
this.sslEngine = sslEngine;
session = sslEngine.getSession();
}
- // END SJSAS 6439313
+
+ @Override
public String getCipherSuite() throws IOException {
- // Look up the current SSLSession
- /* SJSAS 6439313
- SSLSession session = ssl.getSession();
- */
- if (session == null)
+ if (session == null) {
return null;
+ }
return session.getCipherSuite();
}
- public Object[] getPeerCertificateChain()
- throws IOException {
+
+ @Override
+ public Object[] getPeerCertificateChain() throws IOException {
return getPeerCertificateChain(false);
}
- protected java.security.cert.X509Certificate []
- getX509Certificates(SSLSession session) throws IOException {
- X509Certificate jsseCerts[] = null;
- try{
- jsseCerts = session.getPeerCertificateChain();
- } catch (Throwable ex){
+
+ protected Certificate[] getX509Certificates(SSLSession session) throws IOException {
+ Certificate[] jsseCerts = null;
+ try {
+ jsseCerts = session.getPeerCertificates();
+ } catch (Throwable ex) {
// Get rid of the warning in the logs when no Client-Cert is
// available
}
- if(jsseCerts == null)
+ if (jsseCerts == null) {
jsseCerts = new X509Certificate[0];
- java.security.cert.X509Certificate [] x509Certs =
- new java.security.cert.X509Certificate[jsseCerts.length];
+ }
+ X509Certificate[] x509Certs = new X509Certificate[jsseCerts.length];
for (int i = 0; i < x509Certs.length; i++) {
try {
byte buffer[] = jsseCerts[i].getEncoded();
- CertificateFactory cf =
- CertificateFactory.getInstance("X.509");
- ByteArrayInputStream stream =
- new ByteArrayInputStream(buffer);
- x509Certs[i] = (java.security.cert.X509Certificate)
- cf.generateCertificate(stream);
- if(logger.isLoggable(Level.FINEST))
- logger.log(Level.FINE,"Cert #" + i + " = " + x509Certs[i]);
- } catch(Exception ex) {
- logger.log(Level.SEVERE,"Error translating " + jsseCerts[i], ex);
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ ByteArrayInputStream stream = new ByteArrayInputStream(buffer);
+ x509Certs[i] = (X509Certificate) cf.generateCertificate(stream);
+ if (logger.isLoggable(Level.FINEST)) {
+ logger.log(Level.FINE, "Cert #" + i + " = " + x509Certs[i]);
+ }
+ } catch (Exception ex) {
+ logger.log(Level.SEVERE, "Error translating " + jsseCerts[i], ex);
return null;
}
}
- if ( x509Certs.length < 1 )
+ if (x509Certs.length < 1) {
return null;
+ }
return x509Certs;
}
- public Object[] getPeerCertificateChain(boolean force)
- throws IOException {
- // Look up the current SSLSession
- /* SJSAS 6439313
- SSLSession session = ssl.getSession();
- */
- if (session == null)
+
+
+ @Override
+ public Object[] getPeerCertificateChain(boolean force) throws IOException {
+ if (session == null) {
return null;
+ }
// Convert JSSE's certificate format to the ones we need
- X509Certificate [] jsseCerts = null;
+ Certificate[] jsseCerts = null;
try {
- jsseCerts = session.getPeerCertificateChain();
- } catch(Exception bex) {
+ jsseCerts = session.getPeerCertificates();
+ } catch (Exception bex) {
// ignore.
}
- if (jsseCerts == null)
+ if (jsseCerts == null) {
jsseCerts = new X509Certificate[0];
- if(jsseCerts.length <= 0 && force) {
+ }
+ if (jsseCerts.length <= 0 && force) {
session.invalidate();
handShake();
- /* SJSAS 6439313
- session = ssl.getSession();
- */
- // START SJSAS 6439313
- if ( ssl == null)
+ if (ssl == null) {
session = sslEngine.getSession();
- else
+ } else {
session = ssl.getSession();
- // END SJSAS 6439313
+ }
}
return getX509Certificates(session);
}
+
protected void handShake() throws IOException {
ssl.setNeedClientAuth(true);
ssl.startHandshake();
}
+
+
/**
* Copied from <code>org.apache.catalina.valves.CertificateValve</code>
*/
- public Integer getKeySize()
- throws IOException {
- // Look up the current SSLSession
- /* SJSAS 6439313
- SSLSession session = ssl.getSession();
- */
- SSLSupport.CipherData c_aux[]=ciphers;
- if (session == null)
+ @Override
+ public Integer getKeySize() throws IOException {
+ if (session == null) {
return null;
+ }
Integer keySize = (Integer) session.getValue(KEY_SIZE_KEY);
if (keySize == null) {
int size = 0;
String cipherSuite = session.getCipherSuite();
-
- for (int i = 0; i < c_aux.length; i++) {
- if (cipherSuite.indexOf(c_aux[i].phrase) >= 0) {
- size = c_aux[i].keySize;
+ for (CipherData element : ciphers) {
+ if (cipherSuite.indexOf(element.phrase) >= 0) {
+ size = element.keySize;
break;
}
}
@@ -214,28 +194,28 @@
return keySize;
}
- public String getSessionId()
- throws IOException {
- // Look up the current SSLSession
- /* SJSAS 6439313
- SSLSession session = ssl.getSession();
- */
- if (session == null)
+
+ @Override
+ public String getSessionId() throws IOException {
+ if (session == null) {
return null;
+ }
// Expose ssl_session (getId)
- byte [] ssl_session = session.getId();
- if ( ssl_session == null)
+ byte[] ssl_session = session.getId();
+ if (ssl_session == null) {
return null;
- StringBuilder buf=new StringBuilder("");
- for(int x=0; x<ssl_session.length; x++) {
- String digit=Integer.toHexString((int)ssl_session[x]);
- if (digit.length()<2) buf.append('0');
- if (digit.length()>2) digit=digit.substring(digit.length()-2);
+ }
+ StringBuilder buf = new StringBuilder(32);
+ for (byte element : ssl_session) {
+ String digit = Integer.toHexString(element);
+ if (digit.length() < 2) {
+ buf.append('0');
+ }
+ if (digit.length() > 2) {
+ digit = digit.substring(digit.length() - 2);
+ }
buf.append(digit);
}
return buf.toString();
}
-
-
}
-
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index 7e9e1ec..dea9fab 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
+ Copyright (c) 2021, 2022 Contributors to the Eclipse Foundation
Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
@@ -99,7 +99,7 @@
<!-- Jakarta Inject -->
<jakarta.inject-api.version>2.0.1.MR</jakarta.inject-api.version>
- <!-- Jakarta XML Binding -->
+ <!-- Jakarta XML Binding -->
<jakarta.xml.bind-api.version>4.0.0-RC3</jakarta.xml.bind-api.version>
<jakarta.jaxb-impl.version>4.0.0-M2</jakarta.jaxb-impl.version>
@@ -366,6 +366,12 @@
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
@@ -1024,7 +1030,7 @@
</execution>
</executions>
</plugin>
-
+
<!-- Add the license and the notice file to every module -->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLSupport.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLSupport.java
index b89d7bf..16d5581 100644
--- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLSupport.java
+++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/ssl/GlassfishSSLSupport.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2010, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,21 +17,22 @@
package com.sun.enterprise.security.ssl;
+import com.sun.enterprise.security.SecurityLoggerInfo;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
-import javax.security.cert.X509Certificate;
import org.glassfish.grizzly.ssl.SSLSupport;
-import com.sun.enterprise.security.SecurityLoggerInfo;
-
/**
*
* @author Sudarsan Sridhar
@@ -84,8 +86,8 @@
if (session == null) {
return null;
}
- X509Certificate[] certs = null;
- certs = session.getPeerCertificateChain();
+ Certificate[] certs = null;
+ certs = session.getPeerCertificates();
if (certs == null) {
certs = new X509Certificate[0];
}
@@ -151,9 +153,9 @@
}
private Object[] getX509Certs() {
- X509Certificate certs[] = null;
+ Certificate[] certs = null;
try {
- certs = session.getPeerCertificateChain();
+ certs = session.getPeerCertificates();
} catch (Throwable ex) {
// Get rid of the warning in the logs when no Client-Cert is
// available
@@ -162,13 +164,13 @@
if (certs == null) {
certs = new X509Certificate[0];
}
- java.security.cert.X509Certificate[] x509Certs = new java.security.cert.X509Certificate[certs.length];
+ X509Certificate[] x509Certs = new X509Certificate[certs.length];
for (int i = 0; i < x509Certs.length; i++) {
try {
byte buffer[] = certs[i].getEncoded();
CertificateFactory cf = CertificateFactory.getInstance("X.509");
ByteArrayInputStream stream = new ByteArrayInputStream(buffer);
- x509Certs[i] = (java.security.cert.X509Certificate) cf.generateCertificate(stream);
+ x509Certs[i] = (X509Certificate) cf.generateCertificate(stream);
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINE, "Cert #{0} = {1}", new Object[] { i, x509Certs[i] });
}
