Skip to content

Commit

Permalink
Update Websocket TCK doc to refer to Jakarta EE 10, GlassFish 7.0
Browse files Browse the repository at this point in the history
Signed-off-by: Scott Marlow <smarlow@redhat.com>
  • Loading branch information
scottmarlow committed Apr 5, 2022
1 parent aec034e commit 7ff4155
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
18 changes: 9 additions & 9 deletions user_guides/websocket/src/main/jbake/content/config.inc
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////

Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2020, 2022 Oracle and/or its affiliates. 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 Down Expand Up @@ -119,17 +119,17 @@ ${pathsep}${web.home}/modules/tyrus-spi.jar
This property is required for the TCK Ant targets.
i. `impl.vi` to the name of the Vendor implementation. +
This property is used for identifying the deployment handler. +
Set this property to `glassfish` for the Jakarta EE 9 CI (Eclipse GlassFish 6.0) full-, or web-profile CI.
Set this property to `glassfish` for the Jakarta EE 10 CI (Eclipse GlassFish 7.0) full-, or web-profile CI.
j. `impl.vi.deploy.dir` to the Vendor implementation deployment
directory. +
Set this property to `${web.home}/domains/domain1/autodeploy` for the
CI (Eclipse GlassFish 6.0) full-, or web-profile CI.
CI (Eclipse GlassFish 7.0) full-, or web-profile CI.
+
3. Add permissions from the file `<TS_HOME>/bin/server_policy.append`
to the Java policy file or files on your Jakarta EE 9 server. +
In case of Jakarta EE 9 CI (Eclipse GlassFish 6.0), add permissions that are not already defined to
to the Java policy file or files on your Jakarta EE 10 server. +
In case of Jakarta EE 10 CI (Eclipse GlassFish 7.0), add permissions that are not already defined to
the file $\{web.home}`/domains/domain1/config/server.policy`, where
$\{web.home} is the location of your installation of the Jakarta EE 9 CI (Eclipse GlassFish 6.0).
$\{web.home} is the location of your installation of the Jakarta EE 10 CI (Eclipse GlassFish 7.0).
4. When creating CI-specific application server settings, it is
recommended that you create a configuring file named `config.vi.xml`
under `$TS_HOME/bin/xml/${impl_vi}`. +
Expand Down Expand Up @@ -261,14 +261,14 @@ ${pathsep}${web.home}/modules/tyrus-spi.jar
This property is required for the TCK Ant targets.
i. `impl.vi` to the name of the Vendor implementation. +
This property is used for identifying the deployment handler. +
Set this property to `glassfish` for the Jakarta EE 9 VI (Eclipse GlassFish 6.0) full-, or web-profile VI.
Set this property to `glassfish` for the Jakarta EE 10 VI (Eclipse GlassFish 7.0) full-, or web-profile VI.
j. `impl.vi.deploy.dir` to the Vendor implementation deployment
directory. +
Set this property to `${web.home}/domains/domain1/autodeploy` for the
VI (Eclipse GlassFish 6.0) full-, or web-profile VI.
VI (Eclipse GlassFish 7.0) full-, or web-profile VI.
+
3. Add permissions from the file `<TS_HOME>/bin/server_policy.append`
to the Java policy file or files on your Jakarta EE 9 server.
to the Java policy file or files on your Jakarta EE 10 server.
4. When creating VI-specific application server settings, it is
recommended that you create a configuring file named `config.vi.xml`
under `$TS_HOME/bin/xml/${impl_vi}`. +
Expand Down
@@ -1,11 +1,11 @@
. Install the Jakarta EE 9 CI software (the servlet Web container used
. Install the Jakarta EE 10 CI software (the servlet Web container used
for running the {TechnologyShortName} TCK with the
{TechnologyShortName} {TechnologyVersion} CI), if it is not already
installed. +
Download and install the Servlet Web container with the
{TechnologyShortName} {TechnologyVersion} CI used for running the
{TechnologyShortName} TCK {TechnologyVersion}, represented by the Jakarta
EE 9 CI.
EE 10 CI.
If you intend to use {TechnologyRI}, you may obtain this software via the
downloads tab from the project website: {TechnologyRIURL}.

6 changes: 3 additions & 3 deletions user_guides/websocket/src/main/jbake/content/rebuild.inc
Expand Up @@ -23,7 +23,7 @@ published in a Java SE environment are located under
`$TS_HOME/classes`.

The {TechnologyShortName} TCK comes with prebuilt test WAR files for
deployment on Jakarta EE 9 RI , which provides a Servlet–compliant Web
deployment on Jakarta EE 10 RI , which provides a Servlet–compliant Web
container. The WAR files are {TechnologyRI}-specific, with {TechnologyRI}'s servlet
class and {TechnologyRI}'s servlet defined in the `web.xml` deployment
descriptor. To run the TCK tests against the VI in a Servlet–compliant
Expand All @@ -50,7 +50,7 @@ B.1 Overview

The set of prebuilt archives and classes that ship with the
{TechnologyShortName} TCK were built using the Reference
Implementation, and must be deployed on Jakarta EE 9 RI and run against
Implementation, and must be deployed on Jakarta EE 10 RI and run against
the {TechnologyRI} RI.

The prebuilt {TechnologyRI}-specific Servlet–compliant WAR files are located
Expand Down Expand Up @@ -147,7 +147,7 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
----

The {TechnologyShortName} TCK provides a tool,
`${ts.home}/bin/xml/impl/glassfish/jersey.xml`, for the Jakarta EE 9 RI
`${ts.home}/bin/xml/impl/glassfish/jersey.xml`, for the Jakarta EE 10 RI
that you can use as a model to help you create your own VI-specific Web
test application.

Expand Down
Expand Up @@ -8,4 +8,4 @@ below line can be removed.
This is used in intro.adoc in section 1.3 and install.adoc in section 3.2.
///////////////////////////////////////////////////////////////////////

* A Jakarta EE 9 CI (for example {TechnologyRI}) or, at a minimum, a Web server with a Servlet 4.0 container
* A Jakarta EE 10 CI (for example {TechnologyRI}) or, at a minimum, a Web server with a Servlet 6.0 container

0 comments on commit 7ff4155

Please sign in to comment.