From 350f06a64dbf11a95dad8a4754b1b50a7ed37eff Mon Sep 17 00:00:00 2001 From: Alwin Joseph Date: Fri, 4 Oct 2024 13:44:04 +0530 Subject: [PATCH 1/2] jta javatests - fix failures, configure ts.jte --- .../jta-platform-tck/jakartaeetck/bin/ts.jte | 2463 +++++++++++++++++ glassfish-runner/jta-platform-tck/pom.xml | 21 +- .../src/test/resources/arquillian.xml | 12 +- jta/pom.xml | 7 +- .../transactional/ClientEjblitejsfTest.java | 11 - .../transactional/ClientEjblitejspTest.java | 3 - .../ee/txpropagationtest/ClientJspTest.java | 60 +- .../txpropagationtest/ClientServletTest.java | 57 +- .../begin/UserBeginClient.java | 2 - .../begin/UserBeginClientJspTest.java | 35 +- .../begin/UserBeginClientServletTest.java | 28 +- .../commit/UserCommitClientJspTest.java | 23 - .../commit/UserCommitClientServletTest.java | 22 - .../getstatus/UserGetStatusClientJspTest.java | 41 - .../UserGetStatusClientServletTest.java | 43 +- .../rollback/UserRollbackClientJspTest.java | 41 +- .../UserRollbackClientServletTest.java | 42 - .../UserSetRollbackOnlyClientServletTest.java | 42 +- ...serSetTransactionTimeoutClientJspTest.java | 46 +- ...etTransactionTimeoutClientServletTest.java | 40 - 20 files changed, 2513 insertions(+), 526 deletions(-) create mode 100644 glassfish-runner/jta-platform-tck/jakartaeetck/bin/ts.jte diff --git a/glassfish-runner/jta-platform-tck/jakartaeetck/bin/ts.jte b/glassfish-runner/jta-platform-tck/jakartaeetck/bin/ts.jte new file mode 100644 index 0000000000..85d9765cc3 --- /dev/null +++ b/glassfish-runner/jta-platform-tck/jakartaeetck/bin/ts.jte @@ -0,0 +1,2463 @@ +# +# Copyright (c) 2006, 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 +# 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 +# + +######################################################################### +## +## JavaTest Environment file for Java EE Compatibility Test Suite +## +## Environment specific properties in this file will likely +## have to be modified prior to running the Java EE CTS. +## Instructions for modifying these properties are contained in this +## file. +## +## This file is processed by an external tool that helps generate the +## CTS documents. Therefore this file has a standard format that must +## be followed. This file is a standard Java Properties file with +## very specific comment formatting. Users can write property specific +## comments by using the property name and an ampersand (@). As an +## example the following comment applies to the foo.bar property: +## # @foo.bar - This is a comment pertaining to foo.bar +## # that spans multiple lines. +## This comment must be preceded by a single hash (#) character and +## the property name must be prepended with an ampersand (@). The +## comment can appear anywhere in the ts.jte file. If users have +## comments that belong in ts.jte but DO NOT pertain to a particular +## property the user must start the comment with at least 2 hash (#) +## characters. The following is a valid non-property comment: +## ## A valid non-property comment +## ## that spans multiple lines. +######################################################################### + +######################################################################### +## @jte.version This version denotes the bundle this JTE was +## originally included with. The version matches the ID +## in the bundle name. It can be used to identify a +## mismatched JTE file. This value is filled in during +## the build process as part of sanitizing the jte file. +######################################################################### +jte.version=@JTE_VERSION@ + +######################################################################## +## Javatest batch mode work directory and report directory, and policy for +## handling existing work and report directories. These properties affects +## runclient and report targets, but not gui target. +## To disable generating test report, unset report.dir, or set it to "none" +## either here or from command line, as in the following command: +## ant runclient -Dreport.dir="none" +## +# @work.dir The directory used to store Javatest test results and test +# information. +# @report.dir The directory used to store Javatest summary reports of +# test results. +# @if.existing.work.report.dirs specifies how existing work.dir and +# report.dir will be handled, and it must be one of the following values: +# overwrite overwrites all content in work.dir and report.dir +# backup moves all content in work.dir and report.dir to +# work.dir_time_day_bak and report.dir_time_day_bak, +# respectively +# append reuses and preserves the existing work.dir and report.dir +# auto lets the build files decide which mode to use +# (overwrite, backup or append). the value is determined +# like this: +# if.existing.work.report.dirs == auto +# if in CTS workspace +# if.existing.work.report.dirs = overwrite +# else we are in a distribution bundle +# if.existing.work.report.dirs = append +# end if +# else +# if.existing.work.report.dirs = value in this file +# end if +######################################################################## +work.dir=/home/jenkins/agent/workspace/jakartaee-tck_10.0.x/JTWork +report.dir=/home/jenkins/agent/workspace/jakartaee-tck_10.0.x/JTReport +if.existing.work.report.dirs=auto + +######################################################################## +# @javatest.timeout.factor This property specifies the scale factor used by +# Javatest to adjust the time JavaTest will wait for a given test to +# complete before returning failure. For instance if the default test timeout +# is 5 minutes, this value will be multiplied by 5 minutes to determine +# the total timeout delay. Note: this value only works with Javatest's +# batch mode (runclient). When using the Javatest GUI users must change +# this timeout factor in the GUI. Configure -> Edit Configuration -> View +# -> choose Standard Values -> select tab Execution -> set Time Factor. +# +# Note that javatest.timeout.factor can be a positive real number, such as 1.5 +######################################################################## +javatest.timeout.factor=1 + +######################################################################## +## Level of Vendor Java EE Implementation +# @javaee.level The level of Java EE support for the implementation under test. +# This property serves two purposes: First, it is used to determine +# whether the impl under test is a Java EE Full profile (full) or Java +# EE Web profile (web). Either "full" or "web" must be specified in +# the list values. "full" will tell the harness to deploy ears. "web" +# will tell the harness to deploy wars. +# This property is also used to help determine which apis (in the +# signature tests) are to be tested. +# +# NOTE: This property does not determine which CTS tests to run for +# different profiles and optional technologies. That is done using +# keywords. Please refer to the keywords functionality in the CTS +# User's Guide for information on how to use keywords when +# running CTS tests. +# +# Currently, there are 4 settings supported for this property: +# 1. full: This is the minimal set of signature requirements that vendors +# must support. Specifying a javaee.level of "full" with nothing +# else implies there are NO additional technologies existing within +# the vendors implementation. Again, "full" only covers the +# REQUIRED Technologies for Jakarta EE 8 Full profile +# ex/ javaee.level=full +# +# 2. web : This is the minimal set of signature requirements that vendors +# must support for Web Profile. Specifying a javaee.level of "web" +# with nothing else implies there are NO additional technologies +# existing within the vendors implementation. Again, "web" only +# covers REQUIRED Technologies for Jakarta EE 8 Web profile +# ex/ javaee.level=web +# +# 3. full + optional_technologies: This covers REQUIRED Technologies for +# Java EE 8 Full Profile and any combination of the optional +# technologies. +# Known optional technologies for CTS8 full profile include: +# "jaxr". +# ex 1/ javaee.level=full jaxr +# ex 2/ javaee.level=full jaxr +# ex 3/ javaee.level=full +# ex 4/ etc... +# +# 4. web + optional_technologies: This covers REQUIRED Technologies for +# Java EE 8 Web Profile and any combination of optional +# technologies. +# Known optional technologies for Web Profile include: +# "jaxr", "connector", "jaxb", +# "jms", "javamail", "jacc", "jaspic", "wsmd" +# ex 1/ javaee.level=web connector jms jacc +# ex 2/ javaee.level=web jaspic +# ex 3/ javaee.level=web jms connector +# ex 4/ etc... +# +# Note 1: spaces separate multiple entries +# +# Note 2: optional technologies for full/javaee profile are listed +# in the Java EE 8 spec, in Table EE.6-1. Currently, the only +# optional technologies for full profile are: "jaxr" (JAXR 1.0) +# +# Note 3: The list of optional technologies for Web Profile includes any OPTIONAL +# technology explicitly called out in the Web Profile spec (if applicable) +# as well as any additional technology which is listed within +# JavaEE Profile 8 spec *but* not included/Required in the +# Web Profile spec. +# +# Note 4: Two different examples of javaee.level are provided immediately +# following this comment block. One is for running CTS8 against +# the EE 8 (full) Profile RI and the other is for running CTS8 +# against the EE 8 Web Profile RI. Notice that optional technologies +# are supplied here since the RI for CTS8 contains those optional +# technologies in it. It's very possible vendors may provider different +# optional technologies in their implementations. If so, the list of +# optional technologies will need to be adjusted here to suite each +# vendors implementation. +# +# Note 5: For EE 8 (RI) Web Profile, you can uncomment and use the line +# below which starts with: javaee.level=web .... +# +# IMPORTANT: when testing Web Profile - be sure to adjust the +# "optional.tech.packages.to.ignore" property accordingly. +# (see comments for optional.tech.packages.to.ignore below) +# +############################################################################### +#javaee.level=web connector jaxws jaxb javamail jacc jaspic wsmd +javaee.level=full + + +######################################################################## +## Settings for Vendor Java EE Implementation +# @javaee.home The location of the vendor's Java EE platform +# implementation. +# @orb.host Hostname of the machine running the vendor's +# implementation. +# @orb.port The port number the vendor implementation is listening +# to for service requests. +######################################################################## +javaee.home=/Users/alwjosep/Documents/jakartaee-tck/glassfish-runner/jsonp-platform-tck/target/glassfish8 +orb.host=localhost +orb.port=4848 + +######################################################################## +## JVMOPTS_RUNTESTCOMMAND is a marker that implementations may replace with +# the JVM options to pass when starting JVMs for running tests. +# This is intended to be used for implementations convencience. +# See file docker/run_jakartaeetck.sh for an example. +######################################################################## + +######################################################################## +## Settings for Sun RI Java EE Implementation +# @javaee.home.ri The location of the RI. +# @orb.host Hostname of the machine running the RI. +# @orb.port The port number the RI is listening to for service +# requests. +######################################################################## +javaee.home.ri= +orb.host.ri= +orb.port.ri=3700 + +################################################################### +################################################################### +################################################################### +## RI SPECIFIC PROPERTIES LIVE BELOW +################################################################### +################################################################### +################################################################### + +############################################################### +# @ts.display -- location to display CTS output on Unix +############################################################### +ts.display=:0.0 + +########################################################################### +# @endorsed.dirs using Java SE 6 or above and you provide newer versions +# of technologies than those contained in Java SE 6, verify +# that the property endorsed.dirs is set to the location of +# the VI api jars for those technologies you wish to +# override. For example, Java SE 6 contains an +# implementation of JAXWS 2.0 which will conflict with +# JAXWS 2.1, therefore this property would need to be set +# so that JAXWS 2.1 would be used during the building of +# tests and during test execution. +# +# @endorsed.dirs.ri If using Java SE 6 or above and you provide newer versions +# of technologies than those contained in Java SE 6, verify +# that the property endorsed.dirs is set to the location of +# the RI api jars for those technologies you wish to +# override. For example, Java SE 6 contains an +# implementation of JAXWS 2.0 which will conflict with +# JAXWS 2.1, therefore this property would need to be set +# so that JAXWS 2.1 would be used during the building of +# tests and during test execution. +########################################################################### +endorsed.dirs=${javaee.home}/modules/endorsed +endorsed.dirs.ri=${javaee.home.ri}/modules/endorsed + +############################################################### +## Config params needed for Java EE RI asadmin +## You must change these values as needed +## +# @ri.admin.user -- The Java EE RI asadmin user id +# @ri.admin.passwd -- The Java EE RI asadmin user password +# @ri.admin.host -- The Java EE RI host +# @ri.admin.port -- The Java EE RI port +# @ri.admin -- The Java EE RI admin command +# @ri.server -- The Java EE RI server instance being used +# @ri.domain.dir -- Points to where your domains are installed. +# @ri.domain.name -- The Java EE RI domain being used +# @ri.domain -- The Java EE RI domain path being used +# @ri.asenv.loc -- location of asenv.conf or asenv.bat +# @ri.imqbin.loc -- location of the IMQ bin directory +# @ri.lib -- Library directory for other Java EE RI +# jars +# @ri.imq.share.lib -- Shared library directory for imq +# @ri.jvm.options -- Java options needed by the Java EE RI +# note, the second option is not needed +# but is required to work around asadmin +# command line parsing issues. The +# xxxlogin and xxxpassword are used +# to set known server side creds for use +# with connector tests. +# @ri.applicationRoot-- Location of application repository +# Only needed when running on windows +# @ri.and.vi.run.on.same.host - set to true if interop tests are run +# with both RI and VI on same machine. set to +# false if they are run on different machines. +# This is used to work around an orb issue +# specific to running VI and RI on same box. +# +# @ri.orb.iiop.orbserverid - This is used to set a similarly +# named jvm option in the RI. It is only used +# when we are running interop where remote EJBs +# try to access target EJB's on the same host with +# zero port configuration for ssl. +# This only gets used when ri.and.vi.run.on.same.host=true. +# The value is to be an ORB server id. +############################################################### +ri.admin.user=admin +ri.admin.passwd= +ri.admin.host=${orb.host.ri} +ri.admin.port=4848 +ri.admin=${javaee.home.ri}/bin/asadmin +ri.server=server +ri.domain.dir=${javaee.home.ri}/domains +ri.domain.name=domain1 +ri.domain=${ri.domain.dir}/${ri.domain.name} +ri.asenv.loc=${javaee.home.ri}/config +ri.imqbin.loc=${javaee.home.ri}/../mq/bin +ri.lib=${javaee.home.ri}/lib +ri.log.file.location=${ri.domain}/logs +ri.modules=${javaee.home.ri}/modules +ri.imq.share.lib=${javaee.home.ri}/../mq/lib +ri.jvm.options=-Doracle.jdbc.J2EE13Compliant=true:-Xmx4096m:-Dj2eelogin.name=${user}:-Dj2eelogin.password=${password}:-Deislogin.name=${user1}:-Deislogin.password=${password1}:-Dtest.ejb.stateful.timeout.wait.seconds=${test.ejb.stateful.timeout.wait.seconds}:-DwebServerPort.2=${webServerPort.2}:-DwebServerHost.2=${webServerHost.2}:-Dcsiv2.save.log.file=${harness.log.traceflag}:-Djavax.xml.accessExternalStylesheet=all:-Djavax.xml.accessExternalDTD=file,http +ri.jvm.options.remove=-Xmx512m:${ri.jvm.options} +ri.java.endorsed.dirs=${endorsed.dirs.ri} +ri.applicationRoot=c: +ri.and.vi.run.on.same.host=true +ri.orb.iiop.orbserverid=200 + +############################################################### +## Config params needed for Java EE VI asadmin +## You must change these values as needed +## +# @vi.admin.user -- The Java EE VI asadmin user id +# @vi.admin.passwd -- The Java EE VI asadmin user password +# @vi.admin.host -- The Java EE VI host +# @vi.admin.port -- The Java EE VI port +# @vi.admin -- The Java EE VI admin command +# @vi.server -- The Java EE VI server instance being used +# @vi.domain.dir -- Points to where your domains are installed. +# @vi.domain.name -- The Java EE VI domain being used +# @vi.domain -- The Java EE VI domain path being used +# @vi.asenv.loc -- location of asenv.conf or asenv.bat +# @vi.imqbin.loc -- location of the IMQ bin directory +# @vi.lib -- Library directory for other Java EE VI +# jars +# @vi.imq.share.lib -- Shared library directory for imq +# @vi.jvm.options -- Java options needed by the Java EE VI +# note, the second option is not needed +# but is required to work around asadmin +# command line parsing issues. The +# xxxlogin and xxxpassword are used +# to set known server side creds for use +# with connector tests. +# @vi.applicationRoot-- Location of application repository +# Only needed when running on windows +############################################################### +vi.admin.user=admin +vi.admin.passwd= +vi.admin.host=${orb.host} +vi.admin.port=4848 +vi.admin=${javaee.home}/bin/asadmin +vi.server=server +vi.domain.dir=${javaee.home}/domains +vi.domain.name=domain1 +vi.domain=${vi.domain.dir}/${vi.domain.name} +vi.asenv.loc=${javaee.home}/config +vi.imqbin.loc=${javaee.home}/../mq/bin +vi.lib=${javaee.home}/server/lib +vi.log.file.location=${vi.domain}/logs +vi.modules=${javaee.home}/modules +vi.imq.share.lib=${javaee.home}/../mq/lib +vi.jvm.options=-Doracle.jdbc.J2EE13Compliant=true:-Xmx4096m:-Dj2eelogin.name=${user}:-Dj2eelogin.password=${password}:-Deislogin.name=${user1}:-Deislogin.password=${password1}:-Dtest.ejb.stateful.timeout.wait.seconds=${test.ejb.stateful.timeout.wait.seconds}:-DwebServerPort.2=${webServerPort.2}:-DwebServerHost.2=${webServerHost.2}:-Dcsiv2.save.log.file=${harness.log.traceflag}:-Djavax.xml.accessExternalStylesheet=all:-Djavax.xml.accessExternalDTD=file,http +vi.jvm.options.remove=-Xmx512m:${vi.jvm.options} +vi.java.endorsed.dirs=${endorsed.dirs} +vi.applicationRoot=c: + +############################################################### +## Config params needed for Sun Java System Application Server +## (SJSAS) asadmin. You must change these values as needed +## only if you are testing against SJSAS app server +## (javaee.home is pointing to SJSAS). +# +# @s1as.admin.user -- The SJSAS asadmin user id +# @s1as.admin.passwd -- The SJSAS asadmin user password +# @s1as.admin.host -- The SJSAS host +# @s1as.admin.port -- The SJSAS port +# @s1as.admin -- The SJSAS admin command +# @s1as.server -- The SJSAS server instance being used +# @s1as.domain.dir -- Points to where your domains are installed. +# @s1as.domain.name -- The SJSAS domain being used +# @s1as.domain -- The SJSAS domain path being used +# @s1as.asenv.loc -- location of asenv.conf or asenv.bat +# @s1as.imqbin.loc -- location of the IMQ bin directory +# @s1as.lib -- Library directory for other Java EE RI +# jars +# @s1as.imq.share.lib -- Shared library directory for imq +# @s1as.jvm.options -- Java options needed by SJSAS +# The xxxlogin and xxxpassword are used +# to set known server side creds for use +# with connector tests. +# @s1as.applicationRoot-- Location of application repository +# Only needed when running on windows +############################################################### +s1as.admin.user=admin +s1as.admin.passwd= +s1as.admin.host=${orb.host} +s1as.admin.port=4848 +s1as.admin=${javaee.home}/bin/asadmin +s1as.server=server +s1as.domain.dir=${javaee.home}/domains +s1as.domain.name=domain1 +s1as.domain=${s1as.domain.dir}/${s1as.domain.name} +s1as.asenv.loc=${javaee.home}/config +s1as.imqbin.loc=${javaee.home}/../mq/bin +s1as.lib=${javaee.home}/lib +s1as.modules=${javaee.home}/modules +s1as.imq.share.lib=${javaee.home}/../mq/lib +s1as.jvm.options=-Doracle.jdbc.J2EE13Compliant=true:-Xmx4096m:-Dj2eelogin.name=${user}:-Dj2eelogin.password=${password}:-Deislogin.name=${user1}:-Deislogin.password=${password1}:-Dtest.ejb.stateful.timeout.wait.seconds=${test.ejb.stateful.timeout.wait.seconds}:-DwebServerPort.2=${webServerPort.2}:-DwebServerHost.2=${webServerHost.2} +s1as.jvm.options.remove=-Xmx512m:${s1as.jvm.options} +s1as.java.endorsed.dirs=${endorsed.dirs} +s1as.applicationRoot=c: + +############################################################### +# @sjsas.das.orb.port -- ORB port number for the DAS +# @sjsas.das.orb.host -- ORB host name for the DAS +# @sjsas.das.webServerPort -- HTTP listener port for the DAS +# @sjsas.das.securedWebServicePort -- HTTPS listener port for the DAS +# @sjsas.nodeagent.name -- Name of node agent used by +# the remote instance. +# @sjsas.nodeinstance.name -- Name of the remote instance +# @sjsas.master.password -- Used to create a node agent only +# applicable to EE. Defaults to changeit. This +# can be changed at EE install time. +# @sjsas.instance.config.dir -- config directory used by the intsance +# being tested. +# For PE/DAS = config +# For remote instance = config +# @sjsas.cts.timer.resource -- Backend to use when we are using java2db with +# the CMP tests for the jdbc/DBTimer resource +# @sjsas.cmp.backend -- Backend to use when we are using java2db with +# the CMP tests +# @sjsas.node.agent.dir.name -- The name of the node agent directory to use. +# This value will be used on Windows only and +# ignored on non-Windows platforms. The default +# is 'n' meaning the create-node-agent command +# will pass the --agentdir argument with a value +# of ${s1as.applicationRoot}\${sjsas.node.agent.dir.name}. +# @sjsas.env.type -- CTS test configuration. Possible values are: +# das (for PE or DAS) +# remote (for remote intance) +# cluster (for cluster config not yet supported) +# @s1as.targets -- Instance(s) to deploy tests +# Supports multiple instances, For example: +# s1as.targets=server server-1 +############################################################### +sjsas.das.orb.port=3700 +sjsas.das.orb.host=${orb.host} +sjsas.das.webServerPort=8000 +sjsas.das.securedWebServicePort=1043 +sjsas.nodeagent.name=node-agent-1 +sjsas.nodeinstance.name=server-1 +sjsas.master.password=changeit +sjsas.instance.config.dir=config +sjsas.cts.timer.resource=derby +sjsas.cmp.backend=derby +sjsas.node.agent.dir.name=n + +sjsas.env.type=das +#sjsas.env.type=remote + +s1as.targets=${s1as.server} +#s1as.targets=${sjsas.nodeinstance.name} + +############################################################### +# @s1as.pe.jmsServer -- name of the JMS server the RI/PE +# @s1as.se.jmsServer -- name of the JMS server for SE/EE +############################################################### +s1as.pe.jmsServer=imqbroker +s1as.se.jmsServer=imqbroker +#s1as.se.jmsServer=${s1as.domain.name}_${s1as.server} + +############################################################### +# @extension.dir - The extension directory for the app +# server under test. This does not apply +# to the RI. +# +# Note: App server vendors will need to set this to their +# app server's extension directory. The CTS config.vi +# target will copy the CTS library jars to this location. +############################################################### +extension.dir=${s1as.domain}/lib + +############################################################### +# @instance.listenerName - Default value for the iiop listener +# for your instance. Users will +# most likely not need to change this. +############################################################### +instance.listenerName=orb-listener-1 + +############################################################### +# @tz - your local timezone. For valid values, consult your +# Operating System documentation. +############################################################### +tz=US/Eastern + +############################################################### +# @jdbc.lib.class.path - This property is used by the +# database.classes properties to point to +# where the JDBC drivers live. +############################################################### +jdbc.lib.class.path=${ts.home}/internal/lib + +############################################################### +## The following section is for CTS Database configuration +## For each database that you will test, configure the following: +## Here is an example using derby: Users will need to +## replace derby with the appropriate DB name. +# @derby.dbName -- Database Name +# @derby.server -- Database Server +# @derby.port -- Database Server port +# @derby.dml.file -- DML file used for CTS test cases +# @derby.user -- User Id configured +# @derby.passwd -- User password configured +# @derby.url -- URL to the cts database +# @derby.driver -- DriverManager driver +# @derby.classes -- CLASSPATH to JDBC driver classes +# @derby.poolName -- Name of pool configured in the Java EE +# RI (do not change!) +# @derby.dataSource -- DataSource driver +# @derby.properties -- Any additional JDBC driver required +# properties +# @derby.startup.delay-- delay to wait for DB to start + +############################################################### + +## +## Info for Cloudscape 10/Derby +## +derby.dbName=derbyDB +derby.server=${orb.host} +derby.port=1527 +derby.port.ri=1527 +derby.dml.file=derby/derby.dml.sql +derby.user=cts1 +derby.passwd=cts1 +derby.url=jdbc:derby://${derby.server}:${derby.port}/${derby.dbName};create=true +derby.driver=org.apache.derby.jdbc.ClientDriver +derby.home=${javaee.home}/../javadb +derby.system.home=${derby.home}/databases +derby.classpath=${ts.home}/lib/dbprocedures.jar${pathsep}${derby.home}/lib/derbynet.jar${pathsep}${derby.home}/lib/derbyshared.jar${pathsep}${derby.home}/lib/derbytools.jar +derby.classes=${derby.home}/lib/derbyclient.jar${pathsep}${derby.home}/lib/derbyshared.jar${pathsep}${derby.home}/lib/derbytools.jar +derby.poolName=cts-derby-pool +derby.dataSource=org.apache.derby.jdbc.ClientDataSource +derby.properties=DatabaseName\=\"${derby.dbName}\":user\=${derby.user}:password\=${derby.passwd}:serverName\=${derby.server}:portNumber=${derby.port} +derby.startup.delay=5 + +# +# Cloudscape 10 /Derby embedded driver +# +derbyEmbedded.dbName=/tmp/DerbyDB +derbyEmbedded.server=${orb.host} +derbyEmbedded.port=1527 +derbyEmbedded.dml.file=derby/derby.dml.sql +derbyEmbedded.user=cts1 +derbyEmbedded.passwd=cts1 +derbyEmbedded.url=jdbc:derby:${derbyEmbedded.dbName};create=true +derbyEmbedded.driver=org.apache.derby.jdbc.EmbeddedDriver +derbyEmbedded.classes=${javaee.home}/../javadb/lib/derby.jar${pathsep}${javaee.home}/../javadb/lib/derbyshared.jar${pathsep}${javaee.home}/../javadb/lib/derbytools.jar${pathsep}${ts.home}/lib/dbprocedures.jar +derbyEmbedded.poolName=cts-derbyEmbedded-pool +derbyEmbedded.dataSource=org.apache.derby.jdbc.EmbeddedDataSource +derbyEmbedded.pool.url='jdbc\\:derby\\:${derbyEmbedded.dbName}\\;create=true' +derbyEmbedded.properties=DatabaseName\=\"${derbyEmbedded.dbName}\":user\=${derbyEmbedded.user}:password\=${derbyEmbedded.passwd} + + +## +## Info for DB2 (8.1 type 2 driver) +## +db2.dbName=cts +db2.server=${orb.host} +db2.port=50000 +db2.dml.file=db2/db2.dml.sql +db2.user=db2inst1 +db2.passwd=ibmdb2 +db2.url=jdbc:db2:${db2.dbName} +db2.driver=com.ibm.db2.jcc.DB2Driver +db2.classes=${jdbc.lib.class.path}/db2jcc.jar:${jdbc.lib.class.path}/db2jcc_license_cu.jar:${jdbc.lib.class.path}/db2java.zip +db2.poolName=cts-db2-pool +db2.dataSource=com.ibm.db2.jcc.DB2SimpleDataSource +db2.properties=user=${db2.user}:password=${db2.passwd}:databaseName=${db2.dbName}:driverType=2:deferPrepares\=false + +## +## Info for db2 using the DataDirect driver +## +db2DD.dbName=cts +db2DD.server=${orb.host} +db2DD.port=50000 +db2DD.dml.file=db2/db2.dml.sql +db2DD.user=db2inst1 +db2DD.passwd=ibmdb2 +db2DD.url=jdbc:datadirect:db2://${db2DD.server}:${db2DD.port};DatabaseName\=${db2DD.dbName} +db2DD.driver=com.ddtek.jdbc.db2.DB2Driver +db2DD.classes=${jdbc.lib.class.path}/util.jar${pathsep}${jdbc.lib.class.path}/db2.jar${pathsep}${jdbc.lib.class.path}/base.jar +db2DD.poolName=cts-db2-DataDirect-pool +db2DD.dataSource=com.ddtek.jdbcx.db2.DB2DataSource +db2DD.properties=user\=${db2DD.user}:password\=${db2DD.passwd}:ServerName\=${db2DD.server}:portNumber\=${db2DD.port}:databasename\=${db2DD.dbName} + +## +## Info for db2 using the Sun driver +## +db2Sun.dbName=cts +db2Sun.server=${orb.host} +db2Sun.port=50000 +db2Sun.dml.file=db2/db2.dml.sql +db2Sun.user=db2inst1 +db2Sun.passwd=ibmdb2 +db2Sun.url=jdbc:sun:db2://${db2Sun.server}:${db2Sun.port};DatabaseName\=${db2Sun.dbName} +db2Sun.driver=com.sun.sql.jdbc.db2.DB2Driver +db2Sun.classes=${jdbc.lib.class.path}/smdb2.jar +db2Sun.poolName=cts-db2-Sun-pool +db2Sun.dataSource=com.sun.sql.jdbcx.db2.DB2DataSource +db2Sun.properties=user\=${db2Sun.user}:password\=${db2Sun.passwd}:ServerName\=${db2Sun.server}:portNumber\=${db2Sun.port}:databasename\=${db2Sun.dbName} + +## +## Info for Microsoft SQL Server +## +mssqlserver.dbName=cts +mssqlserver.server=${orb.host} +mssqlserver.port=1433 +mssqlserver.dml.file=mssqlserver/mssqlserver.dml.sql +mssqlserver.user=guest +mssqlserver.passwd=guest +mssqlserver.url=jdbc:microsoft:sqlserver://${mssqlserver.server}:${mssqlserver.port} +mssqlserver.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver +mssqlserver.classes=${jdbc.lib.class.path}/sqljdbc.jar +mssqlserver.poolName=cts-mssqlserver-pool +mssqlserver.dataSource=com.microsoft.sqlserver.jdbc.SQLServerDataSource +mssqlserver.properties=user\=${mssqlserver.user}:password\=${mssqlserver.passwd}:ServerName\=${mssqlserver.server}:portNumber\=${mssqlserver.port} + + +## +## Info for Microsoft SQL Server using the DataDirect driver +## +mssqlserverDD.dbName=cts +mssqlserverDD.server=${orb.host} +mssqlserverDD.port=1433 +mssqlserverDD.dml.file=mssqlserver/mssqlserver.dml.sql +mssqlserverDD.user=guest +mssqlserverDD.passwd=guest +mssqlserverDD.url=jdbc:datadirect:sqlserver://${mssqlserverDD.server}:${mssqlserverDD.port} +mssqlserverDD.driver=com.ddtek.jdbc.sqlserver.SQLServerDriver +mssqlserverDD.classes=${jdbc.lib.class.path}/util.jar${pathsep}${jdbc.lib.class.path}/sqlserver.jar${pathsep}${jdbc.lib.class.path}/base.jar +mssqlserverDD.poolName=cts-mssqlserver-DataDirect-pool +mssqlserverDD.dataSource=com.ddtek.jdbcx.sqlserver.SQLServerDataSource +mssqlserverDD.properties=user\=${mssqlserverDD.user}:password\=${mssqlserverDD.passwd}:ServerName\=${mssqlserverDD.server}:portNumber\=${mssqlserverDD.port}:selectMethod\=cursor + +## +## Info for Microsoft SQL Server using the Inet driver +## +mssqlserverInet.dbName=cts1 +mssqlserverInet.server=${orb.host} +mssqlserverInet.port=1433 +mssqlserverInet.dml.file=mssqlserver/mssqlserver.dml.sql +mssqlserverInet.user=cts1 +mssqlserverInet.passwd=cts1 +mssqlserverInet.url=jdbc:inetdae7:${mssqlserverInet.server}:${mssqlserverInet.port} +mssqlserverInet.driver=com.inet.tds.TdsDriver +mssqlserverInet.classes=${jdbc.lib.class.path}/Merlia.jar +mssqlserverInet.poolName=cts-mssqlserver-Inet-pool +mssqlserverInet.dataSource=com.inet.tds.TdsDataSource +mssqlserverInet.properties=user\=${mssqlserverInet.user}:password\=${mssqlserverInet.passwd}:ServerName\=${mssqlserverInet.server}:port\=${mssqlserverInet.port} + +## +## Info for Microsoft SQL Server using the Sun driver +## +mssqlserverSun.dbName=cts +mssqlserverSun.server=${orb.host} +mssqlserverSun.port=1433 +mssqlserverSun.dml.file=mssqlserver/mssqlserver.dml.sql +mssqlserverSun.user=guest +mssqlserverSun.passwd=guest +mssqlserverSun.url=jdbc:sun:sqlserver://${mssqlserverSun.server}:${mssqlserverSun.port} +mssqlserverSun.driver=com.sun.sql.jdbc.sqlserver.SQLServerDriver +mssqlserverSun.classes=${jdbc.lib.class.path}/smsqlserver.jar +mssqlserverSun.poolName=cts-mssqlserver-Sun-pool +mssqlserverSun.dataSource=com.sun.sql.jdbcx.sqlserver.SQLServerDataSource +mssqlserverSun.properties=user\=${mssqlserverSun.user}:password\=${mssqlserverSun.passwd}:ServerName\=${mssqlserverSun.server}:portNumber\=${mssqlserverSun.port}:selectMethod\=cursor + +## +## Info for MYSQL driver +## +mysql.dbName=cts +mysql.server=${orb.host} +mysql.port=3306 +mysql.dml.file=mysql/mysql.dml.sql +mysql.user=cts1 +mysql.passwd=cts1 +mysql.url=jdbc:mysql://${mysql.server}:${mysql.port}/${mysql.dbName} +mysql.driver=com.mysql.jdbc.Driver +mysql.classes=${jdbc.lib.class.path}/mysql-connector-java-5.1.42-bin.jar +mysql.poolName=cts-mysql-pool +mysql.dataSource=com.mysql.jdbc.jdbc2.optional.MysqlDataSource +mysql.properties=user\=${mysql.user}:password\=${mysql.passwd}:DatabaseName\=${mysql.dbName}\:ServerName\=${mysql.server}\:port\=${mysql.port}\:jdbcCompliantTruncation\=false + +## +## Info for Oracle DataDirect +## +oracleDD.dbName=ora817 +oracleDD.server=${orb.host} +oracleDD.port=1521 +oracleDD.dml.file=oracle/oracle.dml.sql +oracleDD.user=la +oracleDD.passwd=la +oracleDD.url=jdbc:datadirect:oracle://${oracleDD.server};SID=${oracleDD.dbName} +oracleDD.driver=com.ddtek.jdbc.oracle.OracleDriver +oracleDD.classes=${jdbc.lib.class.path}/base.jar${pathsep}${jdbc.lib.class.path}/oracle.jar${pathsep}${jdbc.lib.class.path}/util.jar +oracleDD.poolName=cts-oracle-DataDirect-pool +oracleDD.dataSource=com.ddtek.jdbcx.oracle.OracleDataSource +oracleDD.properties=user\=${oracleDD.user}:password\=${oracleDD.passwd}:SID\="${oracleDD.dbName}":serverName=${oracleDD.server}:portNumber=${oracleDD.port} + +## +## Info for Oracle thin +## +oracle.dbName=cts +oracle.server=${orb.host} +oracle.port=1521 +oracle.dml.file=oracle/oracle.dml.sql +oracle.user=cts1 +oracle.passwd=cts1 +oracle.url=jdbc:oracle:thin:@${oracle.server}:${oracle.port}:${oracle.dbName} +oracle.driver=oracle.jdbc.OracleDriver +oracle.classes=${jdbc.lib.class.path}/ojdbc8.jar +oracle.poolName=cts-oracle-pool +oracle.dataSource=oracle.jdbc.pool.OracleDataSource +oracle.pool.url=jdbc\\:oracle\\:thin\\:@${oracle.server}\\:${oracle.port}\\:${oracle.dbName} +oracle.properties=user\=${oracle.user}:password\=${oracle.passwd}:URL\=\"${oracle.pool.url}\" + +# +# Info for Oracle oci driver +# +oracleOCI.dbName=cts1 +oracleOCI.server=${orb.host} +oracleOCI.port=1521 +oracleOCI.dml.file=oracle/oracle.dml.sql +oracleOCI.user=cts1 +oracleOCI.passwd=cts1 +oracleOCI.url=jdbc:oracle:oci:@${oracleOCI.dbName} +oracleOCI.driver=oracle.jdbc.OracleDriver +oracleOCI.classes=${jdbc.lib.class.path}/ojdbc8.jar +oracleOCI.poolName=cts-oracle-oci-pool +oracleOCI.dataSource=oracle.jdbc.pool.OracleDataSource +oracleOCI.pool.url=jdbc\\:oracle\\:oci\\:@${oracleOCI.dbName} +oracleOCI.properties=user\=${oracleOCI.user}:password\=${oracleOCI.passwd}:URL\=\"${oracleOCI.pool.url}\" + +## +## Info for Oracle inet +## +oracleInet.dbName=cts1 +oracleInet.server=${orb.host} +oracleInet.port=1521 +oracleInet.dml.file=oracle/oracle.dml.sql +oracleInet.user=cts1 +oracleInet.passwd=cts1 +oracleInet.url=jdbc:inetora:${oracleInet.server}:${oracleInet.port}:${oracleInet.dbName} +oracleInet.driver=com.inet.ora.OraDriver +oracleInet.classes=${jdbc.lib.class.path}/Oranxo.jar +oracleInet.poolName=cts-oracle-Inet-pool +oracleInet.dataSource=com.inet.ora.OraDataSource +oracleInet.properties=user\=${oracleInet.user}:password\=${oracleInet.passwd}:serviceName\="${oracleInet.dbName}":serverName=${oracleInet.server}:port=${oracleInet.port} + +## +## Info for Oracle Sun +## +oracleSun.dbName=ora817 +oracleSun.server=${orb.host} +oracleSun.port=1521 +oracleSun.dml.file=oracle/oracle.dml.sql +oracleSun.user=la +oracleSun.passwd=la +oracleSun.url=jdbc:sun:oracle://${oracleSun.server};SID=${oracleSun.dbName} +oracleSun.driver=com.sun.sql.jdbc.oracle.OracleDriver +oracleSun.classes=${jdbc.lib.class.path}/smoracle.jar +oracleSun.poolName=cts-oracle-Sun-pool +oracleSun.dataSource=com.sun.sql.jdbcx.oracle.OracleDataSource +oracleSun.properties=user\=${oracleSun.user}:password\=${oracleSun.passwd}:SID\="${oracleSun.dbName}":serverName=${oracleSun.server}:portNumber=${oracleSun.port} + +## +## Info for Pointbase +## +pointbase.dbName=cts +pointbase.server=${orb.host} +pointbase.port=9092 +pointbase.dml.file=pointbase/pointbase.dml.sql +pointbase.user=PBPUBLIC +pointbase.passwd=PBPUBLIC +pointbase.url=jdbc:pointbase:server://${pointbase.server}:${pointbase.port}/${pointbase.dbName},new +pointbase.driver=com.pointbase.jdbc.jdbcUniversalDriver +pointbase.classes=${jdbc.lib.class.path}/pbclient.jar${pathsep}${jdbc.lib.class.path}/pbembedded.jar +pointbase.poolName=cts-pointbase-pool +pointbase.dataSource=com.pointbase.jdbc.jdbcDataSource +pointbase.pool.url="jdbc\\:pointbase\\:server\\:\/\/${pointbase.server}\\:${pointbase.port}\/${pointbase.dbName},new" +pointbase.properties=user\=${pointbase.user}:password\=${pointbase.passwd}:DatabaseName\=\"${pointbase.pool.url}\" + +## +## Info for Postgres +## +postgresql.dbName=CTS5 +postgresql.server=${orb.host} +postgresql.port=5432 +postgresql.dml.file=postgresql/postgresql.dml.sql +postgresql.user=cts1 +postgresql.passwd=cts1 +postgresql.url=jdbc:postgresql://${postgresql.server}:${postgresql.port}/${postgresql.dbName} +postgresql.driver=org.postgresql.Driver +postgresql.classes=${jdbc.lib.class.path}/postgresql-8.4-701.jdbc4.jar +postgresql.poolName=cts-postgresql-pool +postgresql.pool.url="jdbc\\:postgresql\\:server\\:\/\/${postgresql.server}\\:${postgresql.port}\/${postgresql.dbName},new" +postgresql.dataSource=org.postgresql.ds.PGSimpleDataSource +postgresql.properties=user\=${postgresql.user}:password\=${postgresql.passwd}:DatabaseName\=${postgresql.dbName}\:ServerName\=${postgresql.server}\:port\=${postgresql.port} + +## +## Info for Sybase (jConnect Driver) +## +sybase.dbName=cts2 +sybase.server=${orb.host} +sybase.port=4100 +sybase.dml.file=sybase/sybase.dml.sql +sybase.user=cts1 +sybase.passwd=cts1 +sybase.url=jdbc:sybase:Tds:${sybase.server}:${sybase.port}/${sybase.dbName} +sybase.driver=com.sybase.jdbc2.jdbc.SybDriver +sybase.classes=${jdbc.lib.class.path}/jconn2.jar +sybase.poolName=cts-sybase-pool +sybase.dataSource= com.sybase.jdbc2.jdbc.SybDataSource +sybase.properties=user\=${sybase.user}:password\=${sybase.passwd}:DatabaseName\=${sybase.dbName}\:ServerName\=${sybase.server}\:PortNumber\=${sybase.port}\:BE_AS_JDBC_COMPLIANT_AS_POSSIBLE\=true\:FAKE_METADATA\=true + +## +## Info for Sybase (Inet Driver) +## +sybaseInet.dbName=cts2 +sybaseInet.server=${orb.host} +sybaseInet.port=4100 +sybaseInet.dml.file=sybase/sybase.dml.sql +sybaseInet.user=cts1 +sybaseInet.passwd=cts1 +sybaseInet.url=jdbc:inetsyb:${sybaseInet.server}:${sybaseInet.port}?database=${sybaseInet.dbName} +sybaseInet.driver=com.inet.syb.SybDriver +sybaseInet.classes=${jdbc.lib.class.path}/Sybelux.jar +sybaseInet.poolName=cts-sybase-Inet-pool +sybaseInet.dataSource= com.inet.syb.SybDataSource +sybaseInet.properties=user\=${sybaseInet.user}:password\=${sybaseInet.passwd}:DatabaseName\=${sybaseInet.dbName}\:ServerName\=${sybaseInet.server}\:PortNumber\=${sybaseInet.port} + + +## +## Info for Sybase using the DataDirect driver +## +sybaseDD.dbName=cts2 +sybaseDD.server=${orb.host} +sybaseDD.port=4100 +sybaseDD.dml.file=sybase/sybase.dml.sql +sybaseDD.user=cts1 +sybaseDD.passwd=cts1 +sybaseDD.url=jdbc:datadirect:sybase://${sybaseDD.server}:${sybaseDD.port} +sybaseDD.driver=com.ddtek.jdbc.sybase.SybaseDriver +sybaseDD.classes=${jdbc.lib.class.path}/util.jar${pathsep}${jdbc.lib.class.path}/sybase.jar${pathsep}${jdbc.lib.class.path}/base.jar +sybaseDD.poolName=cts-sybase-DataDirect-pool +sybaseDD.dataSource=com.ddtek.jdbcx.sybase.SybaseDataSource +sybaseDD.properties=user\=${sybaseDD.user}:password\=${sybaseDD.passwd}:ServerName\=${sybaseDD.server}:portNumber\=${sybaseDD.port}:selectMethod\=cursor:DatabaseName\=${sybaseDD.dbName} + +## +## Info for Sybase using the Sun driver +## +sybaseSun.dbName=cts2 +sybaseSun.server=${orb.host} +sybaseSun.port=4100 +sybaseSun.dml.file=sybase/sybase.dml.sql +sybaseSun.user=cts1 +sybaseSun.passwd=cts1 +sybaseSun.url=jdbc:sun:sybase://${sybaseSun.server}:${sybaseSun.port} +sybaseSun.driver=com.sun.sql.jdbc.sybase.SybaseDriver +sybaseSun.classes=${jdbc.lib.class.path}/smsybase.jar +sybaseSun.poolName=cts-sybase-Sun-pool +sybaseSun.dataSource=com.sun.sql.jdbcx.sybase.SybaseDataSource +sybaseSun.properties=user\=${sybaseSun.user}:password\=${sybaseSun.passwd}:ServerName\=${sybaseSun.server}:portNumber\=${sybaseSun.port}:selectMethod\=cursor:DatabaseName\=${sybaseSun.dbName} + +############################################################### +## The following database configuration section is for the CTS +## interop tests which require a database that is used by the +## reference implementation. These entries should not be changed. +# @derby.dbName.ri -- Database Name +# @derby.server.ri -- Database Server +# @derby.port.ri -- Database Server port +# @derby.dml.file.ri -- DML file used for CTS test cases +# @derby.user.ri -- User Id configured +# @derby.passwd.ri -- User password configured +# @derby.url.ri -- URL to the cts database +# @derby.driver.ri -- DriverManager driver +# @derby.classes.ri -- CLASSPATH to JDBC driver classes +# @derby.poolName.ri -- Name of pool configured in the Java EE +# RI (do not change!) +# @derby.dataSource.ri -- DataSource driver +# @derby.properties.ri -- Any additional JDBC driver required +# properties +# @derby.startup.delay.ri -- delay to wait for DB to start +############################################################### +derby.dbName.ri=derbyDBri +derby.server.ri=${orb.host.ri} +derby.port.ri=1527 +derby.dml.file.ri=derby/derby.dml.sql +derby.user.ri=cts1 +derby.passwd.ri=cts1 +derby.url.ri=jdbc:derby://${derby.server.ri}:${derby.port.ri}/${derby.dbName.ri};create=true +derby.driver.ri=org.apache.derby.jdbc.ClientDriver +derby.home.ri=${javaee.home.ri}/../javadb +derby.system.home.ri=${derby.home.ri}/databases +derby.classpath.ri=${ts.home}/lib/dbprocedures.jar${pathsep}${derby.home.ri}/lib/derbynet.jar${pathsep}${derby.home.ri}/lib/derbyshared.jar${pathsep}${derby.home.ri}/lib/derbytools.jar +derby.classes.ri=${derby.home.ri}/lib/derbyclient.jar{pathsep}${derby.home.ri}/lib/derbyshared.jar${pathsep}${derby.home.ri}/lib/derbytools.jar +derby.poolName.ri=cts-derby-pool +derby.dataSource.ri=org.apache.derby.jdbc.ClientDataSource +derby.properties.ri=DatabaseName\=\"${derby.dbName.ri}\":user\=${derby.user.ri}:password\=${derby.passwd.ri}:serverName\=${derby.server.ri}:portNumber=${derby.port.ri} +derby.startup.delay.ri=5 +############################################################### +# @alt.dtd.dir DTD location for Java EE and RI xml files. Used +# for xml validation when building tests. If +# javaee.home.ri is set, /lib/dtds +# will be used and alt.dtd.dir is ignored. +# @alt.schema.dir schema location for Java EE and RI xml files. +# Used for xml validation when building tests. +# If javaee.home.ri is set, +# /lib/schemas will be used and +# alt.schema.dir is ignored. +############################################################### +alt.dtd.dir=${ts.home}/lib/dtds +alt.schema.dir=${ts.home}/lib/schemas + +############################################################### +## Configure the behavior of which tables CTS will create when +## ant init.[datbaseName] is invoked. +# +# @create.cmp.tables - When set to false, the appserver is +# responsible for creating cmp tables +# at deployment of the ejb/ear +# When set to true, init.[datbaseName] +# will create the tables used by CMP +# EJBs. The sql for the CMP tables are +# contained in: +# $TS_HOME/[datbaseName]/sql/[databaseName].ddl.cmp.sql +# $TS_HOME/[datbaseName]/sql/[databaseName].ddl.interop.sql +# +############################################################### +create.cmp.tables=true + +############################################################### +# @jdbc.poolName - Configure the connection pool that will be +# tested in this cts test run. +# +# @jdbc.maxpoolsize - This property defines the max pool size +# when creating JDBC connection pools. +# +# @jdbc.steadypoolsize - This property defines the steady pool size +# when creating JDBC connection pools. +############################################################### +jdbc.poolName=${derby.poolName} +jdbc.maxpoolsize=64 +jdbc.steadypoolsize=32 + +############################################################### +## These properties are use for the CTS +## interop tests which require a database that is used by the +## reference implementation. +# +# @jdbc.poolName.ri - Configure the connection pool that will be +# use when configuring the JDBC connection +# pools for the reference implemetation. +# +# @jdbc.maxpoolsize.ri - This property defines the max pool size +# when creating JDBC connection pools. +# +# @jdbc.steadypoolsize.ri - This property defines the steady pool size +# when creating JDBC connection pools. +############################################################### +jdbc.poolName.ri=${derby.poolName.ri} +jdbc.maxpoolsize.ri=96 +jdbc.steadypoolsize.ri=32 + +############################################################### +# @jdbc.datasource.props - Used to to specify Vendor specific +# properties and less commonly used DataSource properties. +# Its value is a comma-separated array of name-value pairs. +# Each property pair follows the format of "name=value", +# including the surrounding double quotes. +# +# The value of this property must not contain any extra spaces. +# +# In most cases, this property is not needed and therefore +# commented out. +# +############################################################### +#jdbc.datasource.props="driverType=thin","name2=value2" + +############################################################### +# @jdbc.db - The name of the currently configured DB. This +# value is the prefix of the DB properties currently +# being used. Some valid values are; derby and +# derbyEmbedded. See the other DB property +# names for other valid values. +############################################################### +jdbc.db=derby +jdbc.db.classes=${derby.classes} + +############################################################### +## These properties are configurable and must specify valid +## usernames and passwords to establish JDBC connections to +## backend RDBMS. +## +# @user1 - Set this to the user for the jdbc/DB1 resource +# @password1 - Set this to the password for the jdbc/DB1 resource +# @user2 - Set this to the user for the jdbc/DB2 resource +# @password2 - Set this to the password for the jdbc/DB2 resource +# @user3 - Set this to the user for the jdbc/DBTimer resource +# @password3 - Set this to the password for the jdbc/DBTimer resource +############################################################### +user1=cts1 +password1=cts1 +user2=cts1 +password2=cts1 +user3=${derby.user} +password3=${derby.passwd} + +############################################################### +## Configure the dml file to use +# @db.dml.file - dml file for VI +# @db.dml.file.ri - dml file for RI +############################################################### +db.dml.file=${derby.dml.file} +db.dml.file.ri=${derby.dml.file} + +############################################################### +## Configure the DB specific information needed by JSTL +# @jstl.db.driver - JDBC driver +# @jstl.db.url - DB URL +############################################################### +jstl.db.driver=${derby.driver} +jstl.db.url=${derby.url} + +######################################################################## +# +# @jtaJarClasspath: This property must be set when running signature +# tests. This property should be set to the Path +# for the JTA API jar. +# +######################################################################## +jtaJarClasspath=${s1as.modules}/jakarta.transaction-api.jar + +############################################################### +## Classpath properties required by CTS: +# @javaee.classes.ri -- Classes required by Java EE RI +# @ts.run.classpath.ri -- Classpath required by Java EE RI +# appclient container. +# @ts.run.classpath -- Classpath required by the vendor +# appclient container. +# @ts.harness.classpath -- Classes required by javatest +# @ts.classpath -- Classes used to build the CTS tests +# @ts.lib.classpath -- Classes used to build cts.jar +############################################################### +implementation.classes.ri=${ri.modules}/orb-connector.jar${pathsep}${ri.modules}/deployment-client.jar${pathsep}${ri.modules}/security-ee.jar${pathsep}${ri.modules}/security.jar${pathsep}${ri.modules}/common-util.jar${pathsep}${ri.modules}/glassfish-corba-omgapi.jar${pathsep}${ri.modules}/glassfish-corba-orb.jar${pathsep}${ri.modules}/internal-api.jar${pathsep}${ri.modules}/deployment-common.jar${pathsep}${ri.modules}/gmbal.jar${pathsep}${ri.modules}/bean-validator.jar${pathsep}${ri.modules}/jersey-client.jar${pathsep}${ri.modules}/jersey-common.jar${pathsep}${ri.modules}/jersey-hk2.jar${pathsep}${ri.modules}/jersey-media-jaxb.jar${pathsep}${ri.modules}/jersey-media-sse.jar${pathsep}${ri.modules}/jersey-media-json-processing.jar${pathsep}${ri.modules}/jsonp-jaxrs.jar${pathsep}${ri.modules}/jersey-media-json-binding.jar${pathsep}${ri.modules}/jersey-server.jar${pathsep}${ri.modules}/jersey-container-servlet.jar${pathsep}${ri.modules}/jersey-container-servlet-core.jar${pathsep}${ri.modules}/guava.jar${pathsep}${ri.modules}/jakarta.el.jar${pathsep}${ri.modules}/jakarta.el-api.jar${pathsep}${ri.modules}/tyrus-websocket-core.jar${pathsep}${ri.modules}/tyrus-client.jar${pathsep}${ri.modules}/tyrus-container-grizzly-client.jar${pathsep}${ri.modules}/tyrus-core.jar${pathsep}${ri.modules}/tyrus-container-grizzly.jar${pathsep}${ri.modules}/tyrus-container-grizzly-client.jar${pathsep}${ri.modules}/glassfish-grizzly-extra-all.jar${pathsep}${ri.modules}/nucleus-grizzly-all.jar${pathsep}${ri.modules}/tyrus-server.jar${pathsep}${ri.modules}/tyrus-container-servlet.jar${pathsep}${ri.modules}/tyrus-spi.jar${pathsep}${ri.modules}/yasson.jar${pathsep}${ri.modules}/jakarta.websocket-client-api.jar${pathsep}${ri.modules}/parsson.jar${pathsep}${ri.modules}/parsson-media.jar${pathsep}${ri.modules}/angus-activation.jar${pathsep}${ri.modules}/angus-mail.jar${pathsep}${ri.modules}/expressly.jar + +implementation.classes=${s1as.modules}/deployment-client.jar${pathsep}${s1as.modules}/security.jar${pathsep}${s1as.modules}/common-util.jar${pathsep}${s1as.modules}/glassfish-corba-omgapi.jar${pathsep}${s1as.modules}/deployment-common.jar${pathsep}${s1as.modules}/gmbal.jar${pathsep}${s1as.modules}/bean-validator.jar${pathsep}${s1as.modules}/jakarta.ws.rs-api.jar${pathsep}${s1as.modules}/jersey-client.jar${pathsep}${s1as.modules}/jersey-common.jar${pathsep}${s1as.modules}/jersey-hk2.jar${pathsep}${s1as.modules}/jersey-media-jaxb.jar${pathsep}${s1as.modules}/jersey-media-sse.jar${pathsep}${s1as.modules}/jersey-media-json-processing.jar${pathsep}${s1as.modules}/jsonp-jaxrs.jar${pathsep}${s1as.modules}/jersey-media-json-binding.jar${pathsep}${s1as.modules}/jersey-server.jar${pathsep}${s1as.modules}/jersey-container-servlet.jar${pathsep}${s1as.modules}/jersey-container-servlet-core.jar${pathsep}${s1as.modules}/guava.jar${pathsep}${s1as.modules}/jakarta.el.jar${pathsep}${s1as.modules}/jakarta.el-api.jar${pathsep}${s1as.modules}/tyrus-websocket-core.jar${pathsep}${s1as.modules}/tyrus-client.jar${pathsep}${s1as.modules}/tyrus-core.jar${pathsep}${s1as.modules}/tyrus-container-grizzly.jar${pathsep}${s1as.modules}/tyrus-container-grizzly-client.jar${pathsep}${s1as.modules}/glassfish-grizzly-extra-all.jar${pathsep}${s1as.modules}/nucleus-grizzly-all.jar${pathsep}${s1as.modules}/tyrus-server.jar${pathsep}${s1as.modules}/tyrus-container-servlet.jar${pathsep}${s1as.modules}/tyrus-spi.jar${pathsep}${s1as.modules}/yasson.jar${pathsep}${s1as.modules}/jakarta.websocket-client-api.jar${pathsep}${s1as.modules}/parsson.jar${pathsep}${s1as.modules}/parsson-media.jar${pathsep}${s1as.modules}/angus-activation.jar${pathsep}${s1as.modules}/angus-mail.jar${pathsep}${s1as.modules}/expressly.jar + +javaee.classes.ri=${ri.modules}/jakarta.jms-api.jar${pathsep}${ri.modules}/jakarta.json.jar${pathsep}${ri.modules}/jakarta.json-api.jar${pathsep}${ri.modules}/jakarta.json.bind-api.jar${pathsep}${ri.modules}/jakarta.ejb-api.jar${pathsep}${ri.modules}/jakarta.annotation-api.jar${pathsep}${ri.modules}/jakarta.enterprise.deploy-api.jar${pathsep}${ri.modules}/jakarta.mail.jar${pathsep}${ri.modules}/jakarta.mail-api.jar${pathsep}${ri.modules}/jakarta.persistence.jar${pathsep}${ri.modules}/jakarta.persistence-api.jar${pathsep}${ri.modules}/jakarta.resource-api.jar${pathsep}${ri.modules}/jakarta.security.auth.message-api.jar${pathsep}${ri.modules}/jakarta.authentication-api.jar${pathsep}${ri.modules}/jakarta.security.jacc-api.jar${pathsep}${ri.modules}/jakarta.authorization-api.jar${pathsep}${ri.modules}/jakarta.interceptor-api.jar${pathsep}${ri.modules}/jakarta.servlet-api.jar${pathsep}${ri.modules}/jakarta.servlet.jsp-api.jar${pathsep}${ri.modules}/jakarta.transaction-api.jar${pathsep}${ri.modules}/jakarta.xml.bind-api.jar${pathsep}${ri.modules}/jaxb-osgi.jar${pathsep}${ri.modules}/jmxremote_optional-repackaged.jar${pathsep}${ri.modules}/jakarta.faces.jar${pathsep}${ri.modules}/jakarta.faces-api.jar${pathsep}${ri.modules}/jakarta.servlet.jsp.jstl.jar${pathsep}${ri.modules}/jakarta.servlet.jsp.jstl-api.jar${pathsep}${ri.modules}/webservices-osgi.jar${pathsep}${ri.modules}/webservices-api-osgi.jar${pathsep}${ri.modules}/ejb.security.jar${pathsep}${ri.modules}/glassfish-corba-csiv2-idl.jar${pathsep}${ri.modules}/weld-osgi-bundle.jar${pathsep}${implementation.classes.ri}${pathsep}${ri.modules}/javamail-connector.jar${pathsep}${ri.modules}/javamail-runtime.jar${pathsep}${ri.modules}/jakarta.websocket-api.jar${pathsep}${ri.modules}/jakarta.enterprise.concurrent-api.jar${pathsep}${ri.modules}/jakarta.enterprise.cdi-api.jar${pathsep}${ri.modules}/jakarta.security.enterprise-api.jar${pathsep}${ri.modules}/resolver.jar${pathsep}${ri.modules}/jakarta.websocket-client-api.jar${pathsep}${ri.modules}/parsson.jar${pathsep}${s1as.modules}/parsson-media.jar${pathsep}${ri.modules}/angus-activation.jar${pathsep}${s1as.modules}/angus-mail.jar${pathsep}${s1as.modules}/expressly.jar${pathsep}${ri.modules}/webservices-extra-jdk-packages.jar${pathsep}${ri.modules}/webservices-connector.jar${pathsep}${ri.modules}/webservices-extra-xmlsec.jar${pathsep}${ri.modules}/webservices.security.jar + +javaee.classes=${s1as.modules}/jakarta.jms-api.jar${pathsep}${s1as.modules}/jakarta.json.jar${pathsep}${s1as.modules}/jakarta.json-api.jar${pathsep}${s1as.modules}/jakarta.json.bind-api.jar${pathsep}${s1as.modules}/jakarta.ejb-api.jar${pathsep}${s1as.modules}/jakarta.annotation-api.jar${pathsep}${s1as.modules}/jakarta.enterprise.deploy-api.jar${pathsep}${s1as.modules}/jakarta.mail.jar${pathsep}${s1as.modules}/jakarta.mail-api.jar${pathsep}${s1as.modules}/jakarta.persistence.jar${pathsep}${s1as.modules}/jakarta.persistence-api.jar${pathsep}${s1as.modules}/jakarta.resource-api.jar${pathsep}${s1as.modules}/jakarta.security.auth.message-api.jar${pathsep}${s1as.modules}/jakarta.security.jacc-api.jar${pathsep}${s1as.modules}/jakarta.authentication-api.jar${pathsep}${s1as.modules}/jakarta.authorization-api.jar${pathsep}${s1as.modules}/jakarta.servlet-api.jar${pathsep}${s1as.modules}/el-impl.jar${pathsep}${s1as.modules}/jakarta.servlet.jsp-api.jar${pathsep}${jtaJarClasspath}${pathsep}${s1as.modules}/jakarta.xml.bind-api.jar${pathsep}${s1as.modules}/jaxb-osgi.jar${pathsep}${s1as.modules}/jmxremote_optional-repackaged.jar${pathsep}${s1as.modules}/jakarta.faces.jar${pathsep}${s1as.modules}/jakarta.faces-api.jar${pathsep}${s1as.modules}/jakarta.servlet.jsp.jstl.jar${pathsep}${ri.modules}/jakarta.servlet.jsp.jstl-api.jar${pathsep}${s1as.modules}/webservices-osgi.jar${pathsep}${s1as.modules}/webservices-api-osgi.jar${pathsep}${s1as.modules}/jakarta.management.j2ee-api.jar${pathsep}${s1as.modules}/ejb.security.jar${pathsep}${s1as.modules}/glassfish-corba-csiv2-idl.jar${pathsep}${s1as.modules}/weld-osgi-bundle.jar${pathsep}${implementation.classes}${pathsep}${s1as.modules}/javamail-connector.jar${pathsep}${s1as.modules}/javamail-runtime.jar${pathsep}${s1as.modules}/jakarta.websocket-api.jar${pathsep}${s1as.modules}/jakarta.enterprise.concurrent-api.jar${pathsep}${s1as.modules}/jakarta.enterprise.cdi-api.jar$${pathsep}${s1as.modules}/jakarta.xml.ws-api.jar${pathsep}${s1as.modules}/jakarta.xml.bind-api.jar${pathsep}${s1as.modules}/jakarta.security.enterprise-api.jar${pathsep}${s1as.modules}/jakarta.inject-api.jar${pathsep}${s1as.modules}/jakarta.activation-api.jar${pathsep}${s1as.modules}/jakarta.validation-api.jar${pathsep}${s1as.modules}/resolver.jar${pathsep}${s1as.modules}/jakarta.websocket-client-api.jar${pathsep}${s1as.modules}/parsson.jar${pathsep}${s1as.modules}/parsson-media.jar${pathsep}${s1as.modules}/angus-activation.jar${pathsep}${s1as.modules}/angus-mail.jar${pathsep}${s1as.modules}/expressly.jar${pathsep}${s1as.modules}/webservices-extra-jdk-packages.jar${pathsep}${s1as.modules}/webservices-connector.jar${pathsep}${s1as.modules}/webservices-extra-xmlsec.jar${pathsep}${s1as.modules}/webservices.security.jar + +ts.run.classpath.ri=${javaee.classes.ri}${pathsep}${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/cts.jar${pathsep}${ts.home}/lib/glassfishporting.jar + +ts.run.classpath=${pathsep}${javaee.classes}${pathsep}${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/cts.jar${pathsep}${ts.home}/lib/glassfishporting.jar${pathsep}${jdbc.db.classes} + +ts.harness.classpath=${ts.home}/lib/jaxb-api.jar${pathsep}${ts.home}/lib/jaxb-core.jar${pathsep}${ts.home}/lib/jaxb-impl.jar${pathsep}${ts.home}/lib/jaxb-xjc.jar${pathsep}${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/cts.jar${pathsep}${ts.home}/lib/glassfishporting.jar${pathsep}${ts.home}/lib/sigtest.jar${pathsep}${ts.run.classpath}${pathsep}${ts.home}/lib/javatest.jar${pathsep}${ts.home}/lib/jdom-1.1.3.jar${pathsep}${ant.home}/lib/ant.jar${pathsep}${ri.modules}/admin-cli.jar + +#classpath used for building CTS tests only (DO NOT MODIFY) +ts.classpath=${ts.home}/lib/commons-lang3-3.3.2.jar${pathsep}${javaee.home.ri}/javadb/lib/derby.jar${pathsep}${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/cts.jar${pathsep}${ts.home}/lib/glassfishporting.jar${pathsep}${ts.home}/lib/sigtest.jar${pathsep}${ts.run.classpath}${pathsep}${ts.run.classpath.ri}${pathsep}${ts.home}/lib/javatest.jar${pathsep}${ts.home}/lib/jdom-1.1.3.jar${pathsep}${ant.home}/lib/ant.jar${pathsep}${ts.home}/lib/commons-httpclient-3.1.jar${pathsep}${ts.home}/lib/commons-logging-1.1.3.jar${pathsep}${ts.home}/lib/htmlunit-2.15.jar${pathsep}${ts.home}/lib/htmlunit-core-js-2.15.jar${pathsep}${ts.home}/lib/unboundid-ldapsdk.jar${pathsep}${ts.home}/lib/commons-codec-1.9.jar${pathsep}${ts.home}/lib/xml-apis-1.4.01.jar${pathsep}${ts.home}/lib/jaxb-api.jar +#classpath used for building cts.jar (DO NOT MODIFY) +ts.lib.classpath=${javaee.home.ri}/javadb/lib/derby.jar${pathsep}${ts.harness.classpath} + + +############################################################### +# @javaee.home.ri.classpathsuffix - The classpath suffix of +# the RI used in interop tests. Must contain the RI JDBC +# driver jars and the RMI interceptor classes. +############################################################### +javaee.home.ri.classpathsuffix=${javaee.home.ri}/lib/riinterceptors.jar${pathsep}${javaee.home.ri}/javadb/lib/derbyclient.jar + +############################################################### +# @s1as.classpathsuffix - The classpath suffix of +# the RI when being used as the app server under test. +############################################################### +s1as.classpathsuffix=${javaee.home}/lib/tsprovider.jar + +######################################################################## +## Common environment for both ts_unix and ts_win32 +# +# @command.testExecute - This command is used to execute any test +# clients which are not run inside an +# application client container. For example, +# any URL clients or standalone java clients +# would be executed with this command. Some +# test directories which make use of this command +# are servlet and jsp. +######################################################################## + +command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \ + CLASSPATH=${ts.harness.classpath}${pathsep}${ts.home}/classes${pathsep}\ + ${JAVA_HOME}/../lib/tools.jar${pathsep}\ + ${ri.modules}/security-ee.jar${pathsep}\ + ${ts.home}/lib/commons-httpclient-3.1.jar${pathsep}\ + ${ts.home}/lib/commons-logging-1.1.3.jar${pathsep}\ + ${ts.home}/lib/commons-codec-1.9.jar${pathsep}\ + ${ts.home}/lib/cssparser-0.9.25.jar${pathsep}\ + ${ts.home}/lib/htmlunit-2.15.jar${pathsep}\ + ${ts.home}/lib/htmlunit-core-js-2.15.jar${pathsep}\ + ${ts.home}/lib/httpcore-4.4.9.jar${pathsep}\ + ${ts.home}/lib/httpclient-4.5.5.jar${pathsep}\ + ${ts.home}/lib/httpmime-4.5.5.jar${pathsep}\ + ${ts.home}/lib/commons-collections-3.2.1.jar${pathsep}\ + ${ts.home}/lib/commons-io-2.4.jar${pathsep}\ + ${ts.home}/lib/commons-lang3-3.3.2.jar${pathsep}\ + ${ts.home}/lib/jaxen-1.1.6.jar${pathsep}\ + ${ts.home}/lib/nekohtml-1.9.21.jar${pathsep}\ + ${ts.home}/lib/sac-1.3.jar${pathsep}\ + ${ts.home}/lib/saxpath.jar${pathsep}\ + ${ts.home}/lib/xercesImpl-2.11.0.jar${pathsep}\ + ${ts.home}/lib/xalan-2.7.2.jar${pathsep}\ + ${ts.home}/lib/serializer-2.7.2.jar${pathsep}\ + ${ts.home}/lib/xml-apis-1.4.01.jar${pathsep}\ + ${ts.home}/lib/unboundid-ldapsdk.jar${pathsep}\ + ${jdbc.db.classes} \ + DISPLAY=${ts.display} \ + HOME="${user.home}" \ + TMP=${TMP} \ + windir=${windir} \ + SYSTEMROOT=${SYSTEMROOT} \ + PATH="${javaee.home}/nativelib" \ + ${JAVA_HOME}/bin/java \ + ${JVMOPTS_RUNTESTCOMMAND} \ + -Xss2048k \ + -Dcts.tmp=$harness.temp.directory \ + -Djava.protocol.handler.pkgs=javax.net.ssl \ + -Djavax.net.ssl.keyStore=${bin.dir}/certificates/clientcert.jks \ + -Djavax.net.ssl.keyStorePassword=changeit \ + -Djavax.net.ssl.trustStore=${s1as.domain}/${sjsas.instance.config.dir}/cacerts.jks \ + -Dcom.sun.aas.installRoot=${javaee.home} \ + -Dlog.file.location=${log.file.location} \ + -Dservlet.is.jsr115.compatible=${servlet.is.jsr115.compatible} \ + -Dprovider.configuration.file=${provider.configuration.file} \ + -Djava.security.properties=${s1as.domain}/${sjsas.instance.config.dir}/ts.java.security \ + -Dlogical.hostname.servlet=${logical.hostname.servlet} \ + -Dcom.sun.aas.configRoot=${javaee.home}/config \ + -Ddeliverable.class=${deliverable.class} $testExecuteClass $testExecuteArgs + +######################################################################## +## Appclient Command line for the App Server under test +## Licensees modify this command +# +# @command.testExecuteAppClient - This command is used to execute +# the application client container for +# the vendor implementation (vi). +# Please note that $TS_HOME/classes +# should not be in the classpath for +# this command since all client classes +# are self contained in the application +# archive (or referenced via the manifest). +######################################################################## +command.testExecuteAppClient= \ + com.sun.ts.lib.harness.ExecTSTestCmd DISPLAY=${ts.display} HOME="${user.home}" \ + LD_LIBRARY_PATH=${javaee.home}/lib \ + TMP=${TMP} \ + windir=${windir} \ + SYSTEMROOT=${SYSTEMROOT} \ + PATH="${javaee.home}/nativelib" \ + APPCPATH=${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/cts.jar${pathsep}${ts.home}/lib/glassfishporting.jar${pathsep}${javaee.home}/lib/jpa_alternate_provider.jar${pathsep}${ts.home}/lib/tssv.jar${pathsep}${javaee.home}/modules/weld-osgi-bundle.jar${pathsep}${javaee.home}/modules/jakarta.enterprise.cdi-api.jar \ + TZ=${tz} \ + ${JAVA_HOME}/bin/java \ + ${JVMOPTS_RUNTESTCOMMAND} \ + -Djava.system.class.loader=org.glassfish.appclient.client.acc.agent.ACCAgentClassLoader \ + -Djava.security.policy=${javaee.home}/lib/appclient/client.policy \ + -Dcts.tmp=$harness.temp.directory \ + -Djava.security.auth.login.config=${javaee.home}/lib/appclient/appclientlogin.conf \ + -Djava.protocol.handler.pkgs=javax.net.ssl \ + -Dcom.sun.enterprise.home=${javaee.home} \ + -Djavax.net.ssl.keyStore=${bin.dir}/certificates/clientcert.jks \ + -Djavax.net.ssl.keyStorePassword=changeit \ + -Dcom.sun.aas.installRoot=${javaee.home} \ + -Dcom.sun.aas.imqLib=${javaee.home}/../mq/lib \ + -Djavax.net.ssl.trustStore=${s1as.domain}/${sjsas.instance.config.dir}/cacerts.jks \ + -Djavax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl \ + -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl \ + -Djavax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl \ + -Dorg.xml.sax.driver=com.sun.org.apache.xerces.internal.parsers.SAXParser \ + -Dorg.xml.sax.parser=org.xml.sax.helpers.XMLReaderAdapter \ + -Doracle.jdbc.J2EE13Compliant=true \ + -Doracle.jdbc.mapDateToTimestamp \ + -Dstartup.login=false \ + -Dauth.gui=false \ + -Dlog.file.location=${log.file.location} \ + -Dri.log.file.location=${ri.log.file.location} \ + -DwebServerHost.2=${webServerHost.2} \ + -DwebServerPort.2=${webServerPort.2} \ + -Dprovider.configuration.file=${provider.configuration.file} \ + -Djava.security.properties=${s1as.domain}/${sjsas.instance.config.dir}/ts.java.security \ + -Dcom.sun.aas.configRoot=${javaee.home}/config \ + -Ddeliverable.class=${deliverable.class} -javaagent:${javaee.home}/lib/gf-client.jar=arg=-configxml,arg=${ts.home}/tmp/appclient/s1as.sun-acc.xml,client=jar=$testExecuteArgs + +#-Ddeliverable.class=${deliverable.class} -javaagent:${javaee.home}/modules/gf-client.jar=arg=-configxml,arg=${s1as.domain}/config/sun-acc.xml,client=jar=$testExecuteArgs +#-Xbootclasspath/a:${pathsep}${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/cts.jar + +######################################################################## +# @command.testExecuteEjbEmbed - Command line for standalone embedded EJB tests. +# Its classpath must include all the APIs required +# by EJB Lite, vendor's implementation classes and +# configuration for embeddable EJB container, and +# JDBC driver classes (e.g., ${db2.classes}, +# ${oracle.classes}, etc). +# +# Current test archives are dynamically added to +# the classpath by the harness, and need not be +# included in the classpath here. +# +# Most test directories contain one test archive, +# all named ejbembed_vehicle_ejb.jar. If certain +# tooling and pre-processing of test archives are +# needed, the resulting test archives must remain +# the same name and location. +# +# ${ts.home}/classes must not be in the classpath +# since all the required test classes are packaged +# in the test archive (ejbembed_vehicle_ejb.jar). In +# addition, including ${ts.home}/classes in the +# classpath would incorrectly expose all EJBs in +# cts to EJB container bootstrapping process. +######################################################################## +command.testExecuteEjbEmbed=com.sun.ts.lib.harness.ExecTSTestCmd \ + CLASSPATH=${ts.home}/lib/tsharness.jar${pathsep}\ + ${ts.home}/lib/cts.jar${pathsep}\ + ${ts.home}/lib/glassfishporting.jar${pathsep}\ + ${ts.home}/lib/commons-lang3-3.3.2.jar${pathsep}\ + ${jdbc.db.classes}${pathsep}\ + ${javaee.home}/lib/embedded/glassfish-embedded-static-shell.jar \ + DISPLAY=${ts.display} \ + HOME="${user.home}" \ + TMP=${TMP} \ + windir=${windir} \ + SYSTEMROOT=${SYSTEMROOT} \ + ${JAVA_HOME}/bin/java \ + ${JVMOPTS_RUNTESTCOMMAND} \ + -Dcts.tmp=$harness.temp.directory \ + -Djava.util.logging.config.file=${TS_HOME}/bin/client-logging.properties \ + -Dtest.ejb.stateful.timeout.wait.seconds=${test.ejb.stateful.timeout.wait.seconds} \ + -Ddeliverable.class=${deliverable.class} $testExecuteClass $testExecuteArgs + + +######################################################################## +## Appclient Command line for the Java EE RI (Do not modify) +######################################################################## +command.testExecuteAppClient2= \ + com.sun.ts.lib.harness.ExecTSTestCmd DISPLAY=${ts.display} HOME="${user.home}" \ + LD_LIBRARY_PATH=${javaee.home.ri}/lib \ + TMP=${TMP} \ + windir=${windir} \ + SYSTEMROOT=${SYSTEMROOT} \ + PATH="${javaee.home.ri}/nativelib" \ + APPCPATH=${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/cts.jar${pathsep}${ts.home}/lib/glassfishporting.jar${pathsep}${ts.home}/lib/riinterceptors.jar \ + TZ=${tz} \ + ${RI_JAVA_HOME}/bin/java \ + ${JVMOPTS_RUNTESTCOMMAND} \ + -Djava.system.class.loader=org.glassfish.appclient.client.acc.agent.ACCAgentClassLoader \ + -Djava.security.policy=${javaee.home.ri}/lib/appclient/client.policy \ + -Dcts.tmp=$harness.temp.directory \ + -Djava.security.auth.login.config=${javaee.home.ri}/lib/appclient/appclientlogin.conf \ + -Djava.protocol.handler.pkgs=javax.net.ssl \ + -Dcom.sun.enterprise.home=${javaee.home.ri} \ + -Djavax.net.ssl.keyStore=${bin.dir}/certificates/clientcert.jks \ + -Djavax.net.ssl.keyStorePassword=changeit \ + -Dcom.sun.aas.installRoot=${javaee.home.ri} \ + -Dcom.sun.aas.imqLib=${javaee.home.ri}/../mq/lib \ + -Djavax.net.ssl.trustStore=${ri.domain}/config/cacerts.jks \ + -Djavax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl \ + -Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl \ + -Djavax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl \ + -Dorg.xml.sax.driver=com.sun.org.apache.xerces.internal.parsers.SAXParser \ + -Dorg.xml.sax.parser=org.xml.sax.helpers.XMLReaderAdapter \ + -Doracle.jdbc.J2EE13Compliant=true \ + -Doracle.jdbc.mapDateToTimestamp \ + -Dstartup.login=false \ + -Dauth.gui=false \ + -Dlog.file.location=${log.file.location} \ + -Dri.log.file.location=${ri.log.file.location} \ + -DwebServerHost.2=${webServerHost.2} \ + -DwebServerPort.2=${webServerPort.2} \ + -Dprovider.configuration.file=${provider.configuration.file} \ + -Djava.security.properties=${s1as.domain}/${sjsas.instance.config.dir}/ts.java.security \ + -Dcom.sun.aas.configRoot=${javaee.home.ri}/config \ + -Ddeliverable.class=${deliverable.class} -javaagent:${javaee.home.ri}/lib/gf-client.jar=arg=-configxml,arg=${ts.home}/tmp/appclient/ri.sun-acc.xml,client=jar=$testExecuteArgs + +######################################################################## +## Command line for standalone clients running against the +## Java EE RI (Do not modify) +######################################################################## +command.testExecute2=com.sun.ts.lib.harness.ExecTSTestCmd \ + CLASSPATH=${ts.harness.classpath}${pathsep}${ts.home}/classes${pathsep}\ + ${ts.home}/lib/commons-httpclient-3.1.jar${pathsep}\ + ${ts.home}/lib/commons-logging-1.1.3.jar${pathsep}\ + ${ts.home}/lib/commons-codec-1.9.jar${pathsep}\ + ${ts.home}/lib/cssparser-0.9.25.jar${pathsep}\ + ${ts.home}/lib/htmlunit-2.15.jar${pathsep}\ + ${ts.home}/lib/htmlunit-core-js-2.15.jar${pathsep}\ + ${ts.home}/lib/httpcore-4.4.9.jar${pathsep}\ + ${ts.home}/lib/httpclient-4.5.5.jar${pathsep}\ + ${ts.home}/lib/httpmime-4.5.5.jar${pathsep}\ + ${ts.home}/lib/commons-collections-3.2.1.jar${pathsep}\ + ${ts.home}/lib/commons-io-2.4.jar${pathsep}\ + ${ts.home}/lib/commons-lang3-3.3.2.jar${pathsep}\ + ${ts.home}/lib/jaxen-1.1.6.jar${pathsep}\ + ${ts.home}/lib/nekohtml-1.9.21.jar${pathsep}\ + ${ts.home}/lib/sac-1.3.jar${pathsep}\ + ${ts.home}/lib/saxpath.jar${pathsep}\ + ${ts.home}/lib/xercesImpl-2.11.0.jar${pathsep}\ + ${ts.home}/lib/xalan-2.7.2.jar${pathsep}\ + ${ts.home}/lib/serializer-2.7.2.jar${pathsep}\ + ${ts.home}/lib/xml-apis-1.4.01.jar \ + ${ts.home}/lib/unboundid-ldapsdk.jar\ + DISPLAY=${ts.display} \ + HOME="${user.home}" \ + TMP=${TMP} \ + windir=${windir} \ + SYSTEMROOT=${SYSTEMROOT} \ + PATH="${javaee.home}/nativelib" \ + ${RI_JAVA_HOME}/bin/java \ + ${JVMOPTS_RUNTESTCOMMAND} \ + -Dcts.tmp=$harness.temp.directory \ + -Djava.protocol.handler.pkgs=javax.net.ssl \ + -Djavax.net.ssl.keyStore=${bin.dir}/certificates/clientcert.jks \ + -Djavax.net.ssl.keyStorePassword=changeit \ + -Djavax.net.ssl.trustStore=${ri.domain}/${ri.instance.config.dir}/cacerts.jks \ + -Ddeliverable.class=${deliverable.class} $testExecuteClass $testExecuteArgs + +######################################################################### +## Environment for ts_unix +## 3 test execution commands inherit from common environment +## defined above: testExecuteAppClient2, testExecuteAppClient, and +## testExecute. If you need to override them, uncomment them in the +## following section. +######################################################################### +env.ts_unix.menu=true +##env.ts_unix.command.testExecute= +##env.ts_unix.command.testExecuteAppClient= +##env.ts_unix.command.testExecuteAppClient2= + + +######################################################################## +## Environment for ts_win32 +## 3 test execution commands inherit from common environment +## defined above: testExecuteAppClient2, testExecuteAppClient, and +## testExecute. If you need to override them, uncomment them in the +## following section. +######################################################################## +env.ts_win32.menu=true +##env.ts_win32.command.testExecute= +##env.ts_win32.command.testExecuteAppClient= +##env.ts_win32.command.testExecuteAppClient2= + +######################################################################### +# @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). +######################################################################### + +jimage.dir=${ts.home}/tmp/jdk-bundles + +sigTestClasspath=${s1as.modules}/glassfish-corba-omgapi.jar${pathsep}${s1as.modules}/glassfish-corba-orb.jar${pathsep}${s1as.modules}/jakarta.enterprise.cdi-api.jar${pathsep}${s1as.modules}/jakarta.json-api.jar${pathsep}${s1as.modules}/jakarta.json.bind-api.jar${pathsep}${s1as.modules}/jakarta.batch-api.jar${pathsep}${s1as.modules}/jakarta.interceptor-api.jar${pathsep}${s1as.modules}/stax2-api.jar${pathsep}${s1as.modules}/jakarta.enterprise.concurrent-api.jar${pathsep}${s1as.modules}/jakarta.websocket-api.jar${pathsep}${s1as.modules}/jakarta.websocket-client-api.jar${pathsep}${s1as.modules}/jakarta.jms-api.jar${pathsep}${s1as.modules}/jakarta.faces.jar${pathsep}${s1as.modules}/jakarta.validation-api.jar${pathsep}${s1as.modules}/jakarta.annotation-api.jar${pathsep}${s1as.modules}/jakarta.xml.bind-api.jar${pathsep}${s1as.modules}/webservices-api-osgi.jar${pathsep}${pathsep}${s1as.modules}/jakarta.ws.rs-api.jar${pathsep}${s1as.modules}/weld-osgi-bundle.jar${pathsep}${s1as.modules}/jakarta.ejb-api.jar${pathsep}${s1as.modules}/jakarta.mail-api.jar${pathsep}${s1as.modules}/jakarta.persistence-api.jar${pathsep}${s1as.modules}/jakarta.resource-api.jar${pathsep}${s1as.modules}/jakarta.authorization-api.jar${pathsep}${s1as.modules}/jakarta.authentication-api.jar${pathsep}${s1as.modules}/jakarta.servlet-api.jar${pathsep}${s1as.modules}/jakarta.inject-api.jar${pathsep}${s1as.modules}/jakarta.el-api.jar${pathsep}${s1as.modules}/jakarta.servlet.jsp-api.jar${pathsep}${s1as.modules}/jakarta.servlet.jsp.jstl-api.jar${pathsep}${jtaJarClasspath}${pathsep}${s1as.modules}/jakarta.security.enterprise-api.jar${pathsep}${s1as.modules}/jakarta.activation-api.jar${pathsep}${jimage.dir}/java.base${pathsep}${jimage.dir}/java.rmi${pathsep}${jimage.dir}/java.sql${pathsep}${jimage.dir}/java.naming + +######################################################################## +## This property is used to support the odd side case when we have an +## optional technology package that is used but should not be tested. +## +## This property (i.e. optional.tech.packages.to.ignore) must be a comma +## separated list of packages that are NOT to be validated/tested when +## during the sigtest utilities validation of Optional Technologies. +## Example Usage: +## optional.tech.packages.to.ignore=javax.foo.pkg1,javax.bar.pkg2,com.blah.foo.pkg3 +## +## Additional notes: +## - always ignore the optional JAXB packages: +## optional.tech.packages.to.ignore=jakarta.xml.bind +## +######################################################################### +optional.tech.packages.to.ignore=jakarta.xml.bind + +######################################################################## +## These properties are used by the harness. "harness.log.port" +## specifies the port that server components use to send logging +## output back to JavaTest. If the default port # is not available +## on the machine running JavaTest, then you can set it here. +## +# +# @harness.temp.directory directory location used by the +# harness to store temporary files +# +# @harness.log.port the port the harness listens on for log mesages +# from remote clients +# +# @harness.log.traceflag used to turn on/off verbose debugging output +# for the tests. +# +# @harness.executeMode used to run the harness in the following modes +# of execution: +# 0 - default (deploy, run, undeploy) +# 1 - deploy only +# 2 - run only +# 3 - undeploy only +# 4 - deploy and run only +# +# @harness.socket.retry.count - denotes the number of time we should +# attempt to create a server socket when intilizing a test +# client. The socket is used for logging purposes. +# +# @harness.log.delayseconds Number of seconds to delay to allow +# reporting from remote clients to finish. +# +# @harness.maxoutputsize Number of characters that the harness will use +# for a test's output. +######################################################################## +harness.temp.directory=${ts.home}/tmp +harness.log.port=2000 +harness.log.traceflag=false +harness.executeMode=0 +harness.socket.retry.count=10 +harness.log.delayseconds=1 +harness.maxoutputsize=200000 + + +######################################################################### +# @wsdlRepository1 Location to publish final wsdl files when using +# file URL publishing for Vendor Java EE implementation. +# @wsdlRepository2 Location to publish final wsdl files when using +# file URL publishing for Sun RI. +######################################################################### +wsdlRepository1=${harness.temp.directory}/wsdlRepository1 +wsdlRepository2=${harness.temp.directory}/wsdlRepository2 + +####################################################################### +# @deployment_host.1 name of machine running the JSR 88 deployment +# process for the vendor's Java EE implementation. +# @deployment_host.2 name of machine running the JSR 88 deployment +# process for the Java EE RI. +# @deployment_port.1 deployment port (if applicable) for the vendor's +# Java EE implementation. +# @deployment_port.2 deployment port (if applicable) for the +# Java EE RI. +####################################################################### +deployment_host.1=${orb.host} +deployment_host.2=${orb.host.ri} +deployment_port.1=${impl.vi.port} +deployment_port.2=${impl.ri.port} + +#################################################################### +# Implementation Property Settings for Vendor and RI. These properties +# are used when either porting.ts.deploy.class.1 or porting.ts.deploy.class.2 +# are set to com.sun.ts.lib.implementation.sun.javaee.glassfish.AutoDeployment. +# Note: They are are also used when using the "ant deploy" and "ant undeploy" +# targets outside of running tests. +# +# The CTS provides the glassfish implementation out of the box. +# +# 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. +# @impl.vi.deploy.dir This property must be set to the deploy directory for +# the Vendor implementation. +# @impl.vi.host This property must be set to the admin host where +# the Vendor implementation is running. +# @impl.vi.port This property must be set to the admin port where +# the Vendor implementation is running. +# @impl.ri This property must be set to the RI implementation +# under test. +# @impl.ri.deploy.dir This property must be set to the deploy directory for +# the RI implementation. +# @impl.ri.host This property must be set to the admin host where +# the RI implementation is running. +# @impl.ri.port This property must be set to the admin port where +# the RI implementation is running. +# +# @impl.deploy.timeout.multiplier The time it will wait for deployment to +# succeed or fail +#################################################################### +impl.vi=glassfish +impl.vi.deploy.dir=${s1as.domain}/autodeploy +impl.vi.host=${s1as.admin.host} +impl.vi.port=${s1as.admin.port} + +impl.ri=glassfish +impl.ri.deploy.dir=${ri.domain}/autodeploy +impl.ri.host=${ri.admin.host} +impl.ri.port=${ri.admin.port} + +impl.deploy.timeout.multiplier=240 + + +############################################################### +## These properties are implementations of the pre-1.4 Deployment +## porting interface. The impls defined below use those APIs. +# +# @porting.ts.deploy.class.1 This property must point to an implementation +# of com.sun.ts.lib.porting.TSDeploymentInterface. The default +# value for this property points to an impl that deploys via copying/deleting +# to/from the RI autodeploy directory. More details about setting +# porting.ts.deploy.class.1: +# +# 1. Set this property to deploy/undeploy to/from your impl in +# a custom way. In the case of the RI, it would be set to the following. +# This is the default setting for CTS 8. +# +# porting.ts.deploy.class.1=com.sun.ts.lib.implementation.sun.javaee.glassfish.AutoDeployment +# +# 2. Note that Jakarta Deployment is removed, so do not use either of the following classes: +# com.sun.ts.lib.deliverable.cts.deploy.StandardDeployment14 +# com.sun.ts.lib.porting.TSDeploymentInterface2 +# com.sun.ts.lib.implementation.sun.javaee.SunRIDeployment2 +# +# +# @porting.ts.deploy.class.2 This property must point to an implementation +# of com.sun.ts.lib.porting.TSDeploymentInterface. +# The default value for this property points to an impl that deploys via copying/deleting +# to/from the RI autodeploy directory. This should be left unchanged... +# +# porting.ts.deploy.class.2=com.sun.ts.lib.implementation.sun.javaee.glassfish.AutoDeployment +# +# +############################################################### +porting.ts.deploy.class.1=com.sun.ts.lib.implementation.sun.javaee.glassfish.AutoDeployment +porting.ts.deploy.class.2=com.sun.ts.lib.implementation.sun.javaee.glassfish.AutoDeploymentSeparateVM + +######################################################################## +# @deploy.delay.in.minutes is no longer used, it was for pruned Jakarta Deployment +######################################################################## + +######################################################################## +## Following are no longer used, were settings for pruned Jakarta Deployment +######################################################################## +#deployManagerJarFile.1 +#deployManageruri.1 +#deployManageruname.1 +#deployManagerpasswd.1 + +######################################################################## +## Following are no longer used, were settings for pruned Jakarta Deployment +######################################################################## +#deployManagerJarFile.2 +#deployManageruri.2 +#deployManageruname.2 +#deployManagerpasswd.2 +# +# @porting.ts.deploy2.class.1 +# @porting.ts.deploy2.class.2 +# porting.ts.deploy2.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIDeployment2 +# porting.ts.deploy2.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIDeployment2 + + +############################################################### +## These properties must be set to tell the Test harness the +## class names of your porting class implementations. By default +## both property sets below point to Sun RI specific classes. To +## run interoperability tests, the ".2" set of properties should +## always point to Sun RI classes. The ".1" set should point to +## implementations that work in your specific Java EE environment. +# +# @porting.ts.login.class.1 VI of +# com.sun.ts.lib.porting.TSLoginContextInterface +# @porting.ts.url.class.1 VI of +# com.sun.ts.lib.porting.TSURLInterface +# @porting.ts.jms.class.1 VI of +# com.sun.ts.lib.porting.TSJMSAdminInterface +# @porting.ts.HttpsURLConnection.class.1 VI of +# com.sun.ts.lib.porting.TSHttpsURLConnectionInterface +# @porting.ts.login.class.2 RI of +# com.sun.ts.lib.porting.TSLoginContextInterface +# @porting.ts.url.class.2 RI of +# com.sun.ts.lib.porting.TSURLInterface +# @porting.ts.jms.class.2 RI of +# com.sun.ts.lib.porting.TSJMSAdminInterface +# @porting.ts.HttpsURLConnection.class.2 RI of +# com.sun.ts.lib.porting.TSHttpsURLConnectionInterface +############################################################### +porting.ts.login.class.1=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext +porting.ts.url.class.1=com.sun.ts.lib.porting.implementation.SunRIURL +porting.ts.jms.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin +porting.ts.HttpsURLConnection.class.1=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection + +##Porting class names for Sun RI Java EE Implementation #2 (must be Sun's RI) +porting.ts.login.class.2=com.sun.ts.lib.implementation.sun.javaee.GlassFishLoginContext +porting.ts.url.class.2=com.sun.ts.lib.implementation.sun.common.SunRIURL +porting.ts.jms.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIJMSAdmin +porting.ts.HttpsURLConnection.class.2=com.sun.ts.lib.implementation.sun.javaee.SunRIHttpsURLConnection + +############################################################## +# @namingServiceHost1 Naming Service host name for the +# Vendor's Implementation (VI) +# @namingServicePort1 Naming Service port for the VI +# @namingServiceHost2 Naming Service host name for the +# Reference Implementation (RI) +# @ namingServicePort2 Naming Service port for the RI +############################################################## +namingServiceHost1=${orb.host} +namingServicePort1=${orb.port} +namingServiceHost2=${orb.host.ri} +namingServicePort2=${orb.port.ri} + +############################################################## +# @certLoginUserAlias User alias for certificate based login. +# This property is used in mutual authentication to pickup the +# certificate based on the user alias. +############################################################## +certLoginUserAlias=cts + +##################################################################### +## The following properties must be set prior to running the Servlet +## or JSP API tests and interoperability tests. +## +## These properties must specify the host and port of the web server, +## in which the servlets and JSPs are deployed. +# +# @webServerHost hostname for the Vendor's Java EE Web Server +# @webServerPort port number of the Vendor's Java EE Web Server +# @webServerHost.2 hostname for the Java EE RI Web Server +# @webServerPort.2 port number of the Java EE RI Web Server +# @ServletClientThreads The ServletClientThreads property configures +# the number of threads used by the client for +# the SingleThreadModel servlet test. If the +# container implementation supports pooling of +# SingleThreadModel servlets, set the value of +# ServletClientThreads to twice the value of +# the default servlet instance pool size. If +# the container implementation only maintains +# a single instance of a SingleTheadModel +# servlet, leave the default value of 2. +##################################################################### +webServerHost=${orb.host} +webServerPort=8080 +webServerHost.2=${orb.host.ri} +webServerPort.2=8002 +ServletClientThreads=2 + +#################################################################### +# @EJBServer1TxInteropEnabled Transaction interoperability settings +# for Vendor Java EE EJB Server +# @EJBServer2TxInteropEnabled Transaction interoperability settings +# for Java EE RI EJB Server +#################################################################### +EJBServer1TxInteropEnabled=true +EJBServer2TxInteropEnabled=true + +############################################################### +## These properties are used for the Connector specific tests. +## +## You must be able to deploy the following resource adapters +## on your Java EE server. +############################################################### + +## JNDI name bindings. You should not change these. The TSDeploymentInterface +## will pass these values as a properties object. See the SunRIDeployment.java +## file for usage patterns. +whitebox-tx=java:comp/env/eis/whitebox-tx +whitebox-notx=java:comp/env/eis/whitebox-notx +whitebox-xa=java:comp/env/eis/whitebox-xa +whitebox-tx-param=java:comp/env/eis/whitebox-tx-param +whitebox-notx-param=java:comp/env/eis/whitebox-notx-param +whitebox-xa-param=java:comp/env/eis/whitebox-xa-param +whitebox-anno_no_md=java:comp/env/eis/whitebox-anno_no_md +whitebox-ibanno_no_md=java:comp/env/eis/whitebox-ibanno_no_md +whitebox-mixedmode=java:comp/env/eis/whitebox-mixedmode +whitebox-multianno=java:comp/env/eis/whitebox-multianno +whitebox-mdcomplete=java:comp/env/eis/whitebox-mdcomplete +whitebox-permissiondd=java:comp/env/eis/whitebox-permissiondd + +## Embedded resource adapter property +whitebox-embed=java:comp/env/eis/ejb_Deployment_whitebox-tx.rar + +whitebox-embed-xa="__SYSTEM/resource/ejb_Tsr#whitebox-xa#com.sun.ts.tests.common.connector.whitebox.TSConnectionFactory" +tsrJndiName=java:comp/TransactionSynchronizationRegistry +tsrHomeJndiName="java:global/ejb_Tsr/ejb_Tsr_ejb/Tsr" + +## JNDI name bindings for JDBC Connector. +JDBCwhitebox-tx=java:comp/env/eis/JDBCwhitebox-tx +JDBCwhitebox-notx=java:comp/env/eis/JDBCwhitebox-notx +JDBCwhitebox-xa=java:comp/env/eis/JDBCwhitebox-xa +JDBCwhitebox-tx-param=java:comp/env/eis/JDBCwhitebox-tx-param +JDBCwhitebox-notx-param=java:comp/env/eis/JDBCwhitebox-notx-param +JDBCwhitebox-xa-param=java:comp/env/eis/JDBCwhitebox-xa-param + +######################################################################### +## Resource adapter configuration values. You must modify these values +## to plug your JDBC driver into the TS JDBCwhitebox resource adapter. +## +## When you run the XA tests (src/com/sun/ts/tests/xa), you must +## configure this resource adapter to use a database. +## +# @xa.properties: These are the properties required by the XA driver. The +# managed connection factory will set these properties via +# reflection on the class specified by the +# xa.xadatasource.class property. +# +# Note: The xa.properties value is the set of properties that will be set on +# your XA JDBC driver (the class denoted by the xa.xadatasource.class property). +# See section 9.4.1 of the JDBC 3.0 specification for more details. +# +# When specifying the xa.properties property please escape the appropriate +# characters. The xa.properties value needs to be treated as a single property +# even though it is made up of many properties. The properties need to be +# separated by :'s and the names and values to be separated by ='s. +# We also need any values that contain colons or equals that do not +# need to be interrpretted to be inside single quotes. Anything in +# single quotes will be treated as a string literal. +# +# For example: The following xa.properties property: +# +# xa.properties=user=admin:password=some-password:DatabaseName='jdbc:pointbase:server://localhost:9092/cts,new' +# +# Would result in the following setters being called on the supplied XA JDBC driver denoted +# by the xa.xadatasource.class property. +# +# XADataSource.setUser("admin"); +# XADataSource.setPassword("some-password"); +# XADataSource.setDatabaseName("jdbc:pointbase:server://localhost:9092/cts,new"); +# +# Please map the property xa.properties to the property name XAProps and map the +# xa.xadatasource.class property to the property name XADataSourceName. This will +# ensure the appropriate setters will be called to make these properties +# available to the managed connection factory. See section 17.4.2 of the Connector +# specification version 1.5. +# +# @xa.xadatasource.class: The implementation of the XADataSource interface. +# This class is your XA JDBC driver. +# Please note: this class and any dependent classes +# must be accessible by the CTS libraries in the app +# server's extension directory. +# +# @connector_connectionURL: The URL for your JDBC driver. Should be the +# same as the one used for the rest of the TS. +# +######################################################################### + +### Cloudscape/Derby properties for XA +xa.properties="user\\\=${derbyEmbedded.user}\\\:password\\\=${derbyEmbedded.passwd}\\\:DatabaseName\\\=${derbyEmbedded.dbName}" +xa.xadatasource.class=org.apache.derby.jdbc.EmbeddedXADataSource +connector_connectionURL="jdbc\\:derby\\:${derbyEmbedded.dbName}\\;create\\=true" + +######################################################################### +## The following properties must be set before running any security +## related tests. The properties user, password, authuser, authpassword, +## and nobodyuser must be set. +## +## The value for user, password, authuser, and authpassword need to be set +## exactly as they are set in the container/server. +# +# @user User defined to exercise rolemapping feature +# @password Associated password for the user +# @authuser User defined to exercise rolemapping feature +# @authpassword Associated password for the authuser +# @user_vi Username for the vendor implementation used in +# interop tests +# @password_vi Associated password for the VI user +# @user_ri Username for the reference implementation used in +# interop tests +# @password_ri Associated password for the RI user +# @nobodyuser This value must be the same value returned by a call to +# getCallerPrincipal().getName() from the ejb-tier when +# an unauthenticated caller in the web tier invokes an +# ejb method. +######################################################################### +user=j2ee +password=j2ee +authuser=javajoe +authpassword=javajoe +user_vi=j2ee_vi +password_vi=j2ee_vi +user_ri=j2ee_ri +password_ri=j2ee_ri +nobodyuser=guest + +############################################################### +# @securedWebServicePort must be set to run secbasicssl and +# csiv2 tests. Set this property with your application +# server's secured webservice port. +# @securedWebServicePort.2 points to the secured webservice +# port in Sun's Reference Implementation(RI). +############################################################### +securedWebServicePort=1044 +securedWebServicePort.2=1045 + +############################################################################### +# @client.cert.test.jdk.tls.client.protocols JDK 11 in TLSv1.3 does not support +# Post-Handshake Authentication, so TLSv1.2 must be used +# for client-cert authentication to work. +############################################################################### +client.cert.test.jdk.tls.client.protocols=TLSv1.2 + +############################################################### +# @login This property must be set to run appclient security +# tests +############################################################### +login=default + +################################################################################ +##These properties are needed for jms tests. +# +# @jms_timeout - this is the amount of time in milliseconds that synchronous +# receives will wait for a message +############################################################################### +jms_timeout=10000 + +######################################################################### + +############################################################################### +## These properties are needed for the EJB timer tests. +# +# @ejb_timeout - this is the amount of time in milliseconds that duration will +# be set for an ejbtimeout callback method +# +# @ejb_wait - this is the amount of time in milliseconds that the client will +# wait for ejbtimeout callback method results +############################################################################## +ejb_timeout=30000 +ejb_wait=60000 + +############################################################################### +## This property is needed for ejb30 stateful timeout tests. +# @test.ejb.stateful.timeout.wait.seconds - the minimum amount of time in seconds +# the test client waits before verifying the status of the target stateful +# bean. Its value must be an integer number. Its default value in ts.jte +# file is 480 seconds. It may be set to a smaller number (e.g., 240 seconds) +# to speed up testing, depending on the stateful timeout implementation +# strategy in the target server. +# +# For these stateful timeout tests, the property javatest.timeout.factor +# must be set to a value such that the JavaTest harness does not timeout +# before the test completes. Usually setting javatest.timeout.factor to +# 2.0 or greater should suffice. +############################################################################### +test.ejb.stateful.timeout.wait.seconds=480 + +################################################################### +# @log.file.location This property is used by JACC tests to create +# and analyze provider logs. Specify the log directory in which +# your appserver generates logs. +################################################################### +log.file.location=${vi.log.file.location} + + +################################################################### +################################################################### +################################################################### +## PROPERTIES USERS WILL NOT HAVE TO SET LIVE BELOW +################################################################### +################################################################### +################################################################### + +## +## The directory seperator for the platform. User should not change +## this property. +## +dirsep=/ + +##build level +##1: compile only +##2: compile and build component archives (e.g., jar's, war's) +##3: compile and build component and application archives +##default is set to 3 +build.level=3 + +deliverable.class=com.sun.ts.lib.deliverable.cts.CTSDeliverable + +################################################################### +## Deliverables wanting ts.* packaging tasks to add extension list +## attributes to the manifest files must set this property to true. +################################################################### +create.manifest.extension.entries=true + +###################################################################### +## Deliverables must set this property to the name of the deliverable +## specific library jar file (iff create.manifest.extension.entries +## is set to true) +###################################################################### +tslib.name=cts + +############################################################### +## These properties are used by connector tests and are non configurable +## and must specify valid username,password to establish TSeis connection. +############################################################### +rauser1=cts1 +rapassword1=cts1 +rauser2=cts2 +rapassword2=cts2 + +############################################################### +## These properties are for JSTL +############################################################### +jstl.db.user=${user1} +jstl.db.password=${password1} + +############################################################### +## This command is only used when quickly checking any servlet +## or jsp related tests. The test clients will be run in +## the same JVM as JavaTest in this case. This mode can be +## enabled by passing "-Dsame.jvm=true" to the runclient or gui +## targets. NOTE: This option is only to be used for sanity +## checking and not when running CTS for compatibility. +############################################################### +command.testExecuteSameJVM=com.sun.ts.lib.harness.ExecuteTSTestSameJVMCmd \ + $testExecuteClass $testExecuteArgs + +############################################################### +## These properties are used for the JDBC specific tests, +## they do not need to be changed. +############################################################### +DriverManager=no +Driver=DriverOnlyUsedIfDriverManagerIsYes +db1=db1OnlyUsedIfDriverManagerIsYes +db2=db1OnlyUsedIfDriverManagerIsYes +ptable=ctstable1 +ftable=ctstable2 +cofSize=5 +cofTypeSize=5 +binarySize=24 +varbinarySize=48 +longvarbinarySize=50 + +ts_home=${ts.home} + +####################################################################### +## platform.mode is used by jpa tests to know whether to use +## the Java EE Programming Model for service and port access. +## platform.mode=jakartaEE Java EE Programming Model +###################################################################### +platform.mode=jakartaEE + +########################################################################### +# tools.jar should be set to the location of the tools.jar from the installed +# jdk +########################################################################### +tools.jar=/home/jenkins/agent/workspace/jakartaee-tck_10.0.x/modules/webservices-tools.jar:/home/jenkins/agent/workspace/jakartaee-tck_10.0.x/modules/webservices-api.jar + +########################################################################### +# various flags used by the generation tools +########################################################################### +wsgen.ant.classname= +wsgen.classpath=${javaee.classes}${pathsep}${tools.jar} +wsgen.verbose=true +wsgen.debug=false +wsimport.ant.classname= +wsimport.classpath=${javaee.classes}${pathsep}${tools.jar} +wsimport.verbose=true +wsimport.debug=false +wsimport.jvmargs= + +########################################################################### +# various flags used by Suns generation tools +# DO NOT EDIT +########################################################################### +ri.wsgen.ant.classname=com.sun.tools.ws.ant.WsGen +ri.wsgen.classpath=${javaee.classes.ri}${pathsep}${tools.jar} +ri.wsgen.verbose=true +ri.wsgen.debug=false +ri.wsimport.ant.classname=com.sun.tools.ws.ant.WsImport +ri.wsimport.classpath=${javaee.classes.ri}${pathsep}${tools.jar} +ri.wsimport.verbose=true +ri.wsimport.debug=false +ri.wsimport.jvmargs= + +################################# +## Packaging properties for DAOs +################################# +ts.dao.root=com/sun/ts/tests/common/dao + +ts.dao.classes.base=\ + ${ts.dao.root}/InvalidDAOSettingException.class, \ + ${ts.dao.root}/DAOException.class, \ + ${ts.dao.root}/DAO.class, \ + ${ts.dao.root}/DataSourceDAO*.class, \ + ${ts.dao.root}/DAOFactory.class, \ + ${ts.dao.root}/TSDAOFactory*.class, \ + ${ts.dao.root}/coffee/CoffeeBean.class, \ + ${ts.dao.root}/coffee/CoffeeDAO.class, \ + ${ts.dao.root}/coffee/TxCoffeeDAO.class, \ + ${ts.dao.root}/coffee/variants/StringPKCoffeeDAO.class, \ + ${ts.dao.root}/coffee/variants/LongPKCoffeeDAO.class, \ + ${ts.dao.root}/coffee/variants/FloatPKCoffeeDAO.class, \ + ${ts.dao.root}/coffee/variants/CompoundPK.class, \ + ${ts.dao.root}/coffee/variants/CompoundPKCoffeeDAO.class + +ts.dao.classes.impl=\ + ${ts.dao.root}/coffee/DataSourceCoffeeDAO.class, \ + ${ts.dao.root}/coffee/variants/StringPKDSCoffeeDAO.class, \ + ${ts.dao.root}/coffee/variants/LongPKDSCoffeeDAO.class, \ + ${ts.dao.root}/coffee/variants/FloatPKDSCoffeeDAO.class, \ + ${ts.dao.root}/coffee/variants/CompoundPKDSCoffeeDAO.class + +ts.dao.classes.coffee.standard=\ + ${ts.dao.classes.base}, \ + ${ts.dao.classes.impl} + +ts.dao.classes.coffee.txaware=\ + ${ts.dao.classes.base}, \ + ${ts.dao.classes.impl} + +ts.dao.classes.coffee.variants=\ + ${ts.dao.classes.base}, \ + ${ts.dao.classes.impl} + +##################################### +## Packaging properties for Wrappers +##################################### + +ts.wrappers.ejb.root=com/sun/ts/tests/common/ejb/wrappers + +ts.wrappers.web.root=com/sun/ts/tests/common/web + +## Classes to package in ejb-jar for EJB Stateless wrapper +ts.wrappers.classes.stateless.ejb=\ + ${ts.wrappers.ejb.root}/StatelessWrapper.class + +## Classes to package in ejb-jar for EJB Stateful wrapper +ts.wrappers.classes.stateful.ejb=\ + ${ts.wrappers.ejb.root}/StatefulWrapper.class + +## Classes to package in ejb-jar for EJB BMP wrapper +ts.wrappers.classes.bmp.ejb=\ + ${ts.dao.classes.coffee.standard}, \ + ${ts.wrappers.ejb.root}/BMPWrapper.class + +## Classes to package in ejb-jar for EJB CMP 1.1 wrapper +ts.wrappers.classes.cmp11.ejb=${ts.wrappers.ejb.root}/CMP11Wrapper.class + +## Classes to package in ejb-jar for EJB CMP 2.0 wrapper +ts.wrappers.classes.cmp20.ejb=${ts.wrappers.ejb.root}/CMP20Wrapper.class + +## Classes to package in ejb-jar for EJB MDB wrapper +ts.wrappers.classes.mdb.ejb=\ + com/sun/ts/tests/jms/common/JmsUtil.class, \ + com/sun/ts/tests/jms/commonee/ParentMsgBean.class, \ + ${ts.wrappers.ejb.root}/MDBWrapper.class + +## Classes to package in client module for EJB MDB wrapper +ts.wrappers.classes.mdb.client=com/sun/ts/tests/jms/commonee/Client.class + +## Classes to package in ejb-jar for all EJB wrappers +ts.wrappers.classes.all.ejb=\ + ${ts.wrappers.classes.stateless.ejb}, \ + ${ts.wrappers.classes.stateful.ejb}, \ + ${ts.wrappers.classes.bmp.ejb}, \ + ${ts.wrappers.classes.cmp11.ejb}, \ + ${ts.wrappers.classes.cmp20.ejb}, \ + ${ts.wrappers.classes.mdb.ejb} + +## Classes to package in client module for all WEB wrappers +ts.wrappers.classes.web.client=\ + ${ts.wrappers.web.root}/WebServer.class + +## Classes to package in war for all WEB wrappers +ts.wrappers.classes.web.server=\ + ${ts.wrappers.web.root}/WebUtil.class, \ + ${ts.wrappers.web.root}/JSPBeanWrapper.class, \ + ${ts.wrappers.web.root}/ServletWrapper.class + +## Classes to package in client module for Servlet wrapper +ts.wrappers.classes.servlet.client=${ts.wrappers.classes.web.client} + +## Classes to package in war for Servlet wrappers +ts.wrappers.classes.servlet.server=\ + ${ts.wrappers.web.root}/WebUtil.class, \ + ${ts.wrappers.web.root}/ServletWrapper.class + +## Classes to package in client module for JSP wrapper +ts.wrappers.classes.jsp.client=${ts.wrappers.classes.web.client} + +## Classes to package in war for JSP wrappers +ts.wrappers.classes.jsp.server=\ + ${ts.wrappers.web.root}/WebUtil.class, \ + ${ts.wrappers.web.root}/JSPBeanWrapper.class + + +############################################################################### +## DO NOT MODIFY ANY PROPERTIES BELOW THIS LINE. +############################################################################### + +#classpath used by standard deployment server to deploy to the RI in a separate +#VM (DO NOT MODIFY) +ts.standard.deployment.server.classpath=${ant.jars}:${pathsep}${ts.run.classpath.ri}${pathsep}${ts.home}/lib/javatest.jar${pathsep}${ts.home}/lib/jdom-1.1.3.jar${pathsep}${ri.modules}/admin-cli.jar + +harness.deployment.server.port=2002 + +java.naming.factory.initial=foo +org.omg.CORBA.ORBClass=foo +undeploy_redeploy_apps=${UNDEPLOY_REDEPLOY_FLAG} + +############################################################################### +# The following properties are aliases for the old J2EE properties. These +# properties are now named javaee instead of j2ee and will eventually be phased +# out of the CTS. These props are necessary until the props are renamed +# through out all CTS. +############################################################################### +j2ee.home=${javaee.home} +j2ee.home.ri=${javaee.home.ri} + +#################################################################### +## This propertry is passed to any test +## that needs to programatically login from with the appclient +## container and propogate that login context to test code running +## within the EJB container. The value is a no-op. The fact that +## the test includes the property is sufficient to cause the +## EJBVehicleRunner to programatically login. To have a test +## include this property simply add it to the javatest props list +## of the test. +#################################################################### +secured.ejb.vehicle.client=true + +#################################################################### +# This property is used to point to the location of the +# implementation of VariableMapper. The value for sjsas 9.x is +# +# variable.mapper=org.glassfish.expressly.lang.VariableMapperImpl +# +#################################################################### +variable.mapper=org.glassfish.expressly.lang.VariableMapperImpl + +####################################################################### +# Endpoint API test +# +# Port info is obtained dynamically for Endpoint API test. +# Uncomment port range min/max if you want to specify port range +# for Endpoint publish test. +# Server endpoints will be published on ports within this range. +# If you do not want to dynamically obtain the port but wish to publish +# to a fixed static port than make the values below both equal to the +# specific port. +####################################################################### +port.range.min=1025 +port.range.max=10000 + +################################################################ +# @http.server.supports.endpoint.publish +# Does HTTP server-side support endpoint publish API's. +# @http.server.supports.endpoint.publish.2 +# Does the RI HTTP server-side support endpoint publish API's. +# +# http.server.supports.endpoint.publish=(true|false) +# DO NOT TOUCH - value MUST be false for managed environments like Java EE +################################################################ +http.server.supports.endpoint.publish=false +http.server.supports.endpoint.publish.2=false + +########################################################################### +# This property is used by some test clients that need a delay between +# method invocations to server endpoints. The value specified is the amount +# of time the client will delay in seconds. +########################################################################### +client.delay=1 + +####################################################################### +## This persistence unit name is used by jpa/ee/pluggability tests. Its value is the +## same as the name attribute in persistence.xml +###################################################################### +persistence.unit.name=CTS-EM + +############################################################### +# @db.supports.sequence +# +# - This property is used to determine if a database supports +# the use of SEQUENCE. If it does not, this property +# should be set to false so the test is not run. The +# default value is true. +# This value should be set to false for the following databases: +# sybase, mysql, and mssqlserver. +############################################################### +db.supports.sequence=true + +####################################################################### +## @persistence.second.level.caching.supported +## - This property is used to determine if the persistence provider supports +## second level caching. +###################################################################### +persistence.second.level.caching.supported=true + +########################################################################## +## This section contains all properties that are specific to JAX-RS Tests. +## All default values are specific to GlassFish and Jersey. +## +## servlet_adaptor - implementation specific servlet for JAX-RS +## jaxrs_impl_class.dir - Directory that servlet_adaptor locates +## jaxrs_impl_name - used to tag intermediate file names +########################################################################## +servlet_adaptor=org/glassfish/jersey/servlet/ServletContainer.class +jaxrs_impl_lib=${javaee.home}/modules/jakarta.ws.rs-api.jar +jaxrs_impl_name=jersey + + +########################################################################## +# This section contains all properties that are specific to JSR-196 Tests. +# All default values are specific to GlassFish. +# +# @servlet.is.jsr115.compatible This property is used by JASPIC tests +# to determine if the servlet container is a jsr 115 compatible +# container. (true = compatible to JSR 115, false = not compatible.) +# +# @soap.is.jsr115.compatible This may used by JASPIC tests to +# determin if the SOAP container is JSR 115 compatible. This is +# only used when running SOAP profile tests. +# +# @provider.configuration.file +# This property is used by JASPIC tests to configure TestSuite's +# AuthConfig Provider and points at an xml file which is used +# to register the JASPIC test providers into the current +# ACF. This file contaiins known/expected test provider info. +# Only app-context-id element can be edited to suit the +# impl under test. +# +# @schema.file.location +# This points to the directory that the provider-configuration.xsd +# file will live. The provider-configuration.xsd is used to +# describe the provider.configuration.file (above). +# +# @logical.hostname.servlet +# This used to identify the the name of a logical host that +# processes Servlet requests. Servlet requests may be directed to +# a logical host using various physical or virtual host names or +# addresses, and a message processing runtime may be composed of +# multiple logical hosts (This is required to properly identify +# the servlet profiles AppContextId hostname.) +# If a logical.hostname.servlet does not exist, you can set this +# to the default hostname (eg webServerHost). +# +# @logical.hostname.soap +# This property is used to identify the name of the logical host +# that processes soap requests. This hostname is used in server +# side Application context Identifier in soap profile. +# +# @appclient.log.output +# The client logging level for appclient container depends on the +# log level specified in sun-acc.xml +# +# This log level directly affects the output of TSLogger which +# logs the JSR196 SPI calls made in appclient container. +# +# using this property we enable the appclient container's +# logging level to INFO +# +# @vendor.authconfig.factory +# This property specifies vendor's authconfig factory class +# this will be used by JASPIC tests to register TestSuite's +# provider in Vendor's AuthConfig Factory. +# +# For example for SJSAS RI this value is +# +# vendor.authconfig.factory= +# com.sun.enterprise.security.jmac.config.GFAuthConfigFactory +# +########################################################################## +servlet.is.jsr115.compatible=true +soap.is.jsr115.compatible=false +provider.configuration.file=${javaee.home}/domains/domain1/config/ProviderConfiguration.xml +schema.file.location=${javaee.home}/lib/schemas +logical.hostname.servlet=server +logical.hostname.soap=localhost +appclient.log.output=true +vendor.authconfig.factory=com.sun.enterprise.security.jmac.config.GFAuthConfigFactory + +########################################################################## +# @servlet_waittime: Time in seconds to wait after HttpSession expires +# to access the session +# @servlet_async_wait: Time in seconds to wait between sending asynchronous messages +########################################################################## +servlet_waittime=10 +servlet_async_wait=4 + +########################################################################################## +# The following properties are ONLY used if testing a Standalone JMS Resource Adapter. +# Since support for a JMS Resource Adapter is OPTIONAL by the JMS 2.0 Specification +# this funtionality is USE AT YOUR OWN RISK. We WILL NOT support it. Its here in the +# case that a vendor wants to test a Standalone JMS Resource Adapter which is OPTIONAL. +# +# test.sa.jmsra // Set to true ONLY if testing a standalone JMS Resource Adapter +# jmsra.rarfile // Location of the standalone JMS Resource Adapter RAR file +# jmsra.jarfile // Location of the standalone JMS Resource Adapter JAR file +# +# A standalone JMS Resource Adapter requires deployment/configuration to the Vendor +# Implementation under test (Example: Java EE 8 RI). If not testing a standalone JMS +# Resource Adapter then these properties MUST NOT be used and the value of the property +# (test.sa.jmsra) MUST BE SET to false (which is the DEFAULT setting). If you set the +# property (test.sa.jmsra=true) then you are testing a standalone JMS Resource Adapter +# and the (jmsra.rarfile and jmsra.jarfile) properties must point to the location of +# the standalone JMS Resource Adapter RAR and JAR files. During CTS configuration the +# (config.vi) ant task will call another script that will deploy the standalone JMS +# Resource Adapter, configure the standalone JMS Resource Adapter, create the JMS +# connector connection pools, create the JMS connector resources, and finally create +# the JMS administration objects. The ant scripts that handles all of these steps for +# the (Java EE 8 RI) are the following: +# +# $TS_HOME/bin/xml/impl/glassfish/jmsra.xml +# $TS_HOME/bin/xml/impl/glassfish/templates/create.jmsra.template +# +# These scripts work for the Standalone Generic JMS Resource Adapter (GenericJMSRA) +# located at: (http://genericjmsra.java.net/). If testing another standalone JMS +# Resource Adapter then these scripts will need to be rewritten/modified for that +# JMS Resource Adapter. +# +# Here is the summary of steps of what the (jmsra.xml) script does. It configures the JMS +# resource adapter by doing a resource-adapter-config, it deploys the JMS resource adapter +# RAR file specified in the "jmsra.rarfile" property to the (Java EE 8 RI), it copies the +# JMS Resource Adapter JAR file specified in the "jmsra.jarfile" property to the (Java EE +# 8 RI) lib directory under $JAVAEE_HOME/lib. It copies some of the JMS client library jars +# to the $JAVAEE_HOME/lib directory. it then creates the JMS connector connection pools, +# the JMS connector resources, and the JMS administration objects that are needed by CTS. +# When the (config.vi) ant task completes the Java EE 8 environment will be ready to run +# the JMS CTS tests. One final step is needed to the JMS MDB CTS tests which is to modify +# the sun-ejb-jar runtime xml files by adding the deployment info. +# +# Here are the manual steps for the Standalone Generic JMS Resource Adapter (GenericJMSRA) +# after the (config.vi) ant task completes. +# +# (1) Edit the ts.jte file and add the following: +# Add "-Dgenericra.inAppClientContainer=true" to the "command.testExecuteAppClient" +# property and then add "${pathsep}${jmsra.jarfile}" to the end of APPCPATH variable +# in the same "command.testExecuteAppClient" property. You can refer to the Generic +# JMS Resource Adapter (GenericJMSRA) user guide for more information on this. +# (2) Modify the sun-ejb-jar runtime xml files for the JMS MDB tests by adding the +# deployment info. +# cd $TS_HOME/bin +# ant -f xml/impl/glassfish/jmsra.xml modify-jmsmdbejbxml +# (3) Now you can run the JMS CTS tests. After you are done running the JMS CTS tests ypu +# can unconfigure the Java EE 8 RI and restore the original sun-ejb-jar runtime xml +# files. +# cd $TS_HOME/bin +# ant -f xml/impl/glassfish/jmsra.xml restore-jmsmdbejbxml +# ant clean.vi +# (4) Finally reset the properties back to there defaults. Set (test.sa.jmsra=false) and unset +# (jmsra.rarfile and jmsra.jarfile). Remove the "-Dgenericra.inAppClientContainer=true" +# and "${pathsep}${jmsra.jarfile}" from the ts.jte file from step 1. +# +# If using a different Java EE environment from the Java EE RI than a vendor will need to +# provide his own JMS Resource Adapter support scripts needed for that Java EE environment. +# It can reuse/modify the (Java EE 8 RI) scripts above or simply write their own scripts. A +# vendor can use the Java EE 8 RI or any Java EE 8 implementation of its choice as the Java +# EE 8 environment for testing its Standalone JMS Resource Adapter. The Standalone JMS Resource +# Adapter MUST pass all of the JMS CTS tests under: (TS_HOME/src/com/sun/ts/tests/jms) in order +# to be declared fully JMS 2.0 compliant. +# +# See the JMS 2.0 Specification and the CTS 8 User's Guide for more information. +########################################################################################## +test.sa.jmsra=false +jmsra.rarfile= +jmsra.jarfile= + +########################################################################################## +# The following property specifies the name of the JMS Resource Adapter under test. The +# Java EE 8 RI contains its own builtin JMS Resource Adapter (JMSRA). Its name is "jmsra". +# So we set (jmsra.name=jmsra) as the default value for the Java EE 8 RI. +# +# Change the value of this property for the JMS Resource Adapter that is under test. This +# hardcoded value is specific to the Java EE 8 RI. +# +# jmsra.name // Name of JMS Resource Adapter for the implementation under test +########################################################################################## +jmsra.name=jmsra + + +########################################################################## +# The following property is for WebSocket tests. +# +# @ws_wait: waiting time in seconds for socket to send/receive a message +########################################################################## +ws_wait=5 + +############################################################################################ +# These following properties are needed for Javamail tests. +# +# @mailHost hostname of the mail server +# @mailuser1 must be set to a valid email address where test mails will be sent to. +# @mailFrom reply to address set in the email messages generated by the javamail tests +# @javamail.username user account name on server +# @javamail.password password for the mailuser1 +# +############################################################################################ + +mailHost= +mailuser1= +mailFrom= +javamail.password= +smtp.port=25 +imap.port=143 + +### User need not change the following javamail properties + +javamail.username=${mailuser1} +transport_protocol=smtp + +# mail server used to run tests against. +javamail.server=${mailHost} + +# protocol used to run the Store tests +javamail.protocol=imap + +# mail server used to run tests against. +javamail.transport.server=$javamail.server + +# rootpath of test mailboxes +javamail.root.path="" + +# note the mailbox 'test1' +javamail.mailbox=test1 + +# search pattern used by list tests in Folder +javamail.listpattern=test + +# your own login account name +smtp.username=$javamail.username + +# smtp domain name ; i.e. oracle.com +smtp.domain=$javamail.server + +# smtp From address +smtp.from=$smtp.username + +# smtp To address +smtp.to=$smtp.username + +# io file +iofile=MailIOFile.txt + +##################################################################################################### +#### Properties used by ldap installation +# @ldap.server -- The type of ldap server. unboundid is supported by now +# @ldap.install.server -- Install ldap server by CTS script or not +# @ldap.ldif.file -- The ldif file containing data seeded in ldap server +# +# @unboundid.installation.package -- The package for installing Unboundid ldap server +######################################################################################################## +ldap.server=unboundid +ldap.install.server=true +ldap.ldif.file=${ts.home}/bin/ldap.ldif + +unboundid.installation.package=${ts.home}/lib/unboundid-ldapsdk.jar + +##################################################################################################### +# Properties used for JPA 2.2 Tests +######################################################################################################## +persistencs.properties.file=${bin.dir}/jpa-provider.properties +persistence.unit.name.2=JPATCK2 + +jpa.provider.implementation.specific.properties=eclipselink.logging.level\=OFF +jakarta.persistence.provider=org.eclipse.persistence.jpa.PersistenceProvider +jakarta.persistence.jdbc.driver=${derby.driver} +jakarta.persistence.jdbc.url=${derby.url} +jakarta.persistence.jdbc.user=${derby.user} +jakarta.persistence.jdbc.password=${derby.passwd} + diff --git a/glassfish-runner/jta-platform-tck/pom.xml b/glassfish-runner/jta-platform-tck/pom.xml index 8e3b2be82a..741eaacaa0 100644 --- a/glassfish-runner/jta-platform-tck/pom.xml +++ b/glassfish-runner/jta-platform-tck/pom.xml @@ -82,11 +82,11 @@ ./sql jta-tck 11.0.0-SNAPSHOT - /jakartaeetck + ./jakartaeetck/ cts1 cts1 11.0.0-SNAPSHOT - 1.0.0-M15 + 1.0.0-M16 @@ -192,7 +192,7 @@ jakarta.tck.arquillian arquillian-protocol-javatest - ${version.jakarta.tck.arquillian} + 1.0.0-M15 org.jboss.shrinkwrap.resolver @@ -324,6 +324,21 @@ + + 006-StopDatabase + + exec + + post-integration-test + + ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin + ${derby.basedir} + + stop-database + + + + diff --git a/glassfish-runner/jta-platform-tck/src/test/resources/arquillian.xml b/glassfish-runner/jta-platform-tck/src/test/resources/arquillian.xml index ac726a0e1b..46ffcf1fa1 100644 --- a/glassfish-runner/jta-platform-tck/src/test/resources/arquillian.xml +++ b/glassfish-runner/jta-platform-tck/src/test/resources/arquillian.xml @@ -4,11 +4,11 @@ xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> - target/ + target/deployments - ${ts.home}/dist/ + target/ @@ -19,8 +19,14 @@ true /tmp - ${ts.home}/bin/ts.jte + jakartaeetck/bin/ts.jte sql/derby/derby.dml.sql + true + true + target/appclient + true + ${project.basedir} + 20000 diff --git a/jta/pom.xml b/jta/pom.xml index a124ef7d85..74a4daa88d 100644 --- a/jta/pom.xml +++ b/jta/pom.xml @@ -29,8 +29,8 @@ jta-tck jar - jta - jta + Jakarta Transactions + Jakarta Transactions 1.9.1.Final @@ -57,8 +57,9 @@ libutil - ${project.groupId} + jakarta.tck common + ${project.version} ${project.groupId} diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjblitejsfTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjblitejsfTest.java index adfcf9a83b..db56b82593 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjblitejsfTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjblitejsfTest.java @@ -92,23 +92,13 @@ public static void main(String[] args) { @TwoManagedQualifier TwoManagedBean two; - /** - EE10 Deployment Descriptors: - transactional_ejblitejsf_vehicle_web: WEB-INF/beans.xml,WEB-INF/faces-config.xml,WEB-INF/web.xml - Found Descriptors: - War: - - /com/sun/ts/tests/common/vehicle/ejblitejsf/ejblitejsf_vehicle_web.xml - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static WebArchive createDeploymentVehicle() { // public static WebArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War - // the war with the correct archive name WebArchive transactional_ejblitejsf_vehicle_web = ShrinkWrap.create(WebArchive.class, "transactional_ejblitejsf_vehicle_web.war"); // The class files transactional_ejblitejsf_vehicle_web.addClasses( @@ -141,7 +131,6 @@ public static WebArchive createDeploymentVehicle() { if(warResURL != null) { transactional_ejblitejsf_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } - // The sun-web.xml descriptor warResURL = ClientEjblitejsfTest.class.getResource("/vehicle/ejblitejsf/faces-config.xml"); if(warResURL != null) { transactional_ejblitejsf_vehicle_web.addAsWebInfResource(warResURL, "faces-config.xml"); diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjblitejspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjblitejspTest.java index 2e295dc764..18d39542f6 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjblitejspTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/transactional/ClientEjblitejspTest.java @@ -72,10 +72,7 @@ public void cleanup() { @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static WebArchive createDeploymentVehicle() { - // War - // the war with the correct archive name WebArchive transactional_ejblitejsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "transactional_ejblitejsp_vehicle_web.war"); - // The class files transactional_ejblitejsp_vehicle_web.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientJspTest.java index d4511b415f..2a96759e8e 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientJspTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientJspTest.java @@ -52,39 +52,12 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } - /** - EE10 Deployment Descriptors: - jta_ee_txpropagate1_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - jta_ee_txpropagate2_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - jta_ee_txpropagate3_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - jta_ejb_vehicle: - jta_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml - jta_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - jta_jsp_vehicle: - jta_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - jta_servlet_vehicle: - jta_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - - Found Descriptors: - Ejb: - - /com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.xml - /com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.jar.sun-ejb-jar.xml - War: - - /com/sun/ts/tests/jta/ee/txpropagationtest/jsp_vehicle_web.xml - /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml - Ear: - - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War - // the war with the correct archive name + WebArchive jta_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "jta_jsp_vehicle_web.war"); - // The class files jta_jsp_vehicle_web.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, com.sun.ts.lib.harness.EETest.Fault.class, @@ -106,25 +79,22 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(warResURL != null) { jta_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } - // Web content warResURL = ClientJspTest.class.getResource("/vehicle/jsp/contentRoot/client.html"); jta_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); warResURL = ClientJspTest.class.getResource("/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); jta_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); - + // The sun-web.xml descriptor warResURL = ClientJspTest.class.getClassLoader().getResource(packagePath+"/jta_jsp_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jta_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } - // archiveProcessor.processWebArchive(jta_jsp_vehicle_web, ClientJspTest.class, warResURL); + archiveProcessor.processWebArchive(jta_jsp_vehicle_web, ClientJspTest.class, warResURL); + - // Ejb - // the jar with the correct archive name JavaArchive jta_ee_txpropagate3_ejb = ShrinkWrap.create(JavaArchive.class, "jta_ee_txpropagate3_ejb.jar"); - // The class files jta_ee_txpropagate3_ejb.addClasses( com.sun.ts.tests.jta.ee.txpropagationtest.TxBean.class, com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB.class, @@ -141,32 +111,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(ejbResURL != null) { jta_ee_txpropagate3_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); } - // archiveProcessor.processEjbArchive(jta_ee_txpropagate3_ejb, ClientJspTest.class, ejbResURL); + archiveProcessor.processEjbArchive(jta_ee_txpropagate3_ejb, ClientJspTest.class, ejbResURL); - // Ear EnterpriseArchive jta_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jta_jsp_vehicle.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - // jta_jsp_vehicle_ear.addAsModule(jta_ee_txpropagate1_ejb); - // jta_jsp_vehicle_ear.addAsModule(jta_ee_txpropagate2_ejb); jta_jsp_vehicle_ear.addAsModule(jta_ee_txpropagate3_ejb); jta_jsp_vehicle_ear.addAsModule(jta_jsp_vehicle_web); - - - // // The application.xml descriptor - // URL earResURL = Client.class.getResource("/com/sun/ts/tests/jta/ee/txpropagationtest/"); - // if(earResURL != null) { - // jta_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - // } - // // The sun-application.xml descriptor - // earResURL = Client.class.getResource("/com/sun/ts/tests/jta/ee/txpropagationtest/.ear.sun-application.xml"); - // if(earResURL != null) { - // jta_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); - // } - // archiveProcessor.processEarArchive(jta_jsp_vehicle_ear, Client.class, earResURL); return jta_jsp_vehicle_ear; } diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest.java index f64e063635..0ae8299859 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest.java @@ -52,39 +52,12 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } - /** - EE10 Deployment Descriptors: - jta_ee_txpropagate1_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - jta_ee_txpropagate2_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - jta_ee_txpropagate3_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - jta_ejb_vehicle: - jta_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml - jta_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - jta_jsp_vehicle: - jta_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - jta_servlet_vehicle: - jta_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - - Found Descriptors: - Ejb: - - /com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.xml - /com/sun/ts/tests/jta/ee/txpropagationtest/jta_ee_txpropagate3_ejb.jar.sun-ejb-jar.xml - War: - - /com/sun/ts/tests/jta/ee/txpropagationtest/servlet_vehicle_web.xml - /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml - Ear: - - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War - // the war with the correct archive name + WebArchive jta_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "jta_servlet_vehicle_web.war"); - // The class files jta_servlet_vehicle_web.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, com.sun.ts.lib.harness.EETest.Fault.class, @@ -112,13 +85,10 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(warResURL != null) { jta_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } - // Web content - // archiveProcessor.processWebArchive(jta_servlet_vehicle_web, ClientServletTest.class, warResURL); + archiveProcessor.processWebArchive(jta_servlet_vehicle_web, ClientServletTest.class, warResURL); + - // Ejb - // the jar with the correct archive name JavaArchive jta_ee_txpropagate2_ejb = ShrinkWrap.create(JavaArchive.class, "jta_ee_txpropagate2_ejb.jar"); - // The class files jta_ee_txpropagate2_ejb.addClasses( com.sun.ts.tests.jta.ee.txpropagationtest.TxBean.class, com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB.class, @@ -135,31 +105,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(ejbResURL != null) { jta_ee_txpropagate2_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); } - // archiveProcessor.processEjbArchive(jta_ee_txpropagate2_ejb, ClientServletTest.class, ejbResURL); + archiveProcessor.processEjbArchive(jta_ee_txpropagate2_ejb, ClientServletTest.class, ejbResURL); // Ear EnterpriseArchive jta_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "jta_servlet_vehicle.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target - // jta_servlet_vehicle_ear.addAsModule(jta_ee_txpropagate1_ejb); jta_servlet_vehicle_ear.addAsModule(jta_ee_txpropagate2_ejb); - // jta_servlet_vehicle_ear.addAsModule(jta_ee_txpropagate3_ejb); jta_servlet_vehicle_ear.addAsModule(jta_servlet_vehicle_web); - - - // // The application.xml descriptor - // URL earResURL = Client.class.getResource("/com/sun/ts/tests/jta/ee/txpropagationtest/"); - // if(earResURL != null) { - // jta_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - // } - // // The sun-application.xml descriptor - // earResURL = Client.class.getResource("/com/sun/ts/tests/jta/ee/txpropagationtest/.ear.sun-application.xml"); - // if(earResURL != null) { - // jta_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); - // } - // archiveProcessor.processEarArchive(jta_servlet_vehicle_ear, Client.class, earResURL); return jta_servlet_vehicle_ear; } diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClient.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClient.java index 03588dbefe..d08584e6cd 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClient.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClient.java @@ -45,8 +45,6 @@ public class UserBeginClient extends ServiceEETest implements Serializable { private static final String testName = "jta.ee.usertransaction.begin"; - private static String packagePath = UserBeginClientJspTest.class.getPackageName().replace(".", "/"); - private UserTransaction userTransaction = null; public void setup(String[] args, Properties p) throws Exception { diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientJspTest.java index 1269e3ed35..5a11680aed 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientJspTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientJspTest.java @@ -53,32 +53,11 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } - /** - EE10 Deployment Descriptors: - begin_ejb_vehicle: - begin_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml - begin_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - begin_jsp_vehicle: - begin_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - begin_servlet_vehicle: - begin_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - - Found Descriptors: - War: - - /com/sun/ts/tests/jta/ee/usertransaction/begin/jsp_vehicle_web.xml - /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml - Ear: - - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War - // the war with the correct archive name WebArchive begin_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "begin_jsp_vehicle_web.war"); - // The class files begin_jsp_vehicle_web.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, @@ -105,16 +84,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test warResURL = UserBeginClientJspTest.class.getResource("/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); begin_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); - // The sun-web.xml descriptor - // warResURL = UserBeginClientJspTest.class.getClassLoader().getResource(packagePath+"/begin_jsp_vehicle_web.war.sun-web.xml"); - // if(warResURL != null) { - // begin_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); - // } - - - // archiveProcessor.processWebArchive(begin_jsp_vehicle_web, UserBeginClientJspTest.class, warResURL); + warResURL = UserBeginClientJspTest.class.getClassLoader().getResource(packagePath+"/begin_jsp_vehicle_web.war.sun-web.xml"); + if(warResURL != null) { + begin_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); + } + archiveProcessor.processWebArchive(begin_jsp_vehicle_web, UserBeginClientJspTest.class, warResURL); - // Ear EnterpriseArchive begin_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "begin_jsp_vehicle.ear"); begin_jsp_vehicle_ear.addAsModule(begin_jsp_vehicle_web); return begin_jsp_vehicle_ear; diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientServletTest.java index 5dc77be1d7..47445b3923 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientServletTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/begin/UserBeginClientServletTest.java @@ -53,32 +53,11 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } - /** - EE10 Deployment Descriptors: - begin_ejb_vehicle: - begin_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml - begin_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - begin_jsp_vehicle: - begin_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - begin_servlet_vehicle: - begin_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - - Found Descriptors: - War: - - /com/sun/ts/tests/jta/ee/usertransaction/begin/servlet_vehicle_web.xml - /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml - Ear: - - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War - // the war with the correct archive name WebArchive begin_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "begin_servlet_vehicle_web.war"); - // The class files begin_servlet_vehicle_web.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, com.sun.ts.lib.harness.EETest.Fault.class, @@ -89,11 +68,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.jta.ee.common.TransactionStatus.class, com.sun.ts.tests.jta.ee.usertransaction.begin.UserBeginClient.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, - com.sun.ts.tests.jta.ee.common.InvalidStatusException.class, - com.sun.ts.tests.jta.ee.common.InitFailedException.class, com.sun.ts.lib.harness.EETest.class, com.sun.ts.lib.harness.ServiceEETest.class, - com.sun.ts.tests.jta.ee.common.TransactionStatus.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, UserBeginClientServletTest.class @@ -101,17 +77,15 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The web.xml descriptor URL warResURL = UserBeginClientServletTest.class.getClassLoader().getResource(packagePath+"/servlet_vehicle_web.xml"); if(warResURL != null) { - begin_servlet_vehicle_web.setWebXML(warResURL); + begin_servlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor warResURL = UserBeginClientServletTest.class.getClassLoader().getResource(packagePath+"/begin_servlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { begin_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } - // Web content archiveProcessor.processWebArchive(begin_servlet_vehicle_web, UserBeginClientServletTest.class, warResURL); - // Ear EnterpriseArchive begin_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "begin_servlet_vehicle.ear"); begin_servlet_vehicle_ear.addAsModule(begin_servlet_vehicle_web); return begin_servlet_vehicle_ear; diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientJspTest.java index 2b1bf52669..96b8162d2c 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientJspTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientJspTest.java @@ -53,32 +53,11 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } - /** - EE10 Deployment Descriptors: - commit_ejb_vehicle: - commit_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml - commit_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - commit_jsp_vehicle: - commit_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - commit_servlet_vehicle: - commit_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - - Found Descriptors: - War: - - /com/sun/ts/tests/jta/ee/usertransaction/commit/jsp_vehicle_web.xml - /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml - Ear: - - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War - // the war with the correct archive name WebArchive commit_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "commit_jsp_vehicle_web.war"); - // The class files commit_jsp_vehicle_web.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, com.sun.ts.lib.harness.EETest.Fault.class, @@ -113,10 +92,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(warResURL != null) { commit_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } - archiveProcessor.processWebArchive(commit_jsp_vehicle_web, UserCommitClientJspTest.class, warResURL); - // Ear EnterpriseArchive commit_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "commit_jsp_vehicle.ear"); commit_jsp_vehicle_ear.addAsModule(commit_jsp_vehicle_web); return commit_jsp_vehicle_ear; diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientServletTest.java index 58f71922d3..cb6a406666 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientServletTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/commit/UserCommitClientServletTest.java @@ -53,32 +53,11 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } - /** - EE10 Deployment Descriptors: - commit_ejb_vehicle: - commit_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml - commit_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - commit_jsp_vehicle: - commit_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - commit_servlet_vehicle: - commit_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - - Found Descriptors: - War: - - /com/sun/ts/tests/jta/ee/usertransaction/commit/servlet_vehicle_web.xml - /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml - Ear: - - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War - // the war with the correct archive name WebArchive commit_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "commit_servlet_vehicle_web.war"); - // The class files commit_servlet_vehicle_web.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, com.sun.ts.lib.harness.EETest.Fault.class, @@ -111,7 +90,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Web content archiveProcessor.processWebArchive(commit_servlet_vehicle_web, UserCommitClientServletTest.class, warResURL); - // Ear EnterpriseArchive commit_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "commit_servlet_vehicle.ear"); commit_servlet_vehicle_ear.addAsModule(commit_servlet_vehicle_web); return commit_servlet_vehicle_ear; diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientJspTest.java index 0c5a94186b..ee62f03157 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientJspTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientJspTest.java @@ -53,32 +53,11 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } - /** - EE10 Deployment Descriptors: - getstatus_ejb_vehicle: - getstatus_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml - getstatus_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - getstatus_jsp_vehicle: - getstatus_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - getstatus_servlet_vehicle: - getstatus_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - - Found Descriptors: - War: - - /com/sun/ts/tests/jta/ee/usertransaction/getstatus/jsp_vehicle_web.xml - /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml - Ear: - - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War - // the war with the correct archive name WebArchive getstatus_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "getstatus_jsp_vehicle_web.war"); - // The class files getstatus_jsp_vehicle_web.addClasses( com.sun.ts.tests.jta.ee.usertransaction.getstatus.UserGetStatusClient.class, com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -117,28 +96,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test archiveProcessor.processWebArchive(getstatus_jsp_vehicle_web, UserGetStatusClientJspTest.class, warResURL); - // Ear EnterpriseArchive getstatus_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "getstatus_jsp_vehicle.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target getstatus_jsp_vehicle_ear.addAsModule(getstatus_jsp_vehicle_web); - - - - // // The application.xml descriptor - // URL earResURL = UserGetStatusClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/getstatus/"); - // if(earResURL != null) { - // getstatus_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - // } - // // The sun-application.xml descriptor - // earResURL = UserGetStatusClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/getstatus/.ear.sun-application.xml"); - // if(earResURL != null) { - // getstatus_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); - // } - // archiveProcessor.processEarArchive(getstatus_jsp_vehicle_ear, UserGetStatusClient.class, earResURL); - return getstatus_jsp_vehicle_ear; } diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientServletTest.java index 5ad825ae7c..3475322209 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientServletTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/getstatus/UserGetStatusClientServletTest.java @@ -53,32 +53,11 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } - /** - EE10 Deployment Descriptors: - getstatus_ejb_vehicle: - getstatus_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml - getstatus_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - getstatus_jsp_vehicle: - getstatus_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - getstatus_servlet_vehicle: - getstatus_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - - Found Descriptors: - War: - - /com/sun/ts/tests/jta/ee/usertransaction/getstatus/servlet_vehicle_web.xml - /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml - Ear: - - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War - // the war with the correct archive name WebArchive getstatus_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "getstatus_servlet_vehicle_web.war"); - // The class files getstatus_servlet_vehicle_web.addClasses( com.sun.ts.tests.jta.ee.usertransaction.getstatus.UserGetStatusClient.class, com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -108,31 +87,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(warResURL != null) { getstatus_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } - // Web content archiveProcessor.processWebArchive(getstatus_servlet_vehicle_web, UserGetStatusClientServletTest.class, warResURL); - // Ear - EnterpriseArchive getstatus_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "getstatus_servlet_vehicle.ear"); - - // Any libraries added to the ear - // The component jars built by the package target + EnterpriseArchive getstatus_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "getstatus_servlet_vehicle.ear"); getstatus_servlet_vehicle_ear.addAsModule(getstatus_servlet_vehicle_web); - - - - // // The application.xml descriptor - // URL earResURL = UserGetStatusClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/getstatus/"); - // if(earResURL != null) { - // getstatus_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - // } - // // The sun-application.xml descriptor - // earResURL = UserGetStatusClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/getstatus/.ear.sun-application.xml"); - // if(earResURL != null) { - // getstatus_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); - // } - // archiveProcessor.processEarArchive(getstatus_servlet_vehicle_ear, UserGetStatusClient.class, earResURL); - return getstatus_servlet_vehicle_ear; } diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientJspTest.java index 8eeb97ac3f..cd3f9b74aa 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientJspTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientJspTest.java @@ -53,32 +53,12 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } - /** - EE10 Deployment Descriptors: - rollback_ejb_vehicle: - rollback_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml - rollback_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - rollback_jsp_vehicle: - rollback_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - rollback_servlet_vehicle: - rollback_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - - Found Descriptors: - War: - - /com/sun/ts/tests/jta/ee/usertransaction/rollback/jsp_vehicle_web.xml - /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml - Ear: - - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War - // the war with the correct archive name + WebArchive rollback_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "rollback_jsp_vehicle_web.war"); - // The class files rollback_jsp_vehicle_web.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, com.sun.ts.lib.harness.EETest.Fault.class, @@ -118,26 +98,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // Ear EnterpriseArchive rollback_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "rollback_jsp_vehicle.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target rollback_jsp_vehicle_ear.addAsModule(rollback_jsp_vehicle_web); - - - - // // The application.xml descriptor - // URL earResURL = UserRollbackClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/rollback/"); - // if(earResURL != null) { - // rollback_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - // } - // // The sun-application.xml descriptor - // earResURL = UserRollbackClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/rollback/.ear.sun-application.xml"); - // if(earResURL != null) { - // rollback_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); - // } - // archiveProcessor.processEarArchive(rollback_jsp_vehicle_ear, UserRollbackClient.class, earResURL); - return rollback_jsp_vehicle_ear; } diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientServletTest.java index 66eeef34bf..48b410bc31 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientServletTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/rollback/UserRollbackClientServletTest.java @@ -53,32 +53,11 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } - /** - EE10 Deployment Descriptors: - rollback_ejb_vehicle: - rollback_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml - rollback_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - rollback_jsp_vehicle: - rollback_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - rollback_servlet_vehicle: - rollback_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - - Found Descriptors: - War: - - /com/sun/ts/tests/jta/ee/usertransaction/rollback/servlet_vehicle_web.xml - /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml - Ear: - - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War - // the war with the correct archive name WebArchive rollback_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "rollback_servlet_vehicle_web.war"); - // The class files rollback_servlet_vehicle_web.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, com.sun.ts.lib.harness.EETest.Fault.class, @@ -108,31 +87,10 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(warResURL != null) { rollback_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } - // Web content archiveProcessor.processWebArchive(rollback_servlet_vehicle_web, UserRollbackClientServletTest.class, warResURL); - // Ear EnterpriseArchive rollback_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "rollback_servlet_vehicle.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target rollback_servlet_vehicle_ear.addAsModule(rollback_servlet_vehicle_web); - - - - // // The application.xml descriptor - // URL earResURL = UserRollbackClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/rollback/"); - // if(earResURL != null) { - // rollback_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - // } - // // The sun-application.xml descriptor - // earResURL = UserRollbackClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/rollback/.ear.sun-application.xml"); - // if(earResURL != null) { - // rollback_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); - // } - // archiveProcessor.processEarArchive(rollback_servlet_vehicle_ear, UserRollbackClient.class, earResURL); - return rollback_servlet_vehicle_ear; } diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/UserSetRollbackOnlyClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/UserSetRollbackOnlyClientServletTest.java index e517cc2fea..dc300a4af4 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/UserSetRollbackOnlyClientServletTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/UserSetRollbackOnlyClientServletTest.java @@ -53,32 +53,12 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } - /** - EE10 Deployment Descriptors: - setrollbackonly_ejb_vehicle: - setrollbackonly_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml - setrollbackonly_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - setrollbackonly_jsp_vehicle: - setrollbackonly_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - setrollbackonly_servlet_vehicle: - setrollbackonly_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - - Found Descriptors: - War: - - /com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/servlet_vehicle_web.xml - /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml - Ear: - - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War - // the war with the correct archive name + WebArchive setrollbackonly_servlet_vehicle_web = ShrinkWrap.create(WebArchive.class, "setrollbackonly_servlet_vehicle_web.war"); - // The class files setrollbackonly_servlet_vehicle_web.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, com.sun.ts.lib.harness.EETest.Fault.class, @@ -108,31 +88,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(warResURL != null) { setrollbackonly_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } - // Web content archiveProcessor.processWebArchive(setrollbackonly_servlet_vehicle_web, UserSetRollbackOnlyClientServletTest.class, warResURL); // Ear EnterpriseArchive setrollbackonly_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "setrollbackonly_servlet_vehicle.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target setrollbackonly_servlet_vehicle_ear.addAsModule(setrollbackonly_servlet_vehicle_web); - - - - // // The application.xml descriptor - // URL earResURL = UserSetRollbackOnlyClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/"); - // if(earResURL != null) { - // setrollbackonly_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - // } - // // The sun-application.xml descriptor - // earResURL = UserSetRollbackOnlyClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/setrollbackonly/.ear.sun-application.xml"); - // if(earResURL != null) { - // setrollbackonly_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); - // } - // archiveProcessor.processEarArchive(setrollbackonly_servlet_vehicle_ear, UserSetRollbackOnlyClient.class, earResURL); - return setrollbackonly_servlet_vehicle_ear; } diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientJspTest.java index ffb3e56b38..aeff2062e1 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientJspTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientJspTest.java @@ -53,32 +53,11 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } - /** - EE10 Deployment Descriptors: - settransactiontimeout_ejb_vehicle: - settransactiontimeout_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml - settransactiontimeout_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - settransactiontimeout_jsp_vehicle: - settransactiontimeout_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - settransactiontimeout_servlet_vehicle: - settransactiontimeout_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - - Found Descriptors: - War: - - /com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/jsp_vehicle_web.xml - /com/sun/ts/tests/common/vehicle/jsp/jsp_vehicle_web.xml - Ear: - - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { - // War - // the war with the correct archive name WebArchive settransactiontimeout_jsp_vehicle_web = ShrinkWrap.create(WebArchive.class, "settransactiontimeout_jsp_vehicle_web.war"); - // The class files settransactiontimeout_jsp_vehicle_web.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, com.sun.ts.lib.harness.EETest.Fault.class, @@ -102,42 +81,19 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(warResURL != null) { settransactiontimeout_jsp_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } - // Web content warResURL = UserSetTransactionTimeoutClientJspTest.class.getResource("/vehicle/jsp/contentRoot/client.html"); settransactiontimeout_jsp_vehicle_web.addAsWebResource(warResURL, "/client.html"); warResURL = UserSetTransactionTimeoutClientJspTest.class.getResource("/vehicle/jsp/contentRoot/jsp_vehicle.jsp"); settransactiontimeout_jsp_vehicle_web.addAsWebResource(warResURL, "/jsp_vehicle.jsp"); - // The sun-web.xml descriptor warResURL = UserSetTransactionTimeoutClientJspTest.class.getClassLoader().getResource(packagePath+"/settransactiontimeout_jsp_vehicle_web.war.sun-web.xml"); if(warResURL != null) { settransactiontimeout_jsp_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); - } - + } archiveProcessor.processWebArchive(settransactiontimeout_jsp_vehicle_web, UserSetTransactionTimeoutClientJspTest.class, warResURL); - // Ear EnterpriseArchive settransactiontimeout_jsp_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "settransactiontimeout_jsp_vehicle.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target settransactiontimeout_jsp_vehicle_ear.addAsModule(settransactiontimeout_jsp_vehicle_web); - - - - // // The application.xml descriptor - // URL earResURL = UserSetTransactionTimeoutClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/"); - // if(earResURL != null) { - // settransactiontimeout_jsp_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - // } - // // The sun-application.xml descriptor - // earResURL = UserSetTransactionTimeoutClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/.ear.sun-application.xml"); - // if(earResURL != null) { - // settransactiontimeout_jsp_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); - // } - // archiveProcessor.processEarArchive(settransactiontimeout_jsp_vehicle_ear, UserSetTransactionTimeoutClient.class, earResURL); - return settransactiontimeout_jsp_vehicle_ear; } diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientServletTest.java index f0b1cbaebd..0c8b6011a6 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientServletTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/UserSetTransactionTimeoutClientServletTest.java @@ -53,24 +53,6 @@ public void cleanup() { logger.log(Logger.Level.INFO, "cleanup ok"); } - /** - EE10 Deployment Descriptors: - settransactiontimeout_ejb_vehicle: - settransactiontimeout_ejb_vehicle_client: META-INF/application-client.xml,jar.sun-application-client.xml - settransactiontimeout_ejb_vehicle_ejb: META-INF/ejb-jar.xml,jar.sun-ejb-jar.xml - settransactiontimeout_jsp_vehicle: - settransactiontimeout_jsp_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - settransactiontimeout_servlet_vehicle: - settransactiontimeout_servlet_vehicle_web: WEB-INF/web.xml,war.sun-web.xml - - Found Descriptors: - War: - - /com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/servlet_vehicle_web.xml - /com/sun/ts/tests/common/vehicle/servlet/servlet_vehicle_web.xml - Ear: - - */ @TargetsContainer("tck-javatest") @OverProtocol("javatest") @Deployment(name = VEHICLE_ARCHIVE, order = 2) @@ -103,36 +85,14 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(warResURL != null) { settransactiontimeout_servlet_vehicle_web.setWebXML(warResURL); } - // The sun-web.xml descriptor warResURL = UserSetTransactionTimeoutClientServletTest.class.getClassLoader().getResource(packagePath+"/settransactiontimeout_servlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { settransactiontimeout_servlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } - // Web content archiveProcessor.processWebArchive(settransactiontimeout_servlet_vehicle_web, UserSetTransactionTimeoutClientServletTest.class, warResURL); - // Ear EnterpriseArchive settransactiontimeout_servlet_vehicle_ear = ShrinkWrap.create(EnterpriseArchive.class, "settransactiontimeout_servlet_vehicle.ear"); - - // Any libraries added to the ear - - // The component jars built by the package target settransactiontimeout_servlet_vehicle_ear.addAsModule(settransactiontimeout_servlet_vehicle_web); - - - - // // The application.xml descriptor - // URL earResURL = UserSetTransactionTimeoutClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/"); - // if(earResURL != null) { - // settransactiontimeout_servlet_vehicle_ear.addAsManifestResource(earResURL, "application.xml"); - // } - // // The sun-application.xml descriptor - // earResURL = UserSetTransactionTimeoutClient.class.getResource("/com/sun/ts/tests/jta/ee/usertransaction/settransactiontimeout/.ear.sun-application.xml"); - // if(earResURL != null) { - // settransactiontimeout_servlet_vehicle_ear.addAsManifestResource(earResURL, "sun-application.xml"); - // } - // archiveProcessor.processEarArchive(settransactiontimeout_servlet_vehicle_ear, UserSetTransactionTimeoutClient.class, earResURL); - return settransactiontimeout_servlet_vehicle_ear; } From 244981add4be912673ee57894d8682265661dd0d Mon Sep 17 00:00:00 2001 From: Alwin Joseph Date: Fri, 4 Oct 2024 14:17:54 +0530 Subject: [PATCH 2/2] remove TxBeanHome class added back by mistake --- .../ee/txpropagationtest/ClientEjbTest.java | 3 +- .../ee/txpropagationtest/ClientJspTest.java | 2 -- .../txpropagationtest/ClientServletTest.java | 2 -- .../jta/ee/txpropagationtest/TxBeanHome.java | 31 ------------------- .../ee/txpropagationtest/ejb_vehicle_ejb.xml | 1 - 5 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanHome.java diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientEjbTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientEjbTest.java index f18b40cf1c..7707b45dda 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientEjbTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientEjbTest.java @@ -152,8 +152,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The class files jta_ee_txpropagate1_ejb.addClasses( com.sun.ts.tests.jta.ee.txpropagationtest.TxBean.class, - com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB.class, - com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome.class + com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB.class ); // The ejb-jar.xml descriptor ejbResURL = ClientEjbTest.class.getClassLoader().getResource(packagePath+"/jta_ee_txpropagate1_ejb.xml"); diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientJspTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientJspTest.java index 2a96759e8e..8c289e212d 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientJspTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientJspTest.java @@ -66,7 +66,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.jta.ee.txpropagationtest.Client.class, com.sun.ts.tests.jta.ee.txpropagationtest.DBSupport.class, - com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome.class, com.sun.ts.lib.harness.EETest.class, com.sun.ts.lib.harness.ServiceEETest.class, com.sun.ts.lib.harness.EETest.SetupException.class, @@ -98,7 +97,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jta_ee_txpropagate3_ejb.addClasses( com.sun.ts.tests.jta.ee.txpropagationtest.TxBean.class, com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB.class, - com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome.class, com.sun.ts.tests.jta.ee.txpropagationtest.DBSupport.class ); // The ejb-jar.xml descriptor diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest.java index 0ae8299859..f86d0e06f9 100644 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest.java +++ b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/ClientServletTest.java @@ -67,7 +67,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.jta.ee.txpropagationtest.Client.class, com.sun.ts.tests.jta.ee.txpropagationtest.DBSupport.class, - com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome.class, com.sun.ts.lib.harness.EETest.class, com.sun.ts.lib.harness.ServiceEETest.class, com.sun.ts.lib.harness.EETest.SetupException.class, @@ -92,7 +91,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jta_ee_txpropagate2_ejb.addClasses( com.sun.ts.tests.jta.ee.txpropagationtest.TxBean.class, com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanEJB.class, - com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome.class, com.sun.ts.tests.jta.ee.txpropagationtest.DBSupport.class ); // The ejb-jar.xml descriptor diff --git a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanHome.java b/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanHome.java deleted file mode 100644 index f80db86de3..0000000000 --- a/jta/src/main/java/com/sun/ts/tests/jta/ee/txpropagationtest/TxBeanHome.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2007, 2020 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 - * 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 - */ - -/* - * $Id$ - */ - -package com.sun.ts.tests.jta.ee.txpropagationtest; - -import java.rmi.RemoteException; -import java.util.Properties; - -import jakarta.ejb.CreateException; -import jakarta.ejb.EJBHome; - -public interface TxBeanHome extends EJBHome { - public TxBean create(Properties p) throws RemoteException, CreateException; -} diff --git a/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/ejb_vehicle_ejb.xml b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/ejb_vehicle_ejb.xml index 92bbd124f0..3680a6dcca 100644 --- a/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/ejb_vehicle_ejb.xml +++ b/jta/src/main/resources/com/sun/ts/tests/jta/ee/txpropagationtest/ejb_vehicle_ejb.xml @@ -59,7 +59,6 @@ ejb/MyEjbReference Session - com.sun.ts.tests.jta.ee.txpropagationtest.TxBeanHome com.sun.ts.tests.jta.ee.txpropagationtest.TxBean