Skip to content

Commit

Permalink
websocket tck bundle, documentation and signature test.
Browse files Browse the repository at this point in the history 
Signed-off-by: Gurunandan Rao <[email protected]>
  • Loading branch information
@gurunrao
gurunrao committed Mar 7, 2024
1 parent 352be01 commit f7024fc
Show file tree
Hide file tree
Showing 963 changed files with 11,434 additions and 235 deletions.
8 changes: 4 additions & 4 deletions glassfish-runner/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@
</properties>

<repositories>
<repository>
<id>jakarta-snapshots</id>
<url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
</repository>
<repository>
<id>central</id>
<url>https://repo1.maven.org/maven2</url>
Expand All @@ -61,6 +57,10 @@
<id>jboss</id>
<url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
</repository>
<repository>
<id>jakarta-snapshots</id>
<url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
</repository>
</repositories>

<profiles>
Expand Down
198 changes: 28 additions & 170 deletions glassfish-runner/websocket-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,18 @@
-->
<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/maven-v4_0_0.xsd">
<groupId>jakarta</groupId>
<groupId>jakarta.tck</groupId>
<artifactId>glassfish.websocket-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.glassfish</groupId>
<artifactId>standalone-tck</artifactId>
<version>10.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
<tck.artifactId>jakarta.websocket-tck</tck.artifactId>
<tck.version>2.1.0</tck.version>
<tck.artifactId>websocket-tck-spec-tests</tck.artifactId>
<tck.version>2.2.0</tck.version>
<arquillian.core.version>1.7.0.Alpha10</arquillian.core.version>
<junit.jupiter.version>5.9.1</junit.jupiter.version>
<glassfish.container.version>8.0.0-M1</glassfish.container.version>
<glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
</properties>
<dependencyManagement>
<dependencies>
Expand All @@ -50,14 +47,19 @@
<version>${junit.jupiter.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>websocket-tck</artifactId>
<version>11.0.0-SNAPSHOT</version>
<groupId>${project.groupId}</groupId>
<artifactId>websocket-tck-common</artifactId>
<version>${tck.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>${tck.artifactId}</artifactId>
<version>${tck.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
Expand All @@ -81,6 +83,16 @@
<version>1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>signaturetest</artifactId>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>1.7</version>
</dependency>
</dependencies>
<profiles>
<profile>
Expand Down Expand Up @@ -125,155 +137,6 @@
</artifactItems>
</configuration>
</execution>

</executions>
</plugin>
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<executions>
<execution>
<id>StopDomain1</id>
<phase>pre-integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<arguments>
<argument>stop-domain</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>StartDomain1</id>
<phase>pre-integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<arguments>
<argument>start-domain</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>Enable Trace requests</id>
<phase>pre-integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<arguments>
<argument>set</argument>
<argument>server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>Delete User j2ee</id>
<phase>pre-integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<arguments>
<argument>--passwordfile</argument>
<argument>${project.basedir}/j2ee.pass</argument>
<argument>delete-file-user</argument>
<argument>j2ee</argument>
</arguments>
<successCodes>
<successCode>0</successCode>
<successCode>1</successCode>
</successCodes>
</configuration>
</execution>
<execution>
<id>Add User j2ee</id>
<phase>pre-integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<arguments>
<argument>--passwordfile</argument>
<argument>${project.basedir}/j2ee.pass</argument>
<argument>create-file-user</argument>
<argument>--groups</argument>
<argument>staff:mgr</argument>
<argument>j2ee</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>Delete User javajoe</id>
<phase>pre-integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<arguments>
<argument>--passwordfile</argument>
<argument>${project.basedir}/javajoe.pass</argument>
<argument>delete-file-user</argument>
<argument>javajoe</argument>
</arguments>
<successCodes>
<successCode>0</successCode>
<successCode>1</successCode>
</successCodes>
</configuration>
</execution>
<execution>
<id>Add User javajoe</id>
<phase>pre-integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<arguments>
<argument>--passwordfile</argument>
<argument>${project.basedir}/javajoe.pass</argument>
<argument>create-file-user</argument>
<argument>--groups</argument>
<argument>guest</argument>
<argument>javajoe</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>list users</id>
<phase>pre-integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<arguments>
<argument>list-file-users</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>StopDomain</id>
<phase>pre-integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin</executable>
<arguments>
<argument>stop-domain</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand All @@ -287,9 +150,6 @@
<goal>verify</goal>
</goals>
<configuration>
<excludes>
<exclude>**/platform/**</exclude>
</excludes>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.websocket-api.jar</additionalClasspathElement>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.websocket-client-api.jar</additionalClasspathElement>
Expand All @@ -306,18 +166,16 @@
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/tyrus-container-grizzly-client.jar</additionalClasspathElement>
<additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/tyrus-spi.jar</additionalClasspathElement>
</additionalClasspathElements>
<dependenciesToScan>jakarta.tck:websocket-tck</dependenciesToScan>
<dependenciesToScan>${project.groupId}:${tck.artifactId}</dependenciesToScan>
<systemPropertyVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
<glassfish.home>${project.build.directory}/${glassfish.toplevel.dir}</glassfish.home>
<ws_wait>5</ws_wait>
<lib.name>websockettck</lib.name>
<junit.log.traceflag>true</junit.log.traceflag>
<user>j2ee</user>
<password>j2ee</password>
<authuser>javajoe</authuser>
<authpassword>javajoe</authpassword>
<porting.ts.url.class.1>com.sun.ts.tests.websocket.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
<sigTestClasspath>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.websocket-api.jar:${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.websocket-client-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming</sigTestClasspath>
<jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
</systemPropertyVariables>
<environmentVariables>
<GLASSFISH_HOME>${project.build.directory}/${glassfish.toplevel.dir}</GLASSFISH_HOME>
Expand Down
1 change: 0 additions & 1 deletion user_guides/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<module>parent</module>
<module>platform</module>
<module>saaj</module>
<module>websocket</module>
</modules>

</project>
70 changes: 70 additions & 0 deletions websocket/common/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2021, 2024 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>jakarta.tck</groupId>
<artifactId>websocket-tck</artifactId>
<version>2.2.0</version>
</parent>
<artifactId>websocket-tck-common</artifactId>
<packaging>jar</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.map</include>
<include>**/*.txt</include>
<include>**/*.sig*</include>
</includes>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
</project>
0 .../tests/websocket/common/TCKExtension.java → .../tests/websocket/common/TCKExtension.java
View file
File renamed without changes.
0 ...nt/AnnotatedByteBufferClientEndpoint.java → ...nt/AnnotatedByteBufferClientEndpoint.java
View file
File renamed without changes.
0 ...ommon/client/AnnotatedClientEndpoint.java → ...ommon/client/AnnotatedClientEndpoint.java
View file
File renamed without changes.
0 ...client/AnnotatedStringClientEndpoint.java → ...client/AnnotatedStringClientEndpoint.java
View file
File renamed without changes.
0 ...t/common/client/ApacheRequestAdapter.java → ...t/common/client/ApacheRequestAdapter.java
View file
File renamed without changes.
0 .../common/client/ApacheResponseAdapter.java → .../common/client/ApacheResponseAdapter.java
View file
File renamed without changes.
0 ...n/client/BinaryAndTextClientEndpoint.java → ...n/client/BinaryAndTextClientEndpoint.java
View file
File renamed without changes.
0 ...mmon/client/ByteBufferClientEndpoint.java → ...mmon/client/ByteBufferClientEndpoint.java
View file
File renamed without changes.
0 ...bsocket/common/client/ClientEndpoint.java → ...bsocket/common/client/ClientEndpoint.java
View file
File renamed without changes.
0 ...ocket/common/client/EndpointCallback.java → ...ocket/common/client/EndpointCallback.java
View file
File renamed without changes.
0 ...et/common/client/SendMessageCallback.java → ...et/common/client/SendMessageCallback.java
View file
File renamed without changes.
0 ...t/common/client/StringClientEndpoint.java → ...t/common/client/StringClientEndpoint.java
View file
File renamed without changes.
0 ...ts/websocket/common/client/TextCaser.java → ...ts/websocket/common/client/TextCaser.java
View file
File renamed without changes.
0 .../common/client/WebSocketCommonClient.java → .../common/client/WebSocketCommonClient.java
View file
File renamed without changes.
0 ...cket/common/client/WebSocketTestCase.java → ...cket/common/client/WebSocketTestCase.java
View file
File renamed without changes.
0 .../sun/ts/tests/websocket/common/common.xml → .../sun/ts/tests/websocket/common/common.xml
View file
File renamed without changes.
0 ...ocket/common/impl/ClientConfigurator.java → ...ocket/common/impl/ClientConfigurator.java
View file
File renamed without changes.
0 .../websocket/common/impl/ExtensionImpl.java → .../websocket/common/impl/ExtensionImpl.java
View file
File renamed without changes.
0 ...t/common/impl/ExtensionParameterImpl.java → ...t/common/impl/ExtensionParameterImpl.java
View file
File renamed without changes.
0 ...socket/common/impl/StringPingMessage.java → ...socket/common/impl/StringPingMessage.java
View file
File renamed without changes.
0 ...socket/common/impl/StringPongMessage.java → ...socket/common/impl/StringPongMessage.java
View file
File renamed without changes.
0 ...ocket/common/impl/WaitingSendHandler.java → ...ocket/common/impl/WaitingSendHandler.java
View file
File renamed without changes.
0 ...ebsocket/common/io/StringInputStream.java → ...ebsocket/common/io/StringInputStream.java
View file
File renamed without changes.
0 ...sts/websocket/common/io/StringReader.java → ...sts/websocket/common/io/StringReader.java
View file
File renamed without changes.
0 ...bsocket/common/stringbean/StringBean.java → ...bsocket/common/stringbean/StringBean.java
View file
File renamed without changes.
0 ...n/stringbean/StringBeanBinaryDecoder.java → ...n/stringbean/StringBeanBinaryDecoder.java
View file
File renamed without changes.
0 ...n/stringbean/StringBeanBinaryEncoder.java → ...n/stringbean/StringBeanBinaryEncoder.java
View file
File renamed without changes.
0 ...ngbean/StringBeanBinaryStreamDecoder.java → ...ngbean/StringBeanBinaryStreamDecoder.java
View file
File renamed without changes.
0 ...ngbean/StringBeanBinaryStreamEncoder.java → ...ngbean/StringBeanBinaryStreamEncoder.java
View file
File renamed without changes.
0 .../stringbean/StringBeanClientEndpoint.java → .../stringbean/StringBeanClientEndpoint.java
View file
File renamed without changes.
0 ...mon/stringbean/StringBeanTextDecoder.java → ...mon/stringbean/StringBeanTextDecoder.java
View file
File renamed without changes.
0 ...mon/stringbean/StringBeanTextEncoder.java → ...mon/stringbean/StringBeanTextEncoder.java
View file
File renamed without changes.
0 ...ringbean/StringBeanTextStreamDecoder.java → ...ringbean/StringBeanTextStreamDecoder.java
View file
File renamed without changes.
0 ...ringbean/StringBeanTextStreamEncoder.java → ...ringbean/StringBeanTextStreamEncoder.java
View file
File renamed without changes.
0 ...websocket/common/util/BooleanDecoder.java → ...websocket/common/util/BooleanDecoder.java
View file
File renamed without changes.
0 ...websocket/common/util/BooleanEncoder.java → ...websocket/common/util/BooleanEncoder.java
View file
File renamed without changes.
0 ...ts/websocket/common/util/ByteDecoder.java → ...ts/websocket/common/util/ByteDecoder.java
View file
File renamed without changes.
0 ...s/websocket/common/util/ErrorEncoder.java → ...s/websocket/common/util/ErrorEncoder.java
View file
File renamed without changes.
0 ...s/tests/websocket/common/util/IOUtil.java → ...s/tests/websocket/common/util/IOUtil.java
View file
File renamed without changes.
0 ...bsocket/common/util/MessageValidator.java → ...bsocket/common/util/MessageValidator.java
View file
File renamed without changes.
0 ...ts/websocket/common/util/SessionUtil.java → ...ts/websocket/common/util/SessionUtil.java
View file
File renamed without changes.
0 ...sts/websocket/common/util/StringUtil.java → ...sts/websocket/common/util/StringUtil.java
View file
File renamed without changes.
Loading

0 comments on commit f7024fc

Please sign in to comment.