diff --git a/user_guides/connector/pom.xml b/user_guides/connector/pom.xml
index ba68cd7b0f..bb0a4c1b2d 100644
--- a/user_guides/connector/pom.xml
+++ b/user_guides/connector/pom.xml
@@ -1,7 +1,7 @@
- DRAFT
+
Jakarta-Connectors-TCK-Users-Guide.pdf
true
- scm:git:git@github.com:javaee/tck_jca_v1_7.git
+ scm:git:git@github.com:eclipse-ee4j/jakartaee-tck.git
diff --git a/user_guides/connector/src/main/jbake/assets/_config.yml b/user_guides/connector/src/main/jbake/assets/_config.yml
index 918f9bcc66..a243307383 100644
--- a/user_guides/connector/src/main/jbake/assets/_config.yml
+++ b/user_guides/connector/src/main/jbake/assets/_config.yml
@@ -1,14 +1,16 @@
remote_theme: jakartaee/jekyll-theme-jakarta-ee
-title: [tck_jca_v1_7]
-description: [Oracle Technology Compatibility Kit User's Guide for Java EE Connector Architecture 1.7 for Technology Licensees, Release 1.7]
+title: [tck_jca_v2_0]
+description: [Eclipse Technology Compatibility Kit User's Guide for Jakarta EE Connector 2.0 for
+ Technology
+ Licensees, Release 2.0]
# sidebar links url
links:
- source: https://github.com/javaee/tck_jca_v1_7
- download: https://github.com/javaee/tck_jca_v1_7/releases
+ source: https://github.com/eclipse-ee4j/jakartaee-tck
+ download: https://jakarta.ee/specifications/connectors/2.0/
#mailinglist: https://javaee.groups.io/g/tck_jca_v1_7
#javadocs:
- docs: https://javaee.github.io/tck_jca_v1_7
+ docs: https://jakarta.ee/specifications/connectors/2.0/apidocs/
#faq:
diff --git a/user_guides/connector/src/main/jbake/content/attributes.conf b/user_guides/connector/src/main/jbake/content/attributes.conf
index ead5f02687..43df7adf28 100644
--- a/user_guides/connector/src/main/jbake/content/attributes.conf
+++ b/user_guides/connector/src/main/jbake/content/attributes.conf
@@ -1,10 +1,10 @@
:TechnologyFullName: Jakarta Connectors
:TechnologyShortName: Connectors
:LegacyAcronym: JCA
-:TechnologyVersion: 1.7
-:TechnologyRI: Eclipse GlassFish 5.1
+:TechnologyVersion: 2.0
+:TechnologyRI: Eclipse GlassFish 6.0
:TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.glassfish
-:SpecificationURL: https://jakarta.ee/specifications/connectors/1.7/
+:SpecificationURL: https://jakarta.ee/specifications/connectors/2.0/
:TCKInquiryList: mailto:jakartaee-tck-dev@eclipse.org[jakartaee-tck-dev@eclipse.org]
:SpecificationInquiryList: mailto:jca-dev@eclipse.org[jca-dev@eclipse.org]
:techID: Connectors
diff --git a/user_guides/connector/src/main/jbake/content/config.inc b/user_guides/connector/src/main/jbake/content/config.inc
index 65082056b8..c64c06ef99 100644
--- a/user_guides/connector/src/main/jbake/content/config.inc
+++ b/user_guides/connector/src/main/jbake/content/config.inc
@@ -49,10 +49,10 @@ slashes as a path separator instead.
2. Edit your `/bin/ts.jte` file and set the following
environment variables:
a. Set the `webServerHost` property to the name of the host on which
- Jakarta EE 8 CI is running. +
+ Jakarta EE {JakartaEEVersion} CI is running. +
The default setting is `localhost`.
b. Set the `webServerPort` property to the port number of the host on
- which Jakarta EE 8 CI is running. +
+ which Jakarta EE {JakartaEEVersion} CI is running. +
The default setting is `8080`.
c. `connector.home` to the location where your {TechnologyShortName} runtime
implementation is installed.
@@ -132,30 +132,30 @@ slashes as a path separator instead.
Adapt the instructions above for your environment.
-[[GCRWX]][[deploying-the-jca-tck-tests]]
+[[GCRWX]][[deploying-the-connectors-tck-tests]]
-4.3 Deploying the JCA TCK Tests
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+4.3 Deploying the {TechnologyShortName} TCK Tests
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[[GJKVJ]][[extension-libraries]]
4.3.1 Extension Libraries
^^^^^^^^^^^^^^^^^^^^^^^^^
-The JCA 1.7 TCK RAR files are deployed simultaneously.
+The {TechnologyShortName} {TechnologyVersion} TCK RAR files are deployed simultaneously.
The manifest file in each RAR file
includes a reference to the whitebox extension library. The
`whitebox.jar` file is a shared library that must be deployed as a
separate entity that all the standalone RAR files can access. This
extension library is needed to address classloading issues.
-[[GJOUV]][[jca-1.7-tck-resource-adapter-files]]
+[[GJOUV]][[connectors-2.0-tck-resource-adapter-files]]
-4.3.1.1 JCA 1.7 TCK Resource Adapter Files
-++++++++++++++++++++++++++++++++++++++++++
+4.3.1.1 {TechnologyShortName} {TechnologyVersion} TCK Resource Adapter Files
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-The Resource Adapter (RAR) files that are used with the JCA 1.7 TCK
-differ from those that were used in earlier JCA TCK releases. The TCK no
+The Resource Adapter (RAR) files that are used with the {TechnologyShortName} {TechnologyVersion} TCK
+differ from those that were used in earlier {TechnologyShortName} TCK releases. The TCK no
longer includes the same common classes into every RAR file. Duplicate
common classes, such as `whitebox.jar`, have been removed from each RAR
file and are now handled as an Installed Library.
@@ -164,19 +164,19 @@ This was done to address the following compatibility issues:
* Portable use of Installed Libraries for specifying a resource
adapter's shared libraries +
-See section EE.8.2.2 of the Java EE 7 platform specification and section
-20.2.0.1 in the JCA 1.7 specification, which explicitly state that the
-resource adapter server may employ the library mechanisms in Java EE 7.
+See section EE.8.2.2 of the Jakarta EE {JakartaEEVersion} platform specification and section
+20.2.0.1 in the {TechnologyShortName} {TechnologyVersion} specification, which explicitly state that the
+resource adapter server may employ the library mechanisms in Jakarta EE {JakartaEEVersion}.
* Support application-based standalone connector accessibility +
-See section 20.2.0.4 of the JCA 1.7 specification, which uses the
+See section 20.2.0.4 of the {TechnologyShortName} {TechnologyVersion} specification, which uses the
classloading requirements listed in section 20.3 in the specification.
-[[GJOUR]][[jca-1.7-tck-resource-adapters-and-classloading]]
+[[GJOUR]][[connectors-2.0-tck-resource-adapters-and-classloading]]
-4.3.1.2 JCA 1.7 TCK Resource Adapters and Classloading
-++++++++++++++++++++++++++++++++++++++++++++++++++++++
+4.3.1.2 {TechnologyShortName} {TechnologyVersion} TCK Resource Adapters and Classloading
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-The JCA TCK 1.7 has scenarios in which multiple standalone RAR files
+The {TechnologyShortName} TCK {TechnologyVersion} has scenarios in which multiple standalone RAR files
that use the same shared library (for example, `whitebox.jar`) are
referenced from a TCK application component.
@@ -225,7 +225,7 @@ exception.
The portable way of solving the issues raised by this use case problem
scenario is to use installed libraries, as described in section EE.8.2.2
-in the Java EE 7 platform specification. If both RAR files (RAR1 and
+in the Jakarta EE {JakartaEEVersion} platform specification. If both RAR files (RAR1 and
RAR2) reference `whitebox.jar` as an installed library and the
application server can use a single classloader to load this common
dependency, there will be no type-related issues.
@@ -239,7 +239,7 @@ gets copied. Refer to specific instructions for other CIs.
4.3.1.4 Required Porting Package
++++++++++++++++++++++++++++++++
-The JCA 1.7 TCK treats the `whitebox.jar` dependency as an Installed
+The {TechnologyShortName} {TechnologyVersion} TCK treats the `whitebox.jar` dependency as an Installed
Library dependency instead of bundling the dependency (or dependencies)
with every RAR file. Each RAR file now contains a reference to the
`whitebox.jar` file through its Manifest files Extension-List attribute.
@@ -255,13 +255,13 @@ that mechanism does not allow the `whitebox.jar` file to support its
dependencies on the Jakarta EE APIs. For this reason, the Installed Library
must support access to the Jakarta EE APIs.
-See section EE.8.2.2 in the Java EE 7 platform specification for
+See section EE.8.2.2 in the Jakarta EE {JakartaEEVersion} platform specification for
information about the reference implementation's support for Installed
libraries. However, note that this section does not recommend a
mechanism that a deployer can use to provide Installed Libraries in a
portable manner.
-The JCA TCK tests should only be deployed after you properly configure
+The {TechnologyShortName} TCK tests should only be deployed after you properly configure
your connector runtime. This configuration includes creating users and
JVM options in the runtime, mapping RA users to existing runtime users,
deploying RAs, and creating connection pools and connection resources.
@@ -305,13 +305,13 @@ the application server's `domains/domain1/lib/applibs` directory, a
location where it can be loaded by the server and can be accessed by all
the RAR files.
-To deploy the {TechnologyShortName} TCK tests to the Jakarta EE 8 platform, perform the
+To deploy the {TechnologyShortName} TCK tests to the Jakarta EE {JakartaEEVersion} platform, perform the
following steps.
-[[GCRWU]][[to-configure-and-deploy-the-jca-tck-tests-on-the-java-ee-7-web-profile-ri]]
+[[GCRWU]][[to-configure-and-deploy-the-connectors-tck-tests-on-the-jakarta-ee-8-web-profile-ri]]
-4.3.2 To Configure and Deploy the JCA TCK Tests on the Jakarta EE 8 Web Profile CI
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4.3.2 To Configure and Deploy the {TechnologyShortName} TCK Tests on the Jakarta EE {JakartaEEVersion} Web Profile CI
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
The `config.vi` Ant task performs several configuration procedures on
your connector server. This target deploys some of the required Resource
@@ -322,7 +322,7 @@ connection resources. This Ant target is in the
`/bin/xml/impl/glassfish/connector.xml` file. See the Ant
target `setup.all.rars.and.pools` for more information.
-1. Make sure that the server to which you will deploy the JCA TCK tests
+1. Make sure that the server to which you will deploy the {TechnologyShortName} TCK tests
is running.
2. Change to the `/bin` directory and execute the Ant task to
configure the CI.
@@ -350,10 +350,10 @@ GUI for TCK Test Execution,"] or link:using.html#GJCIW[Section 5.2,
"Using the Command-Line for TCK Test Execution,"] to run the tests you
just deployed.
-[[GJKWJ]][[configuring-the-jca-tck-tests-on-the-vendor-implementation]]
+[[GJKWJ]][[configuring-the-connectors-tck-tests-on-the-vendor-implementation]]
-4.3.3 Configuring the JCA TCK Tests on the Vendor Implementation
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4.3.3 Configuring the {TechnologyShortName} TCK Tests on the Vendor Implementation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Vendors need to configure their application or connector servers to run
the TCK tests. This configuration needs to support the same features
@@ -361,7 +361,7 @@ that are currently performed against all CIs through the execution of the
`config.vi` and `setup.all.rars.and.pools` Ant targets.
This section describes how to configure the Vendor Implementation (VI)
-before running the JCA TCK tests.
+before running the {TechnologyShortName} TCK tests.
Performing the tasks of these targets should minimally include the
following:
@@ -437,7 +437,7 @@ connector runtime:
If your connector server does not have web support, you will need to
create your own vehicle. A vehicle is a wrapper that supports running
tests in different server-side containers, such as servlet, JSP, and so
-on. The JCA TCK provides a default vehicle, `connectorservlet`, which
+on. The {TechnologyShortName} TCK provides a default vehicle, `connectorservlet`, which
supports running the TCK tests in a connector runtime that has a Servlet
container. To support running tests in an environment other than a
Servlet container, you need to implement your own vehicle, effectively
@@ -464,7 +464,7 @@ topic.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This section describes how deploy the RAR files to the VI before running
-the JCA TCK tests.
+the {TechnologyShortName} TCK tests.
The deployment requirements for VI are similar to the requirements for
the CI in that the required Resource Adapter (RAR) files must be
diff --git a/user_guides/connector/src/main/jbake/content/install-server.inc b/user_guides/connector/src/main/jbake/content/install-server.inc
index cb9bd07b76..1f9cc023e2 100644
--- a/user_guides/connector/src/main/jbake/content/install-server.inc
+++ b/user_guides/connector/src/main/jbake/content/install-server.inc
@@ -1,4 +1,4 @@
-. Install the Jakarta EE 8 CI software, if it is not already installed. +
+. Install the Jakarta EE {JakartaEEVersion} CI software, if it is not already installed. +
Refer to any installation instructions that accompany the software
for additional information.
One CI is {TechnologyRI}.
diff --git a/user_guides/connector/src/main/jbake/content/platforms.inc b/user_guides/connector/src/main/jbake/content/platforms.inc
new file mode 100644
index 0000000000..f2aa2acb62
--- /dev/null
+++ b/user_guides/connector/src/main/jbake/content/platforms.inc
@@ -0,0 +1 @@
+* Cent OS 7
\ No newline at end of file
diff --git a/user_guides/connector/src/main/jbake/content/req-software.inc b/user_guides/connector/src/main/jbake/content/req-software.inc
index cf67d4627b..8b354799b5 100644
--- a/user_guides/connector/src/main/jbake/content/req-software.inc
+++ b/user_guides/connector/src/main/jbake/content/req-software.inc
@@ -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 8 CI or an implementation of the {TechnologyFullName} {TechnologyVersion} specification
+* A Jakarta EE {JakartaEEVersion} CI or an implementation of the {TechnologyFullName} {TechnologyVersion} specification
diff --git a/user_guides/connector/src/main/jbake/content/using-examples.inc b/user_guides/connector/src/main/jbake/content/using-examples.inc
index 7290bfc650..ee0bb641aa 100644
--- a/user_guides/connector/src/main/jbake/content/using-examples.inc
+++ b/user_guides/connector/src/main/jbake/content/using-examples.inc
@@ -49,9 +49,9 @@ cd {subsetTestDirectoryExample}
ant runclient
----
-Example 5-4 MDB-Specific JCA TCK Tests
+Example 5-4 MDB-Specific {TechnologyShortName} TCK Tests
-To run the MDB-specific JCA TCK tests, enter the following commands:
+To run the MDB-specific {TechnologyShortName} TCK tests, enter the following commands:
[source,oac_no_warn]
----
@@ -60,7 +60,7 @@ ant runclient
----
Alternatively, from the /src/com/sun/ts/tests/connector
-directory, you can also run the MDB-specific JCA TCK tests by using the
+directory, you can also run the MDB-specific {TechnologyShortName} TCK tests by using the
appropriate keyword:
[source,oac_no_warn]
@@ -72,7 +72,7 @@ ant -Dkeywords="connector_mdb_optional" runclient
Example 5-5 EJB and Servlet Resource Definition Annotation Tests
-To run the JCA TCK EJB and Servlet Resource Definition Annotation Tests,
+To run the {TechnologyShortName} TCK EJB and Servlet Resource Definition Annotation Tests,
enter the following commands:
[source,oac_no_warn]
@@ -82,7 +82,7 @@ ant runclient
----
Alternatively, from the /src/com/sun/ts/tests/connector
-directory, you can also run the JCA TCK Web tests by using the
+directory, you can also run the {TechnologyShortName} TCK Web tests by using the
appropriate keyword:
[source,oac_no_warn]
@@ -93,11 +93,11 @@ ant -Dkeywords= "(connector_resourcedef_ejb_optional | connector_resourcedef_se
----
-Example 5-6 All JCA TCK Tests Except the EJB and Servlet Resource
+Example 5-6 All {TechnologyShortName} TCK Tests Except the EJB and Servlet Resource
Definition Annotation Tests
From the /src/com/sun/ts/tests/connector directory, you can run
-all the JCA TCK tests except the EJB and Servlet Resource Definition
+all the {TechnologyShortName} TCK tests except the EJB and Servlet Resource Definition
Annotation Tests by using the appropriate keyword:
[source,oac_no_warn]
diff --git a/user_guides/connector/src/main/jbake/templates/footer.ftl b/user_guides/connector/src/main/jbake/templates/footer.ftl
index 2b3fcab62c..26d860ab2b 100644
--- a/user_guides/connector/src/main/jbake/templates/footer.ftl
+++ b/user_guides/connector/src/main/jbake/templates/footer.ftl
@@ -37,7 +37,7 @@
- Copyright © 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+ Copyright © 2018, 2020 Oracle and/or its affiliates. All rights reserved.