Fix TCK Executor

datastax · Oct 14, 2024 · aa5ce1d · aa5ce1d
1 parent 298c42f
commit aa5ce1d
Show file tree

Hide file tree

Showing 2 changed files with 149 additions and 119 deletions.
diff --git a/tck-executor/ts.jte b/tck-executor/ts.jte
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2021 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
@@ -14,46 +14,50 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
-#
-# $Id: ts.jte 69480 2013-01-11 18:52:37Z af70133 $
-#
-
 ####################################################################################
 #                                                                   	           #
-#   JavaTest Environment file for JMS Compatibility Test Suite                     #
+#   JavaTest Environment file for Jakarta Messaging Compatibility Test Suite       #
 #                                                                                  #
-#   Environment specific properties in this file will likely	                   #
-#   have to be modified prior to running the JMS TCK. Instructions                 #
+#   Environment specific properties in this file must       	                   #
+#   be modified prior to running the Jakarta Messaging TCK. Instructions           #
 #   for modifying these properties are contained in this file.	                   #
 #                                                                                  #
 ####################################################################################
 
 ####################################################################################
-# Properties to set prior to running the JMS TCK tests		      
-# @jms.home		-- Install directory of the JMS Reference Implementation.
-# @jms.classes		-- Classes of the JMS Reference Implementation needed to
-#			   run and/or build the JMS TCK. If testing with the JMS
-#			   Reference Implementation then set jms.classes to the
-#			   following:
+#
+# Properties to set prior to running the Jakarta Messaging TCK tests
+# @jms.home		-- Install directory of the Jakarta Messaging Compatible Implementation.
+# @jms.classes	-- Classes of the Jakarta Messaging Compatible Implementation needed to
+#			   run and/or build the Jakarta Messaging TCK.
+#
+#              Note: Jakarta EE does not provide a special compatible implementation
+#              (formerly called the RI). Some vestiges of this remain in these settings.
+#              These will be removed in a future release of this TCK.
+#
+#              Initial TCK testing for Jakarta Messaging in Jakarta EE 9 is performed against
+#              Eclipse Open Message Queue (Open MQ). The JAR list is preset for
+#              Open MQ
+#
 #
 #			   jms.classes=${ri.jars}
 #
-# See the bottom of this ts.jte file for properties specific to the JMS Reference 
-# Implementation. The variable "ri.jars" at bottom of ts.jte file hardcodes the 
-# classes/jars for the JMS Reference Implementation. 
+# See the bottom of this ts.jte file for properties specific to the Jakarta Messaging Compatible
+# Implementation. The variable "ri.jars" at bottom of this file sets the
+# classes/jars for Open MQ. These may need to be changed for other vendor implementations.
 #
-# The JMS Reference Implementation and the Open Message Queue Product are the 
-# Standalone JMS RI implementations. The JMS TCK has been run against both.
 ####################################################################################
-jms.home=/Users/enrico.olivelli/dev/pulsar-jms/tck-executor
-jms.classes=/Users/enrico.olivelli/.m2/repository/jakarta/jms/jakarta.jms-api/2.0.3/jakarta.jms-api-2.0.3.jar:${jms.home}/target/tck-executor-1.0.0.jar
+jms.home=tck-executor
+jms.classes=${jms.home}/target/tck-executor-1.0.0.jar
 
 ####################################################################################
+#
 # The jars/classes for the TS harness/javatest and the test classes
 # @ts.harness.classpath --  Classes required by javatest
 # @ts.classpath         --  Classes used to build the CTS tests
 # @ts.run.classpath     --  Classpath required by the vendor
 #                           appclient container.
+#
 ####################################################################################
 ts.harness.classpath=${ts.home}/lib/javatest.jar${pathsep}${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/jmstck.jar${pathsep}${ant.home}/lib/ant.jar${pathsep}${ts.home}/lib/jaxb-api.jar${pathsep}${ts.home}/lib/jaxb-xjc.jar${pathsep}${ts.home}/lib/jaxb-libs.jar${pathsep}${ts.home}/lib/jaxb-impl.jar
 
@@ -62,20 +66,25 @@ ts.classpath=${jms.classes}${pathsep}${ts.home}/lib/tsharness.jar${pathsep}${ts.
 ts.run.classpath=${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/sigtest.jar${pathsep}${ts.home}/lib/jmstck.jar${pathsep}${ts.home}/classes${pathsep}${ts.home}/bin${pathsep}${jms.classes}
 
 ###############################################################################
-# @tools.jar  should be set to the location of the tools.jar from the 
+# @tools.jar  should be set to the location of the tools.jar from the
 # installed jdk
 ###############################################################################
 tools.jar=${jdk.home}/lib/tools.jar
 
 #############################################################################
-# @sigTestClasspath: This property must be set when running signature 
+# @jimage.dir:       This property specifies the directory where Java 11+
+#                    modules will be expanded by the jimage tool for use
+#                    in sigTestClasspath
+# @sigTestClasspath: This property must be set when running signature
 #                    tests.  This property should be set to a list of
-#                    jar files and/or directories which contain your 
-#                    Java EE and Java SE classes. Paths must be 
-#                    separated by the appropriate path separator 
-#                    (';' windows, ':' Unixes).
+#                    jar files and/or directories which contain your
+#                    Jakarta EE and Java SE classes. Paths must be
+#                    separated by the appropriate path separator
+#                    (';' windows, ':' Unix).
 #############################################################################
-sigTestClasspath=${jms.classes}${pathsep}${JAVA_HOME}/lib/rt.jar
+jimage.dir=${ts.home}/tmp/jdk-bundles
+
+sigTestClasspath=${jms.classes}${pathsep}${jimage.dir}/java.base${pathsep}${jimage.dir}/java.rmi${pathsep}${jimage.dir}/java.sql${pathsep}${jimage.dir}/java.naming
 
 ############################################################################
 # These properties are used by the harness.  "harness.log.port"
@@ -105,7 +114,7 @@ sigTestClasspath=${jms.classes}${pathsep}${JAVA_HOME}/lib/rt.jar
 harness.temp.directory=${ts.home}/tmp
 harness.log.port=2001
 harness.log.traceflag=false
-harness.log.delayseconds=1 
+harness.log.delayseconds=1
 harness.executeMode=2
 harness.socket.retry.count=10
 work.dir=/tmp/JTwork
@@ -116,7 +125,7 @@ if.existing.work.report.dirs=auto
 # @tz - your local timezone. For valid values, consult your
 #       Operating System documentation.
 ###########################################################################
-tz=Europe/Rome
+tz=US/Eastern
 
 #############################################################################
 # @javatest.timeout.factor This property specifies the scale factor used by
@@ -198,9 +207,9 @@ env.ts_win32.menu=true
 porting.ts.jmsObjects.class.1=com.sun.ts.lib.implementation.sun.jms.SunRIJMSObjects
 
 ###############################################################
-#These properties are needed for the JMS tests.
+#These properties are needed for the Jakarta Messaging tests.
 ###############################################################
-jms_timeout=3000
+jms_timeout=10000
 user=j2ee
 password=j2ee
 
@@ -213,39 +222,38 @@ tslib.name=jmstck
 
 #########################################################################
 # platform.mode is used by to specify runtime environment for testing
-# which can be either javaEE or standalone. For JMS TCK this setting
+# which can be either jakartaEE or standalone. For Jakarta Messaging TCK this setting
 # is standalone.
 #
-# platform.mode=standalone     Testing JMS TCK as Standalone environment
+# platform.mode=standalone     Testing Jakarta Messaging TCK as Standalone environment
 #########################################################################
 platform.mode=standalone
 
 #######################################################################################
-# JMS RI Implementation Property Settings for Vendor Implementation under test
+# Jakarta Messaging CI Implementation Property Settings for Vendor Implementation under test
 #
-# The TCK uses the following JMS RI Implementations:
-#   - ri	  (For the JMS Reference Implementation or Open Message Queue Product)
+# The TCK uses the following for Jakarta Messaging CI Implementations:
+#   - ri	  (for Open MQ)
 #
 # Here are the common properties that need to be defined for the common implementation
 # functionality:
 #
 # @impl.vi    	This property must be set to the Vendor implementation under test.
 #
-#		Default value is (ri) for the Standalone JMS Reference Implementation 
-#		or the Open Message Queue Product (impl.vi=ri).
+#		Default value is (ri) for the initial testing of Standalone Jakarta Messaging
+#		with Open MQ (impl.vi=ri).
 #######################################################################################
 
 impl.vi=ri
 
 # ---------------------------------------------------------------------------------
 # ================================================
-# Standalone JMS Reference Implementation and Open
-# Message Queue Product Configuration Properties
+# Standalone Jakarta Messaging Compatible Implementation
+# Configuration Properties used for Open MQ
 # ================================================
 #
-# Property settings for ant config.vi/clean.vi tasks to configure, unconfigure, 
-# setup, cleanup, start, and stop the Standalone JMS Reference Implementation 
-# and the Open Message Queue Product for a JMS TCK run.
+# Property settings for ant config.vi/clean.vi tasks to configure, unconfigure,
+# setup, cleanup, start, and stop Open MQ for a Jakarta Messaging TCK run.
 #
 # These properties require NO CHANGES other than adding the drive letter to the
 # (admin.pass.file) and (jndi.fs.dir) properties if you are running on a WINDOWS
@@ -260,28 +268,35 @@ impl.vi=ri
 # if you are running on a WINDOWS based system. For WINDOWS the setting MUST BE:
 #
 # java.naming.provider.url=file:///C:/tmp/ri_admin_objects
-# 
-# The JMS TCK uses the JNDI Filesystem Context Provider as the JMS Object store
-# for the JMS administered objects for the Standalone JMS Reference Implementation
-# and the Open Message Queue Product.
-# 
-# For the Standalone JMS Reference Implementation and the Open Message Queue 
-# Product all you need to set is the "jms.home" property at the top of this 
-# file to the location where the Standalone JMS Reference Implementation or 
-# Open Message Queue Product is installed. Then you to set the "jms.classes" 
-# property to the location of the classes/jars of the Standalone JMS Reference 
-# Implementation or the Open Message Queue Product. The classes/jars are 
-# hardcoded in the property "ri.jars" below. So set "jms.classes="${ri.jars}"
-# and you are now set to run the JMS TCK against the Standalone JMS Reference 
-# Implementation or the Open Message Queue Product.
+#
+# The Jakarta Messaging TCK uses the JNDI Filesystem Context Provider as the
+# Jakarta Messaging Object store for the Jakarta Messaging administered
+# objects for  Open MQ.
+#
+# For Open MQ you need to set the "jms.home" property at the top of this
+# file to the location where Open MQ is installed.
+# Then you to set the "jms.classes" property to the location of the
+# classes/jars of Open MQ.
+# The classes/jars are hard-coded in the property "ri.jars" below.
+# So set "jms.classes="${ri.jars}" and you are now set to run the
+# Jakarta Messaging TCK against Open MQ.
+#
 #####################################################################
 # ---------------------------------------------------------------------------------
 #
 ri.home=${jms.home}
-ri.jars=${jms.home}/target/tck-executor-1.0.0-SNAPSHOT.jar
+ri.jars=NOT-USED
 admin.user=admin
 admin.pass=admin
 admin.pass.file=/tmp/ripassword
 #jndi.fs.dir=/tmp/ri_admin_objects
 java.naming.factory.initial="com.datastax.oss.pulsar.jms.tests.JNDIInitialContextFactory"
 #jndi.provider.url="java.naming.provider.url=file:///${jndi.fs.dir}"
+
+###############################################################
+# @extension.dir - The extension directory of RI.
+# The CTS config.vi target will copy the CTS library
+# jars to this location, used only for RI.
+###############################################################
+extension.dir=${glassfish.home}/domains/domain1/lib/
+