Skip to content

Commit

Permalink
First pass at updating WebSocket 2.0 to 2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
markt-asf committed Feb 3, 2022
1 parent 25a5c3d commit a225b0e
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 22 deletions.
18 changes: 9 additions & 9 deletions install/websocket/docs/README.txt
@@ -1,16 +1,16 @@
Simple README file with instructions to quickly install, setup, configure,
and run the WebSocket TCK 2.0 and related software against the WebSocket 2.0 CI. For
more detailed instructions please refer to the WebSocket 2.0 Users Guide.
and run the WebSocket TCK 2.1 and related software against the WebSocket 2.1 CI. For
more detailed instructions please refer to the WebSocket 2.1 Users Guide.

-----------------------
Installing the Software
-----------------------
Before you can run the WebSocket TCK tests, you need to install
and set up the following software components:

1) Java SE 8
2) WebSocket CI Version 2.0
3) WebSocket TCK Version 2.0
1) Java 11
2) WebSocket CI Version 2.1
3) WebSocket TCK Version 2.1

1. Download and install Java SE 8 software.

Expand All @@ -19,13 +19,13 @@ and set up the following software components:
unzip <java-zip-bundle>


2. Download and install the WebSocket 2.0 Compatible Implementation/jarfile.
2. Download and install the WebSocket 2.1 Compatible Implementation/jarfile.

mkdir /ci
cd /ci


3. Download and install the WebSocket TCK 2.0 software.
3. Download and install the WebSocket TCK 2.1 software.

mkdir /tck
cd /tck
Expand Down Expand Up @@ -53,10 +53,10 @@ Setup and Configuration of the WebSocket TCK
------------------------------
Executing the WebSocket TCK Tests
------------------------------
At this point we are ready to run the WebSocket TCK tests against the WebSocket 2.0
At this point we are ready to run the WebSocket TCK tests against the WebSocket 2.1
Reference Implementation.

1. Start WebSocket 2.0 Reference Implementation:
1. Start WebSocket 2.1 Reference Implementation:

cd /ci/glassfish6/glassfish/bin
./asadmin start-domain
Expand Down
4 changes: 2 additions & 2 deletions release/tools/websocket.xml
@@ -1,6 +1,6 @@
<!--
Copyright (c) 2018, 2021 Oracle and/or its affiliates and others.
Copyright (c) 2018, 2022 Oracle and/or its affiliates and others.
All rights reserved.
This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -173,7 +173,7 @@
<copy todir="${deliverable.bundle.dir}/src/com/sun/ts/tests/signaturetest/signature-repository/"
includeEmptyDirs="no">
<fileset dir="${ts.home}/src/com/sun/ts/tests/signaturetest/signature-repository/"
includes="jakarta.websocket.sig_2.0*" />
includes="jakarta.websocket.sig_2.1*" />
</copy>

<!-- the com/sun/ts/lib file -->
Expand Down
7 changes: 4 additions & 3 deletions user_guides/websocket/pom.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2017, 2022 Oracle and/or its affiliates and others.
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
Expand All @@ -26,8 +27,8 @@
<groupId>org.glassfish</groupId>
<artifactId>tck_websocket</artifactId>
<packaging>pom</packaging>
<version>2.0.1</version>
<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta WebSocket for Jakarta EE, Release 2.0</name>
<version>2.1.0</version>
<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta WebSocket for Jakarta EE, Release 2.1</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion user_guides/websocket/src/main/jbake/assets/_config.yml
@@ -1,7 +1,7 @@
remote_theme: jakartaee/jekyll-theme-jakarta-ee

title: [tck_wsk_v1_1]
description: [Oracle Technology Compatibility Kit User's Guide for Java API for WebSocket 2.0 for Technology Licensees, Release 2.0]
description: [Eclipse Foundation Technology Compatibility Kit User's Guide for Java API for WebSocket 2.1 for Technology Licensees, Release 2.1.0]

# sidebar links url
links:
Expand Down
14 changes: 7 additions & 7 deletions user_guides/websocket/src/main/jbake/content/attributes.conf
@@ -1,12 +1,12 @@
:TechnologyFullName: Jakarta WebSocket
:TechnologyShortName: WebSocket
:LegacyAcronym: WebSocket
:TechnologyVersion: 2.0
:ReleaseDate: May 2021
:CopyrightDates: 2017, 2021
:TechnologyVersion: 2.1
:ReleaseDate: TBD 2022
:CopyrightDates: 2017, 2022
:TechnologyRI: Eclipse Tyrus 2.0
:TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.tyrus
:SpecificationURL: https://jakarta.ee/specifications/websocket/2.0/
:SpecificationURL: https://jakarta.ee/specifications/websocket/2.1/
:TCKInquiryList: mailto:jakartaee-tck-dev@eclipse.org[jakartaee-tck-dev@eclipse.org]
:SpecificationInquiryList: mailto:websocket-dev@eclipse.org[websocket-dev@eclipse.org]
:techID: WebSocket
Expand All @@ -22,13 +22,13 @@
// for the technology. Used in config.inc.
:TechnologyHomeEnv: WEBSOCKET_HOME
// Java SE version required.
:SEversion: 8 (1.8) or 11
:SEversion: 11
:AntVersion: 1.10.0+
:JakartaEEVersion: 9.1
:JakartaEEVersion: 10
:JavaTestVersion: 5.0
:jteFileName: <TS_HOME>/bin/ts.jte
:jtxFileName: <TS_HOME>/bin/ts.jtx
:TCKPackageName: jakarta-websocket-tck-2.0.1.zip
:TCKPackageName: jakarta-websocket-tck-2.1.0.zip
// Directory names used in examples in using.adoc.
:sigTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/signaturetest/websocket
:singleTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/websocket
Expand Down

0 comments on commit a225b0e

Please sign in to comment.