diff --git a/common/src/main/java/com/sun/ts/lib/harness/EETest.java b/common/src/main/java/com/sun/ts/lib/harness/EETest.java index 3095b32edd..e4a6d9760e 100644 --- a/common/src/main/java/com/sun/ts/lib/harness/EETest.java +++ b/common/src/main/java/com/sun/ts/lib/harness/EETest.java @@ -558,13 +558,13 @@ public Status run(String[] argv, Properties p) { getSetupMethodName(runMethod) + ", testName:" + sTestCase + ") " + "in test class " + testClass.getName() + "(test class was loaded from: " + testClass.getClassLoader().getName() + ")"); else - TestUtil.logTrace("GOT SETUP METHOD!"); + TestUtil.logTrace("GOT SETUP METHOD: " + setupMethod.getName() + " for " + testClass.getName()); cleanupMethod = getCleanupMethod(testClass, runMethod); if (cleanupMethod == null) return Status.failed("Invalid test case name as test cleanupMethod Method ( for " + sTestCase + ") could not be found in " + testClass.getName()); else - TestUtil.logTrace("GOT CLEANUP METHOD!"); + TestUtil.logTrace("GOT CLEANUP METHOD: " + cleanupMethod.getName() + " for " + testClass.getName()); try { TestUtil.logTrace("ABOUT TO INVOKE SETUP METHOD!"); // if new classname is true, use that class name instead of diff --git a/common/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java b/common/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java index 44662e523b..93f9b26e27 100644 --- a/common/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java +++ b/common/src/main/java/com/sun/ts/lib/harness/ServiceEETest.java @@ -94,7 +94,7 @@ public Status run(String[] argv, Properties p) { String className = this.getClass().getName(); // use this name for the context root or jndi name to eliminate // naming conflicts for apps deployed at the same time - String sVehicleEarName = TestUtil.getProperty(p, "vehicle_ear_name"); + // comment out unused: String sVehicleEarName = TestUtil.getProperty(p, "vehicle_ear_name"); TestUtil.logTrace("Vehicle to be used for this test is: " + sVehicle); // call to the Deliverable to run in deliverable specific vehicles // This should never be called on the server, so there is diff --git a/glassfish-runner/jpa-platform-tck/jakartaeetck/bin/certificates/clientcert.jks b/glassfish-runner/jpa-platform-tck/jakartaeetck/bin/certificates/clientcert.jks new file mode 100644 index 0000000000..09f5569c47 Binary files /dev/null and b/glassfish-runner/jpa-platform-tck/jakartaeetck/bin/certificates/clientcert.jks differ diff --git a/glassfish-runner/jpa-platform-tck/jakartaeetck/bin/certificates/clientcert.p12 b/glassfish-runner/jpa-platform-tck/jakartaeetck/bin/certificates/clientcert.p12 new file mode 100644 index 0000000000..409e41e673 Binary files /dev/null and b/glassfish-runner/jpa-platform-tck/jakartaeetck/bin/certificates/clientcert.p12 differ diff --git a/glassfish-runner/jpa-platform-tck/jakartaeetck/bin/certificates/cts_cert b/glassfish-runner/jpa-platform-tck/jakartaeetck/bin/certificates/cts_cert new file mode 100644 index 0000000000..0c3863c852 Binary files /dev/null and b/glassfish-runner/jpa-platform-tck/jakartaeetck/bin/certificates/cts_cert differ diff --git a/glassfish-runner/jpa-platform-tck/jakartaeetck/bin/ts.jte b/glassfish-runner/jpa-platform-tck/jakartaeetck/bin/ts.jte new file mode 100644 index 0000000000..fcba1b25d2 --- /dev/null +++ b/glassfish-runner/jpa-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/jpa-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/jpa-platform-tck/pom.xml b/glassfish-runner/jpa-platform-tck/pom.xml index 46a69fd4bc..28c29af256 100644 --- a/glassfish-runner/jpa-platform-tck/pom.xml +++ b/glassfish-runner/jpa-platform-tck/pom.xml @@ -56,6 +56,7 @@ 8.0.0-JDK17-M7 ${project.build.directory}/${glassfish.toplevel.dir} + ${glassfish.home}/glassfish/lib glassfish8 @@ -80,15 +81,14 @@ ctstable1 javax.sql.DataSource ./sql - jpa-tck + persistence-platform-tck-tests 11.0.0-SNAPSHOT - /jakartaeetck cts1 cts1 2.0.1 3.2.0 11.0.0-SNAPSHOT - 1.0.0-M15 + 1.0.0-M16 @@ -139,6 +139,12 @@ jakarta.persistence-api ${version.jakarta.persistence} + + jakarta.tck + persistence-platform-tck-common + ${version.jakarta.tck} + test + jakarta.tck persistence-platform-tck-spec-tests @@ -156,6 +162,21 @@ arquillian-container-test-spi ${arquillian.junit} + + org.jboss.arquillian.container + arquillian-container-spi + ${arquillian.junit} + + + org.jboss.arquillian.core + arquillian-core-spi + ${arquillian.junit} + + + org.jboss.arquillian.test + arquillian-test-impl-base + ${arquillian.junit} + org.glassfish.main.common simple-glassfish-api @@ -179,7 +200,7 @@ org.omnifaces.arquillian arquillian-glassfish-server-managed - 1.4 + 1.6 test @@ -212,7 +233,7 @@ jakarta.tck.arquillian arquillian-protocol-javatest - ${version.jakarta.tck.arquillian} + 1.0.0-M15 org.jboss.shrinkwrap.resolver @@ -244,13 +265,50 @@ jakarta.tck.arquillian arquillian-protocol-lib - ${version.jakarta.tck.arquillian} + 1.0.0-M15 jakarta.tck.arquillian tck-porting-lib ${version.jakarta.tck.arquillian} + + jakarta.tck + common + ${project.version} + + + jakarta.tck + libutil + ${project.version} + + + jakarta.tck + runtime + ${project.version} + + + jakarta.tck + dbprocedures + 3.2.0 + test + + + jakarta.persistence + jakarta.persistence-api + + + + + org.apache.derby + derbyclient + 10.15.2.0 + + + org.apache.derby + derbytools + 10.15.2.0 + @@ -315,7 +373,6 @@ jakarta.tck.arquillian arquillian-protocol-lib - ${version.jakarta.tck.arquillian} jar true ${project.build.directory}/protocol @@ -324,6 +381,73 @@ + + 004-copy-lib + + copy + + generate-resources + + + + jakarta.tck + libutil + true + ${project.build.directory}/lib + libutil.jar + + + jakarta.tck + common + true + ${project.build.directory}/lib + common.jar + + + jakarta.tck.arquillian + tck-porting-lib + true + ${project.build.directory}/lib + tck-porting-lib.jar + + + jakarta.tck + runtime + true + ${project.build.directory}/lib + runtime.jar + + + jakarta.tck + ${tck.artifactId} + true + ${project.build.directory}/lib + persistence-platform-tck-tests.jar + + + org.apache.derby + derbyclient + true + ${glassfish.lib.dir} + derbyclient.jar + + + org.apache.derby + derbytools + true + ${glassfish.lib.dir} + derbytools.jar + + + jakarta.tck.arquillian + arquillian-protocol-lib + true + ${project.build.directory}/lib + arquillian-protocol-lib.jar + + + + @@ -344,6 +468,20 @@ + + 006-StopDatabase + + exec + + post-integration-test + + ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/bin/asadmin + ${derby.basedir} + + stop-database + + + @@ -380,7 +518,7 @@ - jta-tests-appclient + jpa-tests-appclient integration-test verify @@ -389,11 +527,10 @@ tck-appclient - com/sun/ts/tests/jta/ee/transactional/*Ejb*.java - com/sun/ts/tests/jta/ee/txpropagationtest/*Ejb*.java - com/sun/ts/tests/jta/ee/usertransaction/**/*EjbTest*.java + ee/jakarta/tck/persistence/**/*Test.java + - jakarta.tck:persistence-platform-tck-tests + jakarta.tck:${tck.artifactId} ${project.build.directory}/${glassfish.toplevel.dir} ${project.build.directory}/${glassfish.toplevel.dir} @@ -411,6 +548,7 @@ true true /tmp + ${project.basedir} appclient-arquillian.xml @@ -432,7 +570,7 @@ ${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/glassfish-naming.jar - ee/jakarta/tck/persistence/**/*Test.java + tck-javatest diff --git a/glassfish-runner/jpa-platform-tck/src/test/resources/appclient-arquillian.xml b/glassfish-runner/jpa-platform-tck/src/test/resources/appclient-arquillian.xml index 2f4d5a265f..92cbff4e9e 100644 --- a/glassfish-runner/jpa-platform-tck/src/test/resources/appclient-arquillian.xml +++ b/glassfish-runner/jpa-platform-tck/src/test/resources/appclient-arquillian.xml @@ -8,7 +8,7 @@ - ${ts.home}/dist/ + target @@ -16,17 +16,49 @@ target/glassfish8 - + true true target/appclient + true - + ${glassfish.home}/glassfish/bin/appclient \ + -Djdk.tls.client.enableSessionTicketExtension=false \ + -Djdk.tls.server.enableSessionTicketExtension=false \ + -Djava.security.policy=${glassfish.home}/glassfish/lib/appclient/client.policy \ + -Dcts.tmp=${ts.home}/tmp \ + -Djava.security.auth.login.config=${glassfish.home}/glassfish/lib/appclient/appclientlogin.conf \ + -Djava.protocol.handler.pkgs=javax.net.ssl \ + -Djavax.net.ssl.keyStore=${ts.home}/bin/certificates/clientcert.jks \ + -Djavax.net.ssl.keyStorePassword=changeit \ + -Djavax.net.ssl.trustStore=${glassfish.home}/glassfish/domains/domain1/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=${glassfish.home}/glassfish/domains/domain1/logs \ + -Dri.log.file.location=${glassfish.home}/glassfish/domains/domain1/logs \ + -DwebServerHost.2=localhost \ + -DwebServerPort.2=8080 \ + -Ddeliverable.class=com.sun.ts.lib.deliverable.cts.CTSDeliverable \ + -jar \ + ${clientEarDir}/${clientAppArchive} + + \\ - CLASSPATH=${project.build.directory}/appclient/javatest.jar:${project.build.directory}/appclient/libutil.jar:${project.build.directory}/appclient/libcommon.jar + + PATH=${env.PATH};LD_LIBRARY_PATH=${glassfish.home}/lib;AS_DEBUG=true; + APPCPATH=target/lib/arquillian-protocol-lib.jar:target/lib/tck-porting-lib.jar ${project.basedir} - ${ts.home}/tmp - ${ts.home}/bin/ts.jte + /tmp + jakartaeetck/bin/ts.jte + sql/derby/derby.dml.sql true 20000 diff --git a/glassfish-runner/jpa-platform-tck/src/test/resources/arquillian.xml b/glassfish-runner/jpa-platform-tck/src/test/resources/arquillian.xml index 96bd8ab1ce..5d2b3007fe 100644 --- a/glassfish-runner/jpa-platform-tck/src/test/resources/arquillian.xml +++ b/glassfish-runner/jpa-platform-tck/src/test/resources/arquillian.xml @@ -7,7 +7,7 @@ target/deployments - ${ts.home}/dist/ + target/ @@ -18,7 +18,7 @@ true /tmp - ${ts.home}/bin/ts.jte + jakartaeetck/bin/ts.jte sql/derby/derby.dml.sql diff --git a/jpa/common/pom.xml b/jpa/common/pom.xml index 6615338c25..43bd66a152 100644 --- a/jpa/common/pom.xml +++ b/jpa/common/pom.xml @@ -39,6 +39,26 @@ + + + src/main/java + + **/*.xml + **/*.map + **/*.txt + **/*.sig* + + + + src/main/resources + + **/*.xml + **/*.map + **/*.txt + **/*.sig* + + + org.apache.maven.plugins diff --git a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/PMClientBase.java b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/PMClientBase.java index 9a852eb426..e7c9e45796 100644 --- a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/PMClientBase.java +++ b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/PMClientBase.java @@ -22,12 +22,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.StringWriter; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.math.BigDecimal; -import java.net.URL; -import java.net.URLClassLoader; import java.nio.charset.StandardCharsets; import java.sql.Date; import java.sql.Timestamp; @@ -47,23 +44,6 @@ import com.sun.ts.lib.harness.ServiceEETest; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; -import org.w3c.dom.Text; - import com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManager; import com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory; @@ -551,28 +531,30 @@ public void setInContainer(boolean inContainer) { */ protected Properties getPersistenceUnitProperties() { Properties jpaProps = new Properties(); - jpaProps.put(JAVAX_PERSISTENCE_PROVIDER, myProps.get(JAVAX_PERSISTENCE_PROVIDER)); - jpaProps.put(JAVAX_PERSISTENCE_JDBC_DRIVER, myProps.get(JAVAX_PERSISTENCE_JDBC_DRIVER)); - jpaProps.put(JAVAX_PERSISTENCE_JDBC_URL, myProps.get(JAVAX_PERSISTENCE_JDBC_URL)); - jpaProps.put(JAVAX_PERSISTENCE_JDBC_USER, myProps.get(JAVAX_PERSISTENCE_JDBC_USER)); - jpaProps.put(JAVAX_PERSISTENCE_JDBC_PASSWORD, myProps.get(JAVAX_PERSISTENCE_JDBC_PASSWORD)); - String provider_specific_props = (String) myProps.get(JPA_PROVIDER_IMPLEMENTATION_SPECIFIC_PROPERTIES); - - StringTokenizer st = new StringTokenizer(provider_specific_props, ":"); - while (st.hasMoreTokens()) { - StringTokenizer st1 = new StringTokenizer(st.nextToken(), "="); - String pspName, pspValue; - pspName = pspValue = null; - if (st1.hasMoreTokens()) { - pspName = st1.nextToken(); - } - if (st1.hasMoreTokens()) { - pspValue = st1.nextToken(); - } - jpaProps.put(pspName, pspValue); + if(isStandAloneMode()) { + jpaProps.put(JAVAX_PERSISTENCE_PROVIDER, myProps.get(JAVAX_PERSISTENCE_PROVIDER)); + jpaProps.put(JAVAX_PERSISTENCE_JDBC_DRIVER, myProps.get(JAVAX_PERSISTENCE_JDBC_DRIVER)); + jpaProps.put(JAVAX_PERSISTENCE_JDBC_URL, myProps.get(JAVAX_PERSISTENCE_JDBC_URL)); + jpaProps.put(JAVAX_PERSISTENCE_JDBC_USER, myProps.get(JAVAX_PERSISTENCE_JDBC_USER)); + jpaProps.put(JAVAX_PERSISTENCE_JDBC_PASSWORD, myProps.get(JAVAX_PERSISTENCE_JDBC_PASSWORD)); + String provider_specific_props = (String) myProps.get(JPA_PROVIDER_IMPLEMENTATION_SPECIFIC_PROPERTIES); + + StringTokenizer st = new StringTokenizer(provider_specific_props, ":"); + while (st.hasMoreTokens()) { + StringTokenizer st1 = new StringTokenizer(st.nextToken(), "="); + String pspName, pspValue; + pspName = pspValue = null; + if (st1.hasMoreTokens()) { + pspName = st1.nextToken(); + } + if (st1.hasMoreTokens()) { + pspValue = st1.nextToken(); + } + jpaProps.put(pspName, pspValue); + } + checkPersistenceUnitProperties(jpaProps); } - checkPersistenceUnitProperties(jpaProps); return jpaProps; } @@ -1112,90 +1094,6 @@ public String convertToURI(String path) { return sURI; } - public static final String STANDALONE_PERSISTENCE_XML = "ee/jakarta/tck/persistence/common/template/standalone/persistence.xml"; - public static final String EE_PERSISTENCE_XML = "ee/jakarta/tck/persistence/common/template/persistence.xml"; - - public static final String PERSISTENCE_ELEMENT_TAG = "persistence-unit"; - public static final String CLASS_ELEMENT_TAG = "class"; - public static final String MAPPING_ELEMENT_TAG = "mapping-file"; - public static final String TEMP_DIR = System.getProperty("java.io.tmpdir"); - public static final String PERSISTENCE_XML = "persistence.xml"; - public static final String ORM_XML = "orm.xml"; - public static final String MAPPING_FILE_XML = "myMappingFile.xml"; - - public JavaArchive createDeploymentJar(String jarName, String packageName, String[] classes, String persistenceFile, - String[] xmlFiles) throws Exception { - - JavaArchive archive = ShrinkWrap.create(JavaArchive.class, jarName); - - for (int j = 0; j < classes.length; j++) { - archive.addClass(classes[j]); - } - - if (persistenceFile.equals(STANDALONE_PERSISTENCE_XML) || persistenceFile.equals(EE_PERSISTENCE_XML)) { - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - DocumentBuilder db = dbf.newDocumentBuilder(); - TransformerFactory tf = TransformerFactory.newInstance(); - Transformer transformer = tf.newTransformer(); - - InputStream xmlStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(persistenceFile); - Document document = db.parse(xmlStream); - NodeList presistenceElement = document.getElementsByTagName(PERSISTENCE_ELEMENT_TAG); - for (int j = 0; j < xmlFiles.length; j++) { - if (!ORM_XML.equalsIgnoreCase(xmlFiles[j])) { - for (int i = 0; i < presistenceElement.getLength(); i++) { - Element mappingTag = document.createElement(MAPPING_ELEMENT_TAG); - Text mappingNode = document.createTextNode(xmlFiles[j]); - mappingTag.appendChild(mappingNode); - presistenceElement.item(i).appendChild(mappingTag); - } - } - } - for (int j = 0; j < classes.length; j++) { - for (int i = 0; i < presistenceElement.getLength(); i++) { - Element classTag = document.createElement(CLASS_ELEMENT_TAG); - Text classNode = document.createTextNode(classes[j]); - classTag.appendChild(classNode); - presistenceElement.item(i).appendChild(classTag); - } - } - StringWriter writer = new StringWriter(); - transformer.transform(new DOMSource(document), new StreamResult(writer)); - archive.addAsManifestResource(new StringAsset(writer.getBuffer().toString()), PERSISTENCE_XML); - } else { - InputStream xmlFileStream = Thread.currentThread().getContextClassLoader() - .getResourceAsStream(packageName.replace('.', '/') + "/" + persistenceFile); - archive.addAsManifestResource(new ByteArrayAsset(xmlFileStream), PERSISTENCE_XML); - } - for (int i = 0; i < xmlFiles.length; i++) { - if (ORM_XML.equalsIgnoreCase(xmlFiles[i])) { - InputStream xmlFileStream = Thread.currentThread().getContextClassLoader() - .getResourceAsStream(packageName.replace('.', '/') + "/" + xmlFiles[i]); - archive.addAsManifestResource(new ByteArrayAsset(xmlFileStream), xmlFiles[i]); - } else { - archive.addAsResource(packageName.replace('.', '/') + "/" + xmlFiles[i], xmlFiles[i]); - } - } - - if (STANDALONE_MODE.equalsIgnoreCase(mode)) { - archive.as(ZipExporter.class).exportTo(new File(TEMP_DIR + File.separator + jarName), true); - ClassLoader currentThreadClassLoader = Thread.currentThread().getContextClassLoader(); - URLClassLoader urlClassLoader = new URLClassLoader( - new URL[]{new File(TEMP_DIR + File.separator + jarName).toURL()}, currentThreadClassLoader); - Thread.currentThread().setContextClassLoader(urlClassLoader); - testArtifactDeployed = true; - } - - return archive; - - } - - public JavaArchive createDeploymentJar(String jarName, String packageName, String[] classes) throws Exception { - String xmlFiles[] = {}; - return createDeploymentJar(jarName, packageName, classes, STANDALONE_PERSISTENCE_XML, xmlFiles); - - } - public static String toString(InputStream inStream) throws IOException { try (BufferedReader bufReader = new BufferedReader(new InputStreamReader(inStream, StandardCharsets.UTF_8))) { return bufReader.lines().collect(Collectors.joining(System.lineSeparator())); diff --git a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/pluggability/util/LogFileProcessor.java b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/pluggability/util/LogFileProcessor.java index ed0b0ba2d3..a41ea53785 100644 --- a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/pluggability/util/LogFileProcessor.java +++ b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/pluggability/util/LogFileProcessor.java @@ -25,6 +25,7 @@ import java.lang.System.Logger; import java.util.Collection; import java.util.Iterator; +import java.util.Properties; import java.util.StringTokenizer; import java.util.Vector; @@ -65,15 +66,15 @@ public class LogFileProcessor { private static final Logger logger = (Logger) System.getLogger(LogFileProcessor.class.getName()); - public LogFileProcessor() { - setup(); + public LogFileProcessor(Properties props) { + setup(props); } /** * setup method */ - public void setup() { - logFileLocation = System.getProperty("log.file.location"); + public void setup(Properties props) { + logFileLocation = props.getProperty("log.file.location"); if (logFileLocation == null) { logger.log(Logger.Level.ERROR, "LogFileProcessor setup failed "); diff --git a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/schema30/Spouse.java b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/schema30/Spouse.java index 21f77fa490..88c8516f1a 100644 --- a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/schema30/Spouse.java +++ b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/schema30/Spouse.java @@ -35,13 +35,13 @@ public class Spouse implements java.io.Serializable { // Instance variables private String id; - private String first; + private String firstName; - private String maiden; + private String maidenName; - private String last; + private String lastName; - private String sNumber; + private String socialSecurityNumber; private Info info; @@ -52,19 +52,19 @@ public Spouse() { public Spouse(String v1, String v2, String v3, String v4, String v5, Info v6) { id = v1; - first = v2; - maiden = v3; - last = v4; - sNumber = v5; + firstName = v2; + maidenName = v3; + lastName = v4; + socialSecurityNumber = v5; info = v6; } public Spouse(String v1, String v2, String v3, String v4, String v5, Info v6, Customer v7) { id = v1; - first = v2; - maiden = v3; - last = v4; - sNumber = v5; + firstName = v2; + maidenName = v3; + lastName = v4; + socialSecurityNumber = v5; info = v6; customer = v7; } @@ -83,38 +83,38 @@ public void setId(String v) { @Column(name = "FIRSTNAME") public String getFirstName() { - return first; + return firstName; } public void setFirstName(String v) { - first = v; + firstName = v; } @Column(name = "MAIDENNAME") public String getMaidenName() { - return maiden; + return maidenName; } public void setMaidenName(String v) { - maiden = v; + maidenName = v; } @Column(name = "LASTNAME") public String getLastName() { - return last; + return lastName; } public void setLastName(String v) { - last = v; + lastName = v; } @Column(name = "SOCSECNUM") public String getSocialSecurityNumber() { - return sNumber; + return socialSecurityNumber; } public void setSocialSecurityNumber(String v) { - sNumber = v; + socialSecurityNumber = v; } // 1X1 diff --git a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/schema30/Util.java b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/schema30/Util.java index a7deaeeb99..57d4a780e4 100644 --- a/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/schema30/Util.java +++ b/jpa/common/src/main/java/ee/jakarta/tck/persistence/common/schema30/Util.java @@ -1944,10 +1944,10 @@ public void setupPhoneData(String[] args, Properties p) throws Exception { } } - public void setupOrderData() throws Exception { + public void setupOrderData(String[] args, Properties p) throws Exception { logTrace("setupOrderData"); try { - super.setup(); + super.setup(args,p); removeTestData(); createCustomerData(); createProductData(); diff --git a/jpa/platform-tests/pom.xml b/jpa/platform-tests/pom.xml index 7550bac356..e46561b1d6 100644 --- a/jpa/platform-tests/pom.xml +++ b/jpa/platform-tests/pom.xml @@ -80,6 +80,26 @@ + + + src/main/java + + **/*.xml + **/*.map + **/*.txt + **/*.sig* + + + + src/main/resources + + **/*.xml + **/*.map + **/*.txt + **/*.sig* + + + org.apache.maven.plugins diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java index c8aa78cd8a..b52a6b2262 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.Entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_EntityGraph_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_EntityGraph_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanaged_vehicles_client.jar"); // The class files jpa_core_EntityGraph_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -75,6 +74,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class, com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, + ee.jakarta.tck.persistence.core.EntityGraph.Client.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -91,11 +91,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_EntityGraph_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_EntityGraph_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_EntityGraph_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_EntityGraph_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_EntityGraph_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +124,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_EntityGraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_EntityGraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } @@ -173,7 +173,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test } // Ear - EnterpriseArchive jpa_core_EntityGraph_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_EntityGraph_vehicles.ear"); + EnterpriseArchive jpa_core_EntityGraph_vehicles_ear = ShrinkWrap.create(EnterpriseArchive.class, "jpa_core_EntityGraph_appmanaged_vehicles.ear"); // Any libraries added to the ear @@ -289,4 +289,4 @@ public void annotationsTest() throws java.lang.Exception { } -} \ No newline at end of file +} diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java index 48acb02122..402042b100 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientAppmanagednotxTest.java @@ -1,5 +1,7 @@ package ee.jakarta.tck.persistence.core.EntityGraph; +import com.sun.ts.lib.harness.Status; +import java.util.Properties; import ee.jakarta.tck.persistence.core.EntityGraph.Client; import java.net.URL; import org.jboss.arquillian.container.test.api.Deployment; @@ -27,13 +29,23 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.EntityGraph.Client { static final String VEHICLE_ARCHIVE = "jpa_core_EntityGraph_appmanagedNoTx_vehicle"; + public static void main(String[] args) { + ClientAppmanagednotxTest theTests = new ClientAppmanagednotxTest(); + Status s = theTests.run(args, System.out, System.err); + s.exit(); + } + + public void setup(String[] args, Properties p) throws Fault { + super.setup(args, p); + } + + /** EE10 Deployment Descriptors: jpa_core_EntityGraph: META-INF/persistence.xml @@ -64,7 +76,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.En public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_EntityGraph_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_EntityGraph_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_vehicles_client.jar"); // The class files jpa_core_EntityGraph_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -83,6 +95,9 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, + ee.jakarta.tck.persistence.core.EntityGraph.Client.class, + ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class, + ee.jakarta.tck.persistence.core.EntityGraph.Department.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The application-client.xml descriptor @@ -91,11 +106,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_EntityGraph_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_EntityGraph_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_EntityGraph_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_EntityGraph_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_EntityGraph_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -113,6 +128,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.core.EntityGraph.Client.class, + ee.jakarta.tck.persistence.core.EntityGraph.Employee3.class, + ee.jakarta.tck.persistence.core.EntityGraph.Department.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, @@ -124,12 +141,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_EntityGraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPmservletTest.java index 5a33203561..85f1c18746 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_EntityGraph_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_EntityGraph_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPuservletTest.java index d577c2075f..759b23dc68 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientPuservletTest.java @@ -73,6 +73,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.Fault.class, com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class, ee.jakarta.tck.persistence.common.PMClientBase.class, + ee.jakarta.tck.persistence.core.EntityGraph.Client.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.core.EntityGraph.Client.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, @@ -90,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_EntityGraph_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_EntityGraph_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } @@ -262,4 +263,4 @@ public void annotationsTest() throws java.lang.Exception { } -} \ No newline at end of file +} diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java index 6f11923bee..aa313ba48f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.EntityG public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_EntityGraph_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_EntityGraph_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_vehicles_client.jar"); // The class files jpa_core_EntityGraph_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_EntityGraph_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_EntityGraph_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_EntityGraph_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_EntityGraph_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_EntityGraph_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_EntityGraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_EntityGraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java index 744d287169..bc7eb8257d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/EntityGraph/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.Entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_EntityGraph_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_EntityGraph_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_EntityGraph_vehicles_client.jar"); // The class files jpa_core_EntityGraph_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_EntityGraph_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_EntityGraph_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_EntityGraph_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_EntityGraph_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_EntityGraph_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_EntityGraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_EntityGraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java index 1bc99ad4fc..10ef8cb054 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.Store public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_vehicles_client.jar"); // The class files jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagednotxTest.java index 516d677052..39f5282cc8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.S public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_vehicles_client.jar"); // The class files jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateful3Test.java index 664f7cb49a..a836796d49 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.Stored public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_vehicles_client.jar"); // The class files jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateless3Test.java index 0eb7e24c47..d9d11707bb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.Store public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_vehicles_client.jar"); // The class files jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagedTest.java index 723382ea9e..357bc9520b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.Store public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_StoredProcedureQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_vehicles_client.jar"); // The class files jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_StoredProcedureQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagednotxTest.java index f07212d756..63afbc5b1d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.S public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_vehicles_client.jar"); // The class files jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateful3Test.java index 0cf98d81f3..e54d4975d6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.Stored public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_StoredProcedureQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_vehicles_client.jar"); // The class files jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_StoredProcedureQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateless3Test.java index aacf943aad..747384b02c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.Store public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_StoredProcedureQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_StoredProcedureQuery_vehicles_client.jar"); // The class files jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_StoredProcedureQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_StoredProcedureQuery_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagedTest.java index d60d7ad304..4bd14adf49 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagednotxTest.java index a8e8b60871..42082c32a6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateful3Test.java index 4d5ccbe74b..8f9124df4f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateless3Test.java index 408d23d3f7..a439793924 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagedTest.java index 389a876068..290d714b3b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagednotxTest.java index a5f69a2852..26ca907f20 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateful3Test.java index 67bbca8cfb..5652e568c4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateless3Test.java index 66a49f2243..c5763936a6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagedTest.java index 5c94008eaf..d28d6142f9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagednotxTest.java index a5b19879d8..99cf9e58ce 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateful3Test.java index 1a85baffe6..36414fa689 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateless3Test.java index 8580c9362c..46deb747b7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagedTest.java index 7c9118a7ce..673aa93915 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanaged_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagednotxTest.java index 2be41a0279..c0754d8808 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_appmanagedNoTx_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateful3Test.java index bda6e67900..d8f768c4b5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateful3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateless3Test.java index fb6900e5f9..dd7e60b76b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_field_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_field_vehicles_client.jar"); // The class files jpa_core_annotations_access_field_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_field_stateless3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagedTest.java index c28f8d2059..45eb00c086 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_anno_access_mappedsc_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_anno_access_mappedsc_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_vehicles_client.jar"); // The class files jpa_core_anno_access_mappedsc_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_anno_access_mappedsc_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_anno_access_mappedsc_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_anno_access_mappedsc_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_anno_access_mappedsc_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_anno_access_mappedsc_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_anno_access_mappedsc_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagednotxTest.java index aaaa2dc128..221cfbaf3e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_vehicles_client.jar"); // The class files jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_anno_access_mappedsc_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPmservletTest.java index 423d159c87..67ae2be4d5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_anno_access_mappedsc_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_anno_access_mappedsc_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPuservletTest.java index f5f97da28f..44251c6fa7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_anno_access_mappedsc_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_anno_access_mappedsc_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateful3Test.java index b41e2f640e..6e29c99188 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_anno_access_mappedsc_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_anno_access_mappedsc_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_vehicles_client.jar"); // The class files jpa_core_anno_access_mappedsc_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_anno_access_mappedsc_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_anno_access_mappedsc_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_anno_access_mappedsc_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_anno_access_mappedsc_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_anno_access_mappedsc_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_anno_access_mappedsc_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateless3Test.java index 69bccb1c86..39dfce600b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/mappedsc/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_anno_access_mappedsc_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_anno_access_mappedsc_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_anno_access_mappedsc_vehicles_client.jar"); // The class files jpa_core_anno_access_mappedsc_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_anno_access_mappedsc_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_anno_access_mappedsc_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_anno_access_mappedsc_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_anno_access_mappedsc_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_anno_access_mappedsc_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_anno_access_mappedsc_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagedTest.java index 7046d6d207..c2ce7f9a1c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_vehicles_client.jar"); // The class files jpa_core_annotations_access_property_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_property_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_property_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_property_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagednotxTest.java index 4f9dbcbd83..6ee53e898e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_vehicles_client.jar"); // The class files jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateful3Test.java index 6102886222..f82b6bc7ed 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_vehicles_client.jar"); // The class files jpa_core_annotations_access_property_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_property_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_property_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_property_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateless3Test.java index 9d93866bcb..6dad928243 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_vehicles_client.jar"); // The class files jpa_core_annotations_access_property_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_property_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_property_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_property_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagedTest.java index 4eeb657bea..f425519fe8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_property_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_vehicles_client.jar"); // The class files jpa_core_annotations_access_property_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_property_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_property_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_property_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagednotxTest.java index 29875e0131..00b6341be1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_vehicles_client.jar"); // The class files jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateful3Test.java index a9f7523a3b..aa76617cc0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_property_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_vehicles_client.jar"); // The class files jpa_core_annotations_access_property_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_property_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_property_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_property_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateless3Test.java index 03451ffbf5..0562dce7f4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_access_property_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_access_property_vehicles_client.jar"); // The class files jpa_core_annotations_access_property_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_access_property_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_access_property_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_access_property_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_access_property_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagedTest.java index 375dfea7f5..8d3ec4d668 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_assocoverride_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_assocoverride_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_vehicles_client.jar"); // The class files jpa_core_annotations_assocoverride_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_assocoverride_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_assocoverride_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_assocoverride_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_assocoverride_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_assocoverride_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_assocoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagednotxTest.java index c8db004225..7b0108f9f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_vehicles_client.jar"); // The class files jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_assocoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPmservletTest.java index ad22705063..d9e0474cba 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_assocoverride_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_assocoverride_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPuservletTest.java index 48e00dda4e..985e16f254 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_assocoverride_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_assocoverride_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateful3Test.java index 3afd1773e8..5f5ebb4718 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_assocoverride_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_assocoverride_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_vehicles_client.jar"); // The class files jpa_core_annotations_assocoverride_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_assocoverride_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_assocoverride_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_assocoverride_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_assocoverride_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_assocoverride_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_assocoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_assocoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateless3Test.java index 3833970a44..22646af2d2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/assocoverride/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_assocoverride_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_assocoverride_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_assocoverride_vehicles_client.jar"); // The class files jpa_core_annotations_assocoverride_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_assocoverride_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_assocoverride_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_assocoverride_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_assocoverride_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_assocoverride_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_assocoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_assocoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagedTest.java index e1ccdce36f..e41b8ebefd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_vehicles_client.jar"); // The class files jpa_core_annotations_basic_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagednotxTest.java index 2a2ba1b16b..fafe5eb942 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_vehicles_client.jar"); // The class files jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateful3Test.java index 857f1ea861..c1114e0f1a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_vehicles_client.jar"); // The class files jpa_core_annotations_basic_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateless3Test.java index 1ae0e94a7f..6ed38aaf8c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_vehicles_client.jar"); // The class files jpa_core_annotations_basic_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagedTest.java index 961077b3d5..91bbb7bb3f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_vehicles_client.jar"); // The class files jpa_core_annotations_basic_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagednotxTest.java index 207d95df27..a7d2d0da7d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_vehicles_client.jar"); // The class files jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateful3Test.java index 32133936d6..cb2df870ad 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_vehicles_client.jar"); // The class files jpa_core_annotations_basic_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateless3Test.java index dac5830edf..20e865de05 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/basic/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_vehicles_client.jar"); // The class files jpa_core_annotations_basic_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagedTest.java index bd93151f43..e78307001e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_collectiontable_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_collectiontable_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_vehicles_client.jar"); // The class files jpa_core_annotations_collectiontable_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_collectiontable_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_collectiontable_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_collectiontable_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_collectiontable_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_collectiontable_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_collectiontable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagednotxTest.java index e63af303ec..e1615ad401 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_vehicles_client.jar"); // The class files jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_collectiontable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPmservletTest.java index adb7991883..8bd4dcf930 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_collectiontable_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_collectiontable_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPuservletTest.java index d9c3282507..b8535dc86b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_collectiontable_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_collectiontable_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateful3Test.java index 3f4d5755c3..2fffcdae57 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_collectiontable_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_collectiontable_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_vehicles_client.jar"); // The class files jpa_core_annotations_collectiontable_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_collectiontable_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_collectiontable_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_collectiontable_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_collectiontable_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_collectiontable_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_collectiontable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_collectiontable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateless3Test.java index 551432fd9f..32b2a272fe 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/collectiontable/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_collectiontable_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_collectiontable_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_collectiontable_vehicles_client.jar"); // The class files jpa_core_annotations_collectiontable_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_collectiontable_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_collectiontable_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_collectiontable_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_collectiontable_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_collectiontable_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_collectiontable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_collectiontable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagedTest.java index 691cf40e98..4c6406f836 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_convert_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_convert_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_vehicles_client.jar"); // The class files jpa_core_convert_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_convert_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_convert_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_convert_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_convert_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_convert_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_convert_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_convert_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagednotxTest.java index 2a8cfd5fbc..218296e3c7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_convert_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_convert_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_vehicles_client.jar"); // The class files jpa_core_convert_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_convert_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_convert_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_convert_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_convert_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_convert_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_convert_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_convert_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPmservletTest.java index 2838e6b8c4..66e7580afe 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_convert_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_convert_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPuservletTest.java index b77c72222a..7f9ad79ec2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_convert_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_convert_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateful3Test.java index b858eca70b..d2e5e22af8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_convert_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_convert_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_vehicles_client.jar"); // The class files jpa_core_convert_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_convert_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_convert_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_convert_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_convert_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_convert_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_convert_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_convert_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateless3Test.java index b63dda3cfc..9462375677 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/convert/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_convert_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_convert_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_convert_vehicles_client.jar"); // The class files jpa_core_convert_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_convert_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_convert_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_convert_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_convert_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_convert_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_convert_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_convert_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagedTest.java index 468c64f814..c3fefbbd70 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_vehicles_client.jar"); // The class files jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_discrinimatorValue_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagednotxTest.java index b105bf6c54..a78eb65c2a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_vehicles_client.jar"); // The class files jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_discrinimatorValue_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPmservletTest.java index 534ceb159e..585fa2832c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_discrinimatorValue_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPuservletTest.java index 0faca11ff5..5325821359 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_discrinimatorValue_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateful3Test.java index 2e7109dff8..99f80827c8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_vehicles_client.jar"); // The class files jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_discrinimatorValue_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_discrinimatorValue_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateless3Test.java index 0e12b691c7..838c664702 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/discriminatorValue/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_discrinimatorValue_vehicles_client.jar"); // The class files jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_discrinimatorValue_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_discrinimatorValue_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagedTest.java index 953f8dde3f..f85ba05523 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_vehicles_client.jar"); // The class files jpa_core_annotations_elementcollection_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_elementcollection_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_elementcollection_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_elementcollection_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagednotxTest.java index d1d099eba7..c6865375e1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_vehicles_client.jar"); // The class files jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateful3Test.java index 87716d6f0e..1ca9980ae0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_vehicles_client.jar"); // The class files jpa_core_annotations_elementcollection_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_elementcollection_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_elementcollection_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_elementcollection_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateless3Test.java index fd2fcc8017..2c3ce6f002 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_vehicles_client.jar"); // The class files jpa_core_annotations_elementcollection_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_elementcollection_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_elementcollection_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_elementcollection_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagedTest.java index 887dcd1a65..7e9aacbdca 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_elementcollection_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_vehicles_client.jar"); // The class files jpa_core_annotations_elementcollection_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_elementcollection_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_elementcollection_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_elementcollection_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagednotxTest.java index 5887d65bb0..8f4e6884c3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_vehicles_client.jar"); // The class files jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateful3Test.java index 3618429ed9..fa10a0ef78 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_elementcollection_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_vehicles_client.jar"); // The class files jpa_core_annotations_elementcollection_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_elementcollection_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_elementcollection_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_elementcollection_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateless3Test.java index 9aa10297ac..89abc4dbe1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/elementcollection/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_elementcollection_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_elementcollection_vehicles_client.jar"); // The class files jpa_core_annotations_elementcollection_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_elementcollection_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_elementcollection_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_elementcollection_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_elementcollection_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagedTest.java index 537086ff4f..4d98f68497 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_embeddable_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_embeddable_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_vehicles_client.jar"); // The class files jpa_core_annotations_embeddable_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_embeddable_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_embeddable_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_embeddable_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_embeddable_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddable_appmanaged_vehicle_client, Client.class, resURL); @@ -136,12 +135,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagednotxTest.java index 8f6d5d2cc3..795e9ba8cd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_vehicles_client.jar"); // The class files jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -136,12 +135,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPmservletTest.java index 76404859fb..7f419e58fc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPmservletTest.java @@ -102,7 +102,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_embeddable_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_embeddable_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPuservletTest.java index 6fe318d75d..166c4ef229 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientPuservletTest.java @@ -102,7 +102,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_embeddable_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_embeddable_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateful3Test.java index 78c8a75687..9132b9d80a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_embeddable_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_embeddable_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_vehicles_client.jar"); // The class files jpa_core_annotations_embeddable_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_embeddable_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_embeddable_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_embeddable_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_embeddable_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddable_stateful3_vehicle_client, Client.class, resURL); @@ -136,12 +135,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateless3Test.java index 1aca207f48..b409836f28 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddable/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_embeddable_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_embeddable_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddable_vehicles_client.jar"); // The class files jpa_core_annotations_embeddable_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_embeddable_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_embeddable_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_embeddable_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_embeddable_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddable_stateless3_vehicle_client, Client.class, resURL); @@ -136,12 +135,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagedTest.java index 150489b2c6..dd68a8ada5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_vehicles_client.jar"); // The class files jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddableMapValue_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagednotxTest.java index 417a0b5537..7c42fb799f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_vehicles_client.jar"); // The class files jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddableMapValue_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPmservletTest.java index 7b90921f25..554e2c7b22 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_embeddableMapValue_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPuservletTest.java index 2e8e2dc565..9c725a11d7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_embeddableMapValue_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateful3Test.java index 04030a3622..66998bb403 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_vehicles_client.jar"); // The class files jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddableMapValue_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddableMapValue_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateless3Test.java index f87795f473..98b63c5552 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/embeddableMapValue/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_embeddableMapValue_vehicles_client.jar"); // The class files jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_embeddableMapValue_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_embeddableMapValue_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagedTest.java index 2b18b25b2b..6dc90881d8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_entity_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_entity_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_vehicles_client.jar"); // The class files jpa_core_annotations_entity_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_entity_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_entity_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_entity_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_entity_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_entity_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_entity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_entity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagednotxTest.java index dabb7ba4b3..f717d7a5ae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_entity_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_entity_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_vehicles_client.jar"); // The class files jpa_core_annotations_entity_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_entity_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_entity_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_entity_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_entity_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_entity_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_entity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPmservletTest.java index abbda20b84..2adcf5128b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_entity_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_entity_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPuservletTest.java index ad6286f247..33687785f7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_entity_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_entity_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateful3Test.java index c44d918c5e..3fb5578520 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_entity_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_entity_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_vehicles_client.jar"); // The class files jpa_core_annotations_entity_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_entity_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_entity_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_entity_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_entity_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_entity_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_entity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_entity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateless3Test.java index ca8b4cd0e4..6e9699a3a7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/entity/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_entity_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_entity_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_entity_vehicles_client.jar"); // The class files jpa_core_annotations_entity_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_entity_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_entity_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_entity_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_entity_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_entity_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_entity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_entity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagedTest.java index f6010adf4c..3b0b50b5ab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_basic_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_vehicles_client.jar"); // The class files jpa_core_annotations_basic_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagednotxTest.java index dcca840ad6..47749006e0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_basic_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_vehicles_client.jar"); // The class files jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPmservletTest.java index dbede5168a..d4341ad147 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_basic_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_basic_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPuservletTest.java index 0a9030c0ae..4f17e8803d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_basic_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_basic_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateful3Test.java index 579e89f57c..6fe7119cc5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_basic_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_vehicles_client.jar"); // The class files jpa_core_annotations_basic_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateless3Test.java index 62e5a6291d..46830cda4e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/id/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_basic_vehicles_client.jar"); // The class files jpa_core_annotations_basic_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_basic_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagedTest.java index 5190312315..6a39a656e9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_lob_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_lob_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_vehicles_client.jar"); // The class files jpa_core_annotations_lob_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_lob_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_lob_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_lob_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_lob_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_lob_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_lob_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_lob_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagednotxTest.java index 65b3976c9a..48aabd5415 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_lob_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_lob_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_vehicles_client.jar"); // The class files jpa_core_annotations_lob_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_lob_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_lob_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_lob_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_lob_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_lob_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_lob_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPmservletTest.java index 16c977abd6..3029daed40 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_lob_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_lob_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPuservletTest.java index be72fb00b1..9db4662074 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_lob_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_lob_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateful3Test.java index ad22270d3f..172bc9d872 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_lob_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_lob_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_vehicles_client.jar"); // The class files jpa_core_annotations_lob_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_lob_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_lob_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_lob_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_lob_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_lob_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_lob_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_lob_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateless3Test.java index fe87c34f49..fa5ba91116 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/lob/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_lob_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_lob_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_lob_vehicles_client.jar"); // The class files jpa_core_annotations_lob_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_lob_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_lob_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_lob_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_lob_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_lob_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_lob_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_lob_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagedTest.java index f54bf4eb47..f829ea8343 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -112,7 +111,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_vehicles_client.jar"); // The class files jpa_core_annotations_mapkey_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -144,7 +143,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_mapkey_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkey_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkey_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagednotxTest.java index 76802cd0da..1ced20f238 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -112,7 +111,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_vehicles_client.jar"); // The class files jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -144,7 +143,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateful3Test.java index 437cae6960..b0dc19f6af 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -112,7 +111,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_vehicles_client.jar"); // The class files jpa_core_annotations_mapkey_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -144,7 +143,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_mapkey_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkey_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkey_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateless3Test.java index 3114ecf912..ad7fb1fe13 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -112,7 +111,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_vehicles_client.jar"); // The class files jpa_core_annotations_mapkey_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -144,7 +143,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_mapkey_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkey_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkey_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagedTest.java index b2a8617012..8ba558e681 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -112,7 +111,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkey_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_vehicles_client.jar"); // The class files jpa_core_annotations_mapkey_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -144,7 +143,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_mapkey_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkey_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkey_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagednotxTest.java index 5c547adedf..c4b31b20b4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -112,7 +111,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_vehicles_client.jar"); // The class files jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -144,7 +143,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateful3Test.java index 32c74acaf5..c630a68757 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -112,7 +111,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkey_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_vehicles_client.jar"); // The class files jpa_core_annotations_mapkey_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -144,7 +143,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_mapkey_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkey_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkey_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateless3Test.java index bb38385f0d..26be173ec5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -112,7 +111,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkey_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkey_vehicles_client.jar"); // The class files jpa_core_annotations_mapkey_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -144,7 +143,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_mapkey_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkey_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkey_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkey_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagedTest.java index ef165ced0a..834eca7971 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyclass_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyclass_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagednotxTest.java index bda8cffd69..facd16931e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyclass_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPmservletTest.java index fac7f9b437..f2ce58fb80 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_mapkeyclass_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPuservletTest.java index 32ad1afa54..d314c92510 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyclass_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_mapkeyclass_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateful3Test.java index bbdbd91257..1c3f93fc13 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeyclass_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeyclass_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeyclass_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyclass_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeyclass_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeyclass_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeyclass_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyclass_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyclass_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateless3Test.java index 8b10b4da09..6c41618796 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyclass/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeyclass_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeyclass_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyclass_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeyclass_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyclass_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeyclass_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeyclass_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeyclass_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyclass_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyclass_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagedTest.java index c38b345be5..541ab5f7bd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeycolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagednotxTest.java index 2d32379fd3..20d4e16d50 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeycolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPmservletTest.java index e0fb150d46..e4724bfd96 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeycolumn_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_mapkeycolumn_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPuservletTest.java index 265f47f047..4e181df6aa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeycolumn_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_mapkeycolumn_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateful3Test.java index 77dc8c131c..7e5dcb38ae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeycolumn_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeycolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateless3Test.java index 5412574dc3..39e181c6e5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeycolumn/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeycolumn_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeycolumn_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeycolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagedTest.java index 739a6c8733..48dba7a44e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyenumerated_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagednotxTest.java index 0bc0d17ce2..2b096138b3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyenumerated_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPmservletTest.java index f04421a886..f92d526d62 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyenumerated_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_mapkeyenumerated_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPuservletTest.java index 080025d6da..71d9af947c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyenumerated_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_mapkeyenumerated_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateful3Test.java index 515af9f72f..4edf060d36 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyenumerated_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateless3Test.java index 8ff9f846ec..4ff1411f5e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyenumerated/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyenumerated_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyenumerated_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagedTest.java index 90252397fa..a3cbf9b3a1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyjoincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagednotxTest.java index 15a4de2e06..9fbb6e0bee 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPmservletTest.java index a2e08753a2..bf2a29312e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyjoincolumn_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_mapkeyjoincolumn_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPuservletTest.java index 1fd9552df1..072551ce12 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyjoincolumn_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_mapkeyjoincolumn_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateful3Test.java index a20b8193a5..86b7582079 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyjoincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateless3Test.java index 549b4093d6..2e0b593d32 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeyjoincolumn/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapkeyjoincolumn_vehicles_client.jar"); // The class files jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapkeyjoincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagedTest.java index 708fcf425b..af9faf4645 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_vehicles_client.jar"); // The class files jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapKeyTemporal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagednotxTest.java index fb4c807f3a..3d3a42880f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_vehicles_client.jar"); // The class files jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapKeyTemporal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPmservletTest.java index a9284cb851..11208b1aa8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapKeyTemporal_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_mapKeyTemporal_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPuservletTest.java index 1317bf500f..2a2d38ee41 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapKeyTemporal_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_mapKeyTemporal_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateful3Test.java index e7db41c36a..3a6b4e2d74 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_vehicles_client.jar"); // The class files jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapKeyTemporal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateless3Test.java index 754744304b..c9f9f0b0a2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkeytemporal/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapKeyTemporal_vehicles_client.jar"); // The class files jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapKeyTemporal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagedTest.java index b55775e9b9..8803b21231 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapsid_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapsid_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_vehicles_client.jar"); // The class files jpa_core_annotations_mapsid_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapsid_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapsid_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapsid_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapsid_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapsid_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapsid_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapsid_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagednotxTest.java index 4b7ccedeca..a5a76aed5d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_vehicles_client.jar"); // The class files jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapsid_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPmservletTest.java index f73543fa16..903e948ef8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapsid_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_mapsid_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPuservletTest.java index 8fd879627b..2f2d2590e0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapsid_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_mapsid_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateful3Test.java index ce6ae498f2..94992290db 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapsid_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapsid_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_vehicles_client.jar"); // The class files jpa_core_annotations_mapsid_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapsid_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapsid_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapsid_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapsid_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapsid_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapsid_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapsid_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateless3Test.java index cd95cc1eaa..1a7e498b91 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapsid/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_mapsid_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_mapsid_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_mapsid_vehicles_client.jar"); // The class files jpa_core_annotations_mapsid_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_mapsid_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_mapsid_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_mapsid_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_mapsid_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_mapsid_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapsid_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_mapsid_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagedTest.java index 6509ff9828..83d9206c2d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_nativequery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_nativequery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_vehicles_client.jar"); // The class files jpa_core_annotations_nativequery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_nativequery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_nativequery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_nativequery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_nativequery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_nativequery_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_nativequery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_nativequery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagednotxTest.java index 5bbda95df5..99093dffe2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_vehicles_client.jar"); // The class files jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_nativequery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPmservletTest.java index 51616334bc..e158d65879 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_nativequery_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_nativequery_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPuservletTest.java index b03aa152de..bd1f64ef6e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_nativequery_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_nativequery_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateful3Test.java index 04f1c40539..ee375a9e15 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_nativequery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_nativequery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_vehicles_client.jar"); // The class files jpa_core_annotations_nativequery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_nativequery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_nativequery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_nativequery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_nativequery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_nativequery_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_nativequery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_nativequery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateless3Test.java index 1c2230e4ca..0fb2216e59 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/nativequery/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_nativequery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_nativequery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_nativequery_vehicles_client.jar"); // The class files jpa_core_annotations_nativequery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_nativequery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_nativequery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_nativequery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_nativequery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_nativequery_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_nativequery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_nativequery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagedTest.java index 9ee9e4dd19..9077430f1b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_vehicles_client.jar"); // The class files jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_onexmanyuni_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_onexmanyuni_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagednotxTest.java index 3af09be96b..2d22986536 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_vehicles_client.jar"); // The class files jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_onexmanyuni_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPmservletTest.java index a747fea905..ef24e3f084 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_onexmanyuni_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_onexmanyuni_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPuservletTest.java index 48ea10a22c..00e9f59c0c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_onexmanyuni_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_onexmanyuni_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateful3Test.java index a9846bbacc..b5fbe434ca 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_onexmanyuni_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_onexmanyuni_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_vehicles_client.jar"); // The class files jpa_core_annotations_onexmanyuni_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_onexmanyuni_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_onexmanyuni_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_onexmanyuni_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_onexmanyuni_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_onexmanyuni_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_onexmanyuni_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateless3Test.java index ad9497e02e..e9367ebbfa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/onexmanyuni/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_onexmanyuni_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_onexmanyuni_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_onexmanyuni_vehicles_client.jar"); // The class files jpa_core_annotations_onexmanyuni_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_onexmanyuni_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_onexmanyuni_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_onexmanyuni_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_onexmanyuni_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_onexmanyuni_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_onexmanyuni_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagedTest.java index 8f9fda0f14..5ea9ac6fe3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_vehicles_client.jar"); // The class files jpa_core_annotations_orderby_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_orderby_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_orderby_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_orderby_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagednotxTest.java index be240b592c..459dd40f9e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_vehicles_client.jar"); // The class files jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateful3Test.java index b92b967a56..feda48b435 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_vehicles_client.jar"); // The class files jpa_core_annotations_orderby_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_orderby_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_orderby_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_orderby_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateless3Test.java index b16f1ad987..e048023ef8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_vehicles_client.jar"); // The class files jpa_core_annotations_orderby_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_orderby_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_orderby_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_orderby_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagedTest.java index 163d129e5c..eac9d158e8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_vehicles_client.jar"); // The class files jpa_core_annotations_orderby_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_orderby_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_orderby_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_orderby_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagednotxTest.java index 304f6903fc..238d9264af 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_vehicles_client.jar"); // The class files jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateful3Test.java index e6616bb345..bcf429acef 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_vehicles_client.jar"); // The class files jpa_core_annotations_orderby_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_orderby_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_orderby_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_orderby_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateless3Test.java index 76f36ac381..ce98c11351 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_vehicles_client.jar"); // The class files jpa_core_annotations_orderby_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_orderby_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_orderby_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_orderby_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagedTest.java index ba08d9c7ec..9049c24dda 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_orderby_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_vehicles_client.jar"); // The class files jpa_core_annotations_orderby_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_orderby_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_orderby_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_orderby_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagednotxTest.java index 1e347eef92..00c2131cb0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_vehicles_client.jar"); // The class files jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateful3Test.java index a3d428a674..6a29953f5e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_orderby_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_vehicles_client.jar"); // The class files jpa_core_annotations_orderby_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_orderby_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_orderby_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_orderby_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateless3Test.java index 7bdda94f96..86f0eee3f2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/orderby/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_orderby_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_orderby_vehicles_client.jar"); // The class files jpa_core_annotations_orderby_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_orderby_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_orderby_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_orderby_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_orderby_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagedTest.java index de2e39be6d..7ae55780b0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_ordercolumn_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_ordercolumn_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_vehicles_client.jar"); // The class files jpa_core_annotations_ordercolumn_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_ordercolumn_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_ordercolumn_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_ordercolumn_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagednotxTest.java index cc02117bde..a09d70a794 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_vehicles_client.jar"); // The class files jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateful3Test.java index 2d711c91eb..692517cfd6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_ordercolumn_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_ordercolumn_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_vehicles_client.jar"); // The class files jpa_core_annotations_ordercolumn_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_ordercolumn_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_ordercolumn_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_ordercolumn_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateless3Test.java index 6bc159926c..3afc870659 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_ordercolumn_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_ordercolumn_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_vehicles_client.jar"); // The class files jpa_core_annotations_ordercolumn_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_ordercolumn_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_ordercolumn_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_ordercolumn_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagedTest.java index 16589dea7a..d990d64bc5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_ordercolumn_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_ordercolumn_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_vehicles_client.jar"); // The class files jpa_core_annotations_ordercolumn_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_ordercolumn_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_ordercolumn_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_ordercolumn_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagednotxTest.java index e00f4280af..10329d78c3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_vehicles_client.jar"); // The class files jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateful3Test.java index f40f0ef5e0..9e80289a8c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_ordercolumn_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_ordercolumn_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_vehicles_client.jar"); // The class files jpa_core_annotations_ordercolumn_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_ordercolumn_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_ordercolumn_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_ordercolumn_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateless3Test.java index 512568a7df..b5bbc99a6c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/ordercolumn/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_ordercolumn_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_ordercolumn_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_ordercolumn_vehicles_client.jar"); // The class files jpa_core_annotations_ordercolumn_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_ordercolumn_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_ordercolumn_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_ordercolumn_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_ordercolumn_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagedTest.java index 5860dce2fb..53e1355608 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagednotxTest.java index 9f04b7bd4e..e98da1a4cc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateful3Test.java index c9f1407bff..b386a29216 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateless3Test.java index b3707373d8..c8ebf618fa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagedTest.java index b245b79d66..2484a3574f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagednotxTest.java index 493d7d0fe8..7f2f26ded5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateful3Test.java index 408320707c..4b80e2cbf0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateless3Test.java index df5cd5d13f..8a3ae0f17d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagedTest.java index c9bb7ae9ba..4a86784853 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagednotxTest.java index 5d8b76dc21..fe19f9eaba 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateful3Test.java index 351d43b5eb..86b168cc50 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateless3Test.java index e35c24baea..c535e3269a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagedTest.java index e11b54a2a9..f629c621ba 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanaged_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagednotxTest.java index ba5c9d3717..da094e4b7e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_appmanagedNoTx_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateful3Test.java index 7b60b17448..213edaacc4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateful3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateless3Test.java index 7da1c0cca4..397f77883f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_tableGenerator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_tableGenerator_vehicles_client.jar"); // The class files jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_tableGenerator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_tableGenerator_stateless3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagedTest.java index a9780b0a5d..a64b900a8b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_temporal_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_temporal_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_vehicles_client.jar"); // The class files jpa_core_annotations_temporal_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_temporal_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_temporal_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_temporal_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_temporal_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_temporal_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_temporal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_temporal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagednotxTest.java index bc61418ceb..0d5c4fc93a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.an public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_vehicles_client.jar"); // The class files jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_temporal_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_temporal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPmservletTest.java index 2a696b4250..169a6c0531 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_temporal_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_temporal_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPuservletTest.java index ddba8e81d9..2296972523 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_temporal_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_annotations_temporal_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateful3Test.java index a530a36177..4670932c11 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.annotat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_temporal_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_temporal_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_vehicles_client.jar"); // The class files jpa_core_annotations_temporal_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_temporal_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_temporal_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_temporal_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_temporal_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_temporal_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_temporal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_temporal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateless3Test.java index fd64763ae2..be4178c7cb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/temporal/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_temporal_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_temporal_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_temporal_vehicles_client.jar"); // The class files jpa_core_annotations_temporal_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_annotations_temporal_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_annotations_temporal_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_temporal_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_temporal_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_temporal_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_annotations_temporal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_annotations_temporal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagedTest.java index 4d71f6a484..67462e3a5e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagednotxTest.java index 35ffa0c65c..2bde887536 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateful3Test.java index ba3e0ede69..1129bc5927 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateless3Test.java index f4787eb169..2f10b2e8bb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagedTest.java index 14e27f9334..e7664b7cf0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagednotxTest.java index 53777997da..35ff79cfc2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateful3Test.java index 6da9a62fc5..f7e8e1a801 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateless3Test.java index 03a8838e71..87202fc5d6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagedTest.java index 88fd0c91cf..5621f68318 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagednotxTest.java index 468f2eb0ce..dca96de0aa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateful3Test.java index 83b711367c..36926dfc0e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateless3Test.java index 59ddb27dee..711505f33c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagedTest.java index 18dbbf90bd..11cb0750ef 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagedTest extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanaged_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagednotxTest.java index 947bf7f29a..c34238c277 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagednotxTest extends ee.jakarta.tck.persistence.core.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_appmanagedNoTx_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateful3Test.java index eb839ff224..0bc46cecea 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateful3Test extends ee.jakarta.tck.persistence.core.annota public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateful3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateless3Test.java index c877c833d3..02ac437885 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateless3Test extends ee.jakarta.tck.persistence.core.annot public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_annotations_version_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_annotations_version_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_annotations_version_vehicles_client.jar"); // The class files jpa_core_annotations_version_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_annotations_version_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_annotations_version_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_annotations_version_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_annotations_version_stateless3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagedTest.java index 2fd25a6553..0999178d96 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.basic. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_basic_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_basic_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_vehicles_client.jar"); // The class files jpa_core_basic_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_basic_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagednotxTest.java index c56903cee3..c9bcff7e41 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ba public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_basic_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_basic_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_vehicles_client.jar"); // The class files jpa_core_basic_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_basic_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPmservletTest.java index 9b59c1d55b..d57bc2c060 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_basic_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_basic_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPuservletTest.java index 552eff49f9..ff011d3d78 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_basic_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_basic_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateful3Test.java index 00410b078e..3d04b8ec82 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.basic.C public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_basic_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_basic_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_vehicles_client.jar"); // The class files jpa_core_basic_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_basic_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateless3Test.java index a6e89c877d..01fc46335b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/basic/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.basic. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_basic_vehicles_client.jar"); // The class files jpa_core_basic_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_basic_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagedTest.java index 4727482b40..5bb5c92f71 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.cache. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_cache_basicTests_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_cache_basicTests_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_vehicles_client.jar"); // The class files jpa_core_cache_basicTests_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_cache_basicTests_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_cache_basicTests_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_cache_basicTests_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_cache_basicTests_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_cache_basicTests_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_cache_basicTests_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_cache_basicTests_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagednotxTest.java index 64d6d3572a..0186b38712 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ca public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_vehicles_client.jar"); // The class files jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_cache_basicTests_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_cache_basicTests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPmservletTest.java index 38aca790a5..49347a50b6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPmservletTest.java @@ -83,14 +83,14 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class - ); + ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The web.xml descriptor URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); if(warResURL != null) { jpa_core_cache_basicTests_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_cache_basicTests_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPuservletTest.java index 25e5b54531..3e6eb0b16f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientPuservletTest.java @@ -83,14 +83,14 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class - ); + ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The web.xml descriptor URL warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.xml"); if(warResURL != null) { jpa_core_cache_basicTests_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_cache_basicTests_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateful3Test.java index ae8d2a2fa3..3524f62874 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.cache.b public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_cache_basicTests_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_cache_basicTests_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_vehicles_client.jar"); // The class files jpa_core_cache_basicTests_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_cache_basicTests_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_cache_basicTests_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_cache_basicTests_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_cache_basicTests_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_cache_basicTests_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_cache_basicTests_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_cache_basicTests_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateless3Test.java index 0ddccfae69..93e47396ab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.cache. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_cache_basicTests_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_cache_basicTests_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_cache_basicTests_vehicles_client.jar"); // The class files jpa_core_cache_basicTests_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_cache_basicTests_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_cache_basicTests_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_cache_basicTests_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_cache_basicTests_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_cache_basicTests_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_cache_basicTests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_cache_basicTests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagedTest.java index 11a946060f..787f854584 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.callba public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_inheritance_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_callback_inheritance_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_vehicles_client.jar"); // The class files jpa_core_callback_inheritance_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -87,15 +86,16 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ); // The application-client.xml descriptor URL resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml"); + System.out.println("xxx /com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml (ee.jakarta.tck.persistence.core.callback.inheritance) = " + resURL); if(resURL != null) { jpa_core_callback_inheritance_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_inheritance_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_inheritance_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_inheritance_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_inheritance_appmanaged_vehicle_client, Client.class, resURL); @@ -126,12 +126,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_inheritance_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_inheritance_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagednotxTest.java index 441edc7d68..e21de6f070 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ca public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_vehicles_client.jar"); // The class files jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_inheritance_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_inheritance_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPmservletTest.java index e6cc900847..6651c17891 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPmservletTest.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_inheritance_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_callback_inheritance_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPuservletTest.java index 2bca24660b..bef23dd44c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientPuservletTest.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_inheritance_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_callback_inheritance_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateful3Test.java index efc3f333b6..3c305f0708 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.callbac public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_inheritance_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_callback_inheritance_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_vehicles_client.jar"); // The class files jpa_core_callback_inheritance_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_inheritance_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_inheritance_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_inheritance_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_inheritance_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_inheritance_stateful3_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_inheritance_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_inheritance_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateless3Test.java index f8f937ac9d..e610bbc812 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/inheritance/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.callba public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_inheritance_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_callback_inheritance_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_inheritance_vehicles_client.jar"); // The class files jpa_core_callback_inheritance_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_inheritance_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_inheritance_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_inheritance_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_inheritance_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_inheritance_stateless3_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_inheritance_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_inheritance_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagedTest.java index 4888c9a7d1..d3af4347d5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.callba public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_listener_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_callback_listener_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_vehicles_client.jar"); // The class files jpa_core_callback_listener_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_listener_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_listener_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_listener_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_listener_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listener_appmanaged_vehicle_client, Client.class, resURL); @@ -138,12 +137,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_listener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_listener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagednotxTest.java index 30640a83ad..286cc69946 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ca public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_listener_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_callback_listener_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_vehicles_client.jar"); // The class files jpa_core_callback_listener_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_listener_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_listener_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_listener_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_listener_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listener_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -138,12 +137,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_listener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPmservletTest.java index 207c93d5b6..3d66a99886 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPmservletTest.java @@ -104,7 +104,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_listener_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_callback_listener_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPuservletTest.java index 68493503b5..03c9a45993 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientPuservletTest.java @@ -104,7 +104,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_listener_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_callback_listener_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateful3Test.java index 3a6730d0c7..e19ce5eaae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.callbac public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_listener_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_callback_listener_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_vehicles_client.jar"); // The class files jpa_core_callback_listener_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_listener_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_listener_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_listener_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_listener_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listener_stateful3_vehicle_client, Client.class, resURL); @@ -138,12 +137,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_listener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_listener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateless3Test.java index f4d4f1bc31..6baa3b911c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listener/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.callba public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_listener_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_callback_listener_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listener_vehicles_client.jar"); // The class files jpa_core_callback_listener_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_listener_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_listener_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_listener_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_listener_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listener_stateless3_vehicle_client, Client.class, resURL); @@ -138,12 +137,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_listener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_listener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagedTest.java index 9c9197e7f9..186d1fa4f2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.callba public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_listeneroverride_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_callback_listeneroverride_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_vehicles_client.jar"); // The class files jpa_core_callback_listeneroverride_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_listeneroverride_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_listeneroverride_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_listeneroverride_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_listeneroverride_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listeneroverride_appmanaged_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_listeneroverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagednotxTest.java index 4b63e80097..6dc6c065d6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ca public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_vehicles_client.jar"); // The class files jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_listeneroverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPmservletTest.java index 86cb4fe29c..ba60e8ccb8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPmservletTest.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_listeneroverride_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_callback_listeneroverride_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPuservletTest.java index 4c1eea9f30..91cce9abed 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientPuservletTest.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_listeneroverride_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_callback_listeneroverride_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateful3Test.java index c46ddb81b3..1b0aeeb1c6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.callbac public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_listeneroverride_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_callback_listeneroverride_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_vehicles_client.jar"); // The class files jpa_core_callback_listeneroverride_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_listeneroverride_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_listeneroverride_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_listeneroverride_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_listeneroverride_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listeneroverride_stateful3_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_listeneroverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_listeneroverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateless3Test.java index 12edb94bcb..8c15b8e7f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/listeneroverride/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.callba public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_listeneroverride_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_callback_listeneroverride_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_listeneroverride_vehicles_client.jar"); // The class files jpa_core_callback_listeneroverride_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_listeneroverride_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_listeneroverride_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_listeneroverride_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_listeneroverride_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_listeneroverride_stateless3_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_listeneroverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_listeneroverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagedTest.java index 39d6b941f4..458ca60d9b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.callba public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_method_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_callback_method_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_vehicles_client.jar"); // The class files jpa_core_callback_method_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_method_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_method_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_method_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_method_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_method_appmanaged_vehicle_client, Client.class, resURL); @@ -138,12 +137,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_method_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_method_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagednotxTest.java index f8dcad7a0c..c8c10ec1b0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ca public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_method_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_callback_method_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_vehicles_client.jar"); // The class files jpa_core_callback_method_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_method_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_method_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_method_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_method_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_method_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -138,12 +137,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_method_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_method_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPmservletTest.java index 24f128cf96..600aa62287 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPmservletTest.java @@ -104,7 +104,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_method_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_callback_method_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPuservletTest.java index f291cb643b..b1da430544 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientPuservletTest.java @@ -104,7 +104,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_method_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_callback_method_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateful3Test.java index 0e505f3a99..861a9e95fc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.callbac public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_method_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_callback_method_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_vehicles_client.jar"); // The class files jpa_core_callback_method_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_method_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_method_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_method_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_method_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_method_stateful3_vehicle_client, Client.class, resURL); @@ -138,12 +137,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_method_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_method_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateless3Test.java index 3439f13773..6b35e17f71 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/method/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.callba public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_method_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_callback_method_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_method_vehicles_client.jar"); // The class files jpa_core_callback_method_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_method_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_method_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_method_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_method_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_method_stateless3_vehicle_client, Client.class, resURL); @@ -138,12 +137,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_method_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_method_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagedTest.java index db31e64978..bf84c9f341 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.callba public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_methodoverride_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_callback_methodoverride_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_vehicles_client.jar"); // The class files jpa_core_callback_methodoverride_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_methodoverride_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_methodoverride_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_methodoverride_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_methodoverride_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_methodoverride_appmanaged_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_methodoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_methodoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagednotxTest.java index 7aec71a747..74ab763faf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ca public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_vehicles_client.jar"); // The class files jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_methodoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPmservletTest.java index 4004bc3b40..ff6fb31b70 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPmservletTest.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_methodoverride_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_callback_methodoverride_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPuservletTest.java index 121008a963..f9c00a69d4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientPuservletTest.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_methodoverride_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_callback_methodoverride_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateful3Test.java index 81f1e2abbf..4ce73c4aa0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.callbac public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_methodoverride_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_callback_methodoverride_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_vehicles_client.jar"); // The class files jpa_core_callback_methodoverride_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_methodoverride_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_methodoverride_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_methodoverride_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_methodoverride_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_methodoverride_stateful3_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_methodoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_methodoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateless3Test.java index 5ae814c204..58e7cecff4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/methodoverride/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.callba public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_methodoverride_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_callback_methodoverride_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_methodoverride_vehicles_client.jar"); // The class files jpa_core_callback_methodoverride_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_methodoverride_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_methodoverride_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_methodoverride_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_methodoverride_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_methodoverride_stateless3_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_methodoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_methodoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagedTest.java index c99517a273..5c11e55e48 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.callba public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_xml_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_callback_xml_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_vehicles_client.jar"); // The class files jpa_core_callback_xml_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_xml_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_xml_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_xml_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_xml_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_xml_appmanaged_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_xml_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_xml_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagednotxTest.java index 5e5ba8bbaf..fec06ebdab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ca public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_xml_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_callback_xml_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_vehicles_client.jar"); // The class files jpa_core_callback_xml_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_xml_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_xml_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_xml_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_xml_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_xml_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_xml_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPmservletTest.java index dbf8478273..5340610de4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPmservletTest.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_xml_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_callback_xml_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPuservletTest.java index 383050d4c9..25498222e7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientPuservletTest.java @@ -92,7 +92,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_xml_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_callback_xml_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateful3Test.java index be4da31565..4ec63743e0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.callbac public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_xml_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_callback_xml_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_vehicles_client.jar"); // The class files jpa_core_callback_xml_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_xml_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_xml_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_xml_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_xml_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_xml_stateful3_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_xml_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_xml_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateless3Test.java index 107828d421..88155a24cb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/callback/xml/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.callba public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_callback_xml_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_callback_xml_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_callback_xml_vehicles_client.jar"); // The class files jpa_core_callback_xml_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_callback_xml_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_callback_xml_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_callback_xml_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_callback_xml_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_callback_xml_stateless3_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_callback_xml_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_callback_xml_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagedTest.java index 329f43b7be..be6b33c49f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagednotxTest.java index 1ecfb050a0..d44310c8d0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateful3Test.java index ef2b5821c6..9beb783ce8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateless3Test.java index c4dd975aba..616b9d50a2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagedTest.java index 4c1565b07f..507085bfc7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagednotxTest.java index dac4461f83..3dd442cb0d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateful3Test.java index e0e290a640..c247ac138f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateless3Test.java index ca85044497..f8e0391b00 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagedTest.java index f1cc5f7919..befbc127aa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagednotxTest.java index c845f0362a..d5cedb32a5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateful3Test.java index 8a0537763c..00d249f1c1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateless3Test.java index 274a967c78..abafc4655d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagedTest.java index 618393e968..08e20ec1a0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagednotxTest.java index 7b4931bc10..0d5939c7c3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateful3Test.java index 23b99365ee..42ae258cf4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateless3Test.java index 26b5d25147..09378a3f9e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client4Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagedTest.java index 258899ac11..307230cbb0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagednotxTest.java index 2d7de13050..47b8f8d91b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateful3Test.java index b6f88a5e2d..8d335e27fb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateless3Test.java index 8c30149cf5..999ac2155c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client5Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagedTest.java index 71579d853d..48aa4a5222 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagednotxTest.java index fee3a6070a..2573236e58 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -77,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PmservletTest.java index 74fb496afd..d9549cf993 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PmservletTest.java @@ -75,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PuservletTest.java index 79d856d35b..25f1553231 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6PuservletTest.java @@ -76,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateful3Test.java index 0566e0eb38..c91c8e9aa8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateless3Test.java index eab5247979..0f73c85131 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client6Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -75,6 +74,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagedTest.java index 923099e387..b3962cd5ff 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client7AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client7.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client7.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagednotxTest.java index 0a1873f87a..67e545d20c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client7AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client7.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client7.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateful3Test.java index 6c7aa51a11..15491ea1f9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client7Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client7.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client7.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateless3Test.java index ceed8071ec..fe671dd541 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client7Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client7Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client7.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client7.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagedTest.java index ecdbaee12f..892d85608c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client8AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client8.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanaged_vehicle_client, Client8.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagednotxTest.java index 712f223115..acff9da076 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client8AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client8.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_appmanagedNoTx_vehicle_client, Client8.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateful3Test.java index 7539e464b2..13642d9d62 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client8Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client8.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateful3_vehicle_client, Client8.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateless3Test.java index 82acc28adb..d5bb936c77 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaBuilder/Client8Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client8Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaBuilder_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client8.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaBuilder_stateless3_vehicle_client, Client8.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagedTest.java index ef601dfb25..688bf0b91d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,11 +91,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaDelete_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagednotxTest.java index 2f50f17011..871616c625 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.cr public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,11 +91,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaDelete_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPmservletTest.java index b99a8d357b..492920edbe 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPmservletTest.java @@ -91,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriapia_CriteriaDelete_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_criteriapia_CriteriaDelete_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPuservletTest.java index b7d982c09c..acd64b5c4e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientPuservletTest.java @@ -91,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriapia_CriteriaDelete_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_criteriapia_CriteriaDelete_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateful3Test.java index 541fa7c633..d7285f14a4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.criteri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,11 +91,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaDelete_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateless3Test.java index 4c3fefab00..55e8059f03 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaDelete/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaDelete_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,11 +91,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaDelete_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagedTest.java index 3035fe3b74..08232c9895 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagednotxTest.java index 71dd7941ab..9951196d97 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -77,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PmservletTest.java index 54619bd652..6ee7f40166 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PmservletTest.java @@ -75,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client1.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PuservletTest.java index 1c64fcec04..e1df76a4e1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1PuservletTest.java @@ -76,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client1.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateful3Test.java index be3547aac2..f00ebc1757 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateless3Test.java index dc516f17d4..1e31f20904 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -75,6 +74,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagedTest.java index 08648193a8..46ba54967b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagednotxTest.java index e4f49b11dd..25daf67bbd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2PuservletTest.java index cdf67c91a0..c48048e1ea 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2PuservletTest.java @@ -75,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client2.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateful3Test.java index 97412ca34e..760c35f8f9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateless3Test.java index 2fef7922d1..dc6ef64774 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagedTest.java index 0871559b25..6f9aebf1bb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagednotxTest.java index 39c97e1170..66bae49271 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateful3Test.java index 817f259cc1..649a8e96e5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateless3Test.java index eadd3b9530..a8c34b0374 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagedTest.java index a55e30a602..d0e457a743 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagednotxTest.java index 201ed8c377..7b9c31d20c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateful3Test.java index 4f20709079..60ceae604e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateless3Test.java index e3aea0bb17..46561e37e8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client4Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagedTest.java index 1064ec9ff2..06435dade1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagednotxTest.java index c6bb9b110b..4df87ca874 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -77,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PmservletTest.java index e128a16063..aa0f43a0fd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PmservletTest.java @@ -75,6 +75,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client5.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PuservletTest.java index 221af385c0..14308b7e85 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5PuservletTest.java @@ -76,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.CriteriaQuery.Client5.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateful3Test.java index 46acdc2e07..b3c0e1cd49 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateless3Test.java index 78094514af..f03bb9c0f4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -75,6 +74,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagedTest.java index 50d4e5a665..8a06a8e957 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagednotxTest.java index e1dd41342e..c497dee410 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateful3Test.java index 3f0f9f0524..06aec05bf3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateless3Test.java index 4e176c3f75..2a678699af 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client6Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagedTest.java index 10342bae9e..cace515259 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client7AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client7.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanaged_vehicle_client, Client7.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagednotxTest.java index b239da25cd..651dfca294 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client7AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client7.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_appmanagedNoTx_vehicle_client, Client7.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateful3Test.java index 7aaabdcbf7..ec5870adcb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client7Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client7.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateful3_vehicle_client, Client7.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateless3Test.java index 48745409c9..8e945bb8a5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client7Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client7Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_CriteriaQuery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client7.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_CriteriaQuery_stateless3_vehicle_client, Client7.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagedTest.java index 911219319d..0dd6437a66 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,11 +91,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaUpdate_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagednotxTest.java index a836f7279d..187079324f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.cr public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,11 +91,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaUpdate_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPmservletTest.java index d0b9635535..67213a3b38 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPmservletTest.java @@ -91,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriapia_CriteriaUpdate_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_criteriapia_CriteriaUpdate_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPuservletTest.java index b6fbd14e8a..f611f2d0d4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientPuservletTest.java @@ -91,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriapia_CriteriaUpdate_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_criteriapia_CriteriaUpdate_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateful3Test.java index e9648b4311..6407f4aad4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.criteri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,11 +91,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaUpdate_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateless3Test.java index debfb52599..923f83b22b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaUpdate/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriapia_CriteriaUpdate_vehicles_client.jar"); // The class files jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,11 +91,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_client, Client.class, resURL); @@ -126,12 +125,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_criteriapia_CriteriaUpdate_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagedTest.java index 80eb079e6d..f6986594be 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagednotxTest.java index cd036b1091..a946ddd1ad 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateful3Test.java index 86bfcbb91a..49302036a8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateless3Test.java index c59b953f85..09a62aa159 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagedTest.java index a7c8ee233c..7accbd2755 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagednotxTest.java index 8bc8ac42a5..a753774cfd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateful3Test.java index 0cfd58e4a8..57a50c50fb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateless3Test.java index 315bdbeccb..77a9c62b67 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagedTest.java index 112c6624bc..08e49bf7bb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagednotxTest.java index ff1c5eefb6..a2afd2f923 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -77,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PmservletTest.java index f717fca8f9..224461965a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PmservletTest.java @@ -75,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.From.Client3.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PuservletTest.java index 6d7d462db4..ac79e8e666 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3PuservletTest.java @@ -76,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.From.Client3.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateful3Test.java index 5d390cff42..695dd894e2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateless3Test.java index 766d92dad2..d17af0c9aa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -75,6 +74,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagedTest.java index 5b8e932c08..a22d61ac59 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanaged_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagednotxTest.java index 6f774d9e9d..aaeb8d3f2f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_appmanagedNoTx_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateful3Test.java index 2de2586d6d..1ba3eb8852 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateful3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateless3Test.java index 84b791d427..738a764e87 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/From/Client4Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_From_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_From_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_From_vehicles_client.jar"); // The class files jpa_core_criteriaapi_From_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_From_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_From_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_From_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_From_stateless3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagedTest.java index 8b89452b6c..a291675150 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Join_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Join_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Join_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Join_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Join_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Join_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagednotxTest.java index 03ca115e24..d741507c36 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateful3Test.java index a5b9397e56..ff4d8900f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Join_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Join_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Join_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Join_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Join_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Join_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateless3Test.java index 22177097a9..f35edd5c80 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Join_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Join_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Join_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Join_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Join_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Join_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagedTest.java index 903446ff19..872ef03ca9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Join_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Join_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Join_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Join_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Join_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Join_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagednotxTest.java index 6c52a4d4ad..a38a77ee6d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -77,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PmservletTest.java index 695b85c9ee..29921c5a49 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PmservletTest.java @@ -75,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PuservletTest.java index 45a7ba1a38..bf74fa95b8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2PuservletTest.java @@ -76,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateful3Test.java index 26279a6ac6..b6a1e905ee 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Join_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Join_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Join_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Join_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Join_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Join_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateless3Test.java index 6e0615473c..0a78de6060 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Join_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Join_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Join_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -75,6 +74,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Join_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Join_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Join_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagedTest.java index dc4cbb7cee..14cdd5a1ba 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Join_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Join_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Join_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Join_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Join_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Join_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagednotxTest.java index 57ea3a6bb3..f0ab2939e7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateful3Test.java index d29f255c9e..50136b7d36 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Join_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Join_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Join_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Join_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Join_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Join_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateless3Test.java index d94b3e8d9f..996f1a87e3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Join/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Join_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Join_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Join_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Join_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Join_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Join_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Join_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Join_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagedTest.java index 3ca7e542b2..13c88239c2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagednotxTest.java index 007ab005a3..6133b52f35 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateful3Test.java index 486334b3ce..ae32127053 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateless3Test.java index b3eb44e010..6dfd03b6e4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagedTest.java index ac43094087..c515885e7c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagednotxTest.java index 24e69d3537..6cc45d3308 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateful3Test.java index 0827553b0d..1a08f5dec2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateless3Test.java index 0682998ce2..943697f651 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagedTest.java index bf36ab6d39..d5c09c32c0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagednotxTest.java index 38dfe300fe..812e21f733 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -77,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateful3Test.java index 4de55ed724..89db6525c3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateless3Test.java index 0ca6045352..9c1850a9de 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagedTest.java index 7c8072bce9..daca939f5c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanaged_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagednotxTest.java index e51789e3f4..30d3ffd23a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_appmanagedNoTx_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateful3Test.java index be93dc8beb..34de844e12 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateful3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateless3Test.java index daec9a498d..2e124f85ba 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/Root/Client4Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_Root_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_Root_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_Root_vehicles_client.jar"); // The class files jpa_core_criteriaapi_Root_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_Root_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_Root_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_Root_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_Root_stateless3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagedTest.java index d7a1d974c5..2bb1f9772c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagednotxTest.java index d331178daf..dfeb854e2a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateful3Test.java index 32f5f974f8..2378d76913 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateless3Test.java index babb315fd6..12c61d4330 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagedTest.java index cb3533dd12..7287f8477c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagednotxTest.java index 92d774280b..72d212f5df 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -77,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PmservletTest.java index 6d90905e7c..44edcab9ab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PmservletTest.java @@ -74,6 +74,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, ee.jakarta.tck.persistence.core.criteriaapi.metamodelquery.Client2.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PuservletTest.java index fd7caad4a0..74b1fdacbb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2PuservletTest.java @@ -75,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, ee.jakarta.tck.persistence.core.criteriaapi.metamodelquery.Client2.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateful3Test.java index 28ddd39c6b..6cd61c0f72 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateless3Test.java index 183d15b01f..3d487171a1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -75,6 +74,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagedTest.java index 90ec9b7639..b1ac19d945 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagednotxTest.java index 9d177311c2..b6784137f2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateful3Test.java index 78b95d26aa..4aca2b04a9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateless3Test.java index c247631378..20d0ba72e6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagedTest.java index 5533a8d20a..36c6091c67 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagednotxTest.java index 0c0cffc5fb..b9bdf35f70 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateful3Test.java index a29dcc3bce..ee1c0b412a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateless3Test.java index 339adb377e..d3e9b0c608 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client4Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagedTest.java index b35e5f94ee..8709de36e9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagednotxTest.java index ab53eff477..d31891a4f8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateful3Test.java index f0125a7740..94fcf54b4a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateless3Test.java index 1ada55e5d8..1314bbb160 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client5Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagedTest.java index 69adab07d4..92da1249b5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagednotxTest.java index 7887620f58..65bf55bda5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateful3Test.java index 91a3e621ad..9a86dd0c1a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateless3Test.java index f95e22e1dc..6207dd4b42 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client6Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagedTest.java index 2f46e8e1ac..96430f58a6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client7AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client7.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanaged_vehicle_client, Client7.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagednotxTest.java index 3d26ac5317..1bb4b6ecc8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client7AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client7.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_appmanagedNoTx_vehicle_client, Client7.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateful3Test.java index 98ffd2c2de..7855fed58d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client7Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client7.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateful3_vehicle_client, Client7.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateless3Test.java index efe1d354e1..091e233243 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/metamodelquery/Client7Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client7Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_metamodelquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client7.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_metamodelquery_stateless3_vehicle_client, Client7.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagedTest.java index 4a2330e28b..83c165b98c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_misc_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_misc_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_vehicles_client.jar"); // The class files jpa_core_criteriaapi_misc_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_misc_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_misc_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_misc_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagednotxTest.java index b97e8fc930..18a5f2e869 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_vehicles_client.jar"); // The class files jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateful3Test.java index ae0f0ebd7a..bfe26c0bab 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_misc_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_misc_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_vehicles_client.jar"); // The class files jpa_core_criteriaapi_misc_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_misc_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_misc_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_misc_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateless3Test.java index 0b6a90c26a..e8022a2144 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_misc_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_misc_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_vehicles_client.jar"); // The class files jpa_core_criteriaapi_misc_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_misc_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_misc_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_misc_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagedTest.java index b59da20657..bc2bcd23fb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_misc_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_misc_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_vehicles_client.jar"); // The class files jpa_core_criteriaapi_misc_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_misc_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_misc_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_misc_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagednotxTest.java index a2f045452a..069753e172 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_vehicles_client.jar"); // The class files jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateful3Test.java index 82ff75f62c..3da807d91a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_misc_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_misc_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_vehicles_client.jar"); // The class files jpa_core_criteriaapi_misc_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_misc_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_misc_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_misc_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateless3Test.java index e1141ab57c..0c8edf078a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_misc_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_misc_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_vehicles_client.jar"); // The class files jpa_core_criteriaapi_misc_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_misc_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_misc_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_misc_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagedTest.java index 0a665d7017..b702b6e368 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_misc_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_misc_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_vehicles_client.jar"); // The class files jpa_core_criteriaapi_misc_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_misc_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_misc_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_misc_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagednotxTest.java index 4732ecf039..7f3d9be66d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_vehicles_client.jar"); // The class files jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -77,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PmservletTest.java index 8cef559919..36ef38bef3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PmservletTest.java @@ -75,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PuservletTest.java index 9039246a75..e9b2e8b9e7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3PuservletTest.java @@ -76,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateful3Test.java index 160cc5c91d..da7f78e7f8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_misc_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_misc_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_vehicles_client.jar"); // The class files jpa_core_criteriaapi_misc_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_misc_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_misc_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_misc_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateless3Test.java index f5ad9b8b9d..c3d54f590b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/misc/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_misc_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_misc_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_misc_vehicles_client.jar"); // The class files jpa_core_criteriaapi_misc_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -75,6 +74,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_misc_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_misc_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_misc_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_misc_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagedTest.java index 5ca862f272..8d9b38a6df 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_parameter_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_parameter_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_vehicles_client.jar"); // The class files jpa_core_criteriaapi_parameter_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_parameter_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_parameter_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_parameter_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagednotxTest.java index 2612df90a2..4864b6970d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_vehicles_client.jar"); // The class files jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -85,7 +84,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class - ); + ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The application-client.xml descriptor URL resURL = Client1.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml"); if(resURL != null) { @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateful3Test.java index 0771aa6255..9707e844e8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_parameter_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_parameter_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_vehicles_client.jar"); // The class files jpa_core_criteriaapi_parameter_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_parameter_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_parameter_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_parameter_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateless3Test.java index 3c36ac9c49..93097da0b5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_parameter_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_parameter_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_vehicles_client.jar"); // The class files jpa_core_criteriaapi_parameter_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_parameter_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_parameter_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_parameter_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagedTest.java index c87c25bb03..2afa40c0d7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_parameter_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_parameter_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_vehicles_client.jar"); // The class files jpa_core_criteriaapi_parameter_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -79,6 +78,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.lib.harness.ServiceEETest.class, com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_parameter_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_parameter_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_parameter_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagednotxTest.java index ea3d4d5eb2..57267c44d0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_vehicles_client.jar"); // The class files jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -79,6 +78,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.lib.harness.ServiceEETest.class, com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PmservletTest.java index a01d944385..e6b23f63d7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PmservletTest.java @@ -77,6 +77,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.lib.harness.ServiceEETest.class, com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.tests.common.vehicle.pmservlet.PMServletVehicle.class, @@ -84,7 +85,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class - ); + ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The web.xml descriptor URL warResURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.xml"); if(warResURL != null) { diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PuservletTest.java index ccde4a4605..56e7324e15 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2PuservletTest.java @@ -78,6 +78,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.lib.harness.ServiceEETest.class, com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateful3Test.java index e8d94aa271..c46a351b24 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_parameter_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_parameter_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_vehicles_client.jar"); // The class files jpa_core_criteriaapi_parameter_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -74,18 +73,20 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.UseEntityManagerFactory.class, com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, + ee.jakarta.tck.persistence.common.schema30.Util.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.lib.harness.ServiceEETest.class, com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class - ); + ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml"); if(resURL != null) { @@ -96,7 +97,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_parameter_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_parameter_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_parameter_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_stateful3_vehicle_client, Client2.class, resURL); @@ -118,13 +119,14 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.lib.harness.ServiceEETest.class, com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class - ); + ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The ejb-jar.xml descriptor URL ejbResURL1 = Client2.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateless3Test.java index 2e8c3fdbf7..285244d256 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_parameter_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_parameter_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_parameter_vehicles_client.jar"); // The class files jpa_core_criteriaapi_parameter_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -78,6 +77,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class, com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleRunner.class, com.sun.ts.lib.harness.ServiceEETest.class, com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, @@ -85,7 +85,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class - ); + ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes());; // The application-client.xml descriptor URL resURL = Client2.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml"); if(resURL != null) { @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_parameter_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_parameter_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_parameter_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_parameter_stateless3_vehicle_client, Client2.class, resURL); @@ -118,13 +118,14 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleBean.class, com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class, com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.lib.harness.ServiceEETest.class, com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, com.sun.ts.lib.harness.EETest.SetupException.class, com.sun.ts.tests.common.vehicle.VehicleClient.class, com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class, ee.jakarta.tck.persistence.core.criteriaapi.parameter.Client.class - ); + ).addClasses(ee.jakarta.tck.persistence.common.schema30.Util.getSchema30classes()); // The ejb-jar.xml descriptor URL ejbResURL1 = Client2.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagedTest.java index b930cede97..7eac32adfd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagednotxTest.java index 131e3a1289..15b34814f4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateful3Test.java index 567c8f25f7..50db7ddf67 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateless3Test.java index 0292a5d116..58ab8d1cbf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagedTest.java index c56fee8ac4..1de4cdfd44 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.appmanaged.AppManagedVehicleRunner.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagednotxTest.java index 9b210f5962..f42f1e4855 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -77,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PmservletTest.java index 41597545e4..440eceb8f6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PmservletTest.java @@ -75,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.strquery.Client2.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PuservletTest.java index ff8648c256..09c30fdddf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2PuservletTest.java @@ -76,6 +76,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.criteriaapi.strquery.Client2.class, com.sun.ts.tests.common.vehicle.servlet.ServletVehicle.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateful3Test.java index c5d57f4329..613ddfd6bb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -76,6 +75,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.common.PMClientBase.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleRunner.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.stateful3.Stateful3VehicleIF.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateless3Test.java index 8f63574183..cd34078eeb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -75,6 +74,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.EmptyVehicleRunner.class, ee.jakarta.tck.persistence.common.PMClientBase.class, ee.jakarta.tck.persistence.common.schema30.Util.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.tests.common.vehicle.stateless3.Stateless3VehicleIF.class, @@ -96,7 +96,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagedTest.java index e350c49d8c..5e9150a6ed 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagednotxTest.java index f3bb2a1193..64e6a87cc7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateful3Test.java index 0ef1135cd4..412854cf47 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateless3Test.java index 5e5d1979ae..554105224c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagedTest.java index 14651b68bc..f82626e379 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagednotxTest.java index a3f34b2a36..1191ecad20 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateful3Test.java index 0204cd6dde..7c27ffe744 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateless3Test.java index f16d7d390e..67aaacd645 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client4Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagedTest.java index cf1fef02b3..bf57a70c45 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5AppmanagedTest extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanaged_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagednotxTest.java index 3433daf67a..b8e1d2173d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5AppmanagednotxTest extends ee.jakarta.tck.persistence.core.c public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_appmanagedNoTx_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateful3Test.java index e255f2e77f..e14cb1a385 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5Stateful3Test extends ee.jakarta.tck.persistence.core.criter public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateful3_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateless3Test.java index c0aece90fa..15584ff8a4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/strquery/Client5Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5Stateless3Test extends ee.jakarta.tck.persistence.core.crite public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_criteriaapi_strquery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_criteriaapi_strquery_vehicles_client.jar"); // The class files jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_criteriaapi_strquery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_criteriaapi_strquery_stateless3_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagedTest.java index b22ec1901d..b38cb4d311 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex1a_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex1a_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex1a_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex1a_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex1a_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex1a_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex1a_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1a_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagednotxTest.java index aed28468a6..dcee88173c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.de public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPmservletTest.java index fd065433f6..6be753af1f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex1a_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex1a_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPuservletTest.java index ed47a7de4a..af5a6039d9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex1a_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex1a_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateful3Test.java index f08f661f8e..a0d595105a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.derived public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex1a_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex1a_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex1a_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex1a_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex1a_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex1a_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex1a_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1a_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateless3Test.java index 06de7efddf..8df10fe0f7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1a/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex1a_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex1a_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex1a_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex1a_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex1a_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex1a_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex1a_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1a_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagedTest.java index f6600789d2..fe6daab90a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex1b_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex1b_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex1b_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex1b_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex1b_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex1b_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex1b_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1b_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagednotxTest.java index 4efb944b3b..5bc8eb8fed 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.de public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPmservletTest.java index df17fc2d38..a4d0f77349 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex1b_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex1b_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPuservletTest.java index b6424daa09..d34a419d1b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex1b_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex1b_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateful3Test.java index 67af16c61c..68c2d2fe93 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.derived public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex1b_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex1b_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex1b_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex1b_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex1b_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex1b_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex1b_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1b_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateless3Test.java index 139e5062d0..54d1f1399a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex1b/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex1b_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex1b_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex1b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex1b_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex1b_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex1b_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex1b_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex1b_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex1b_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex1b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagedTest.java index d11ed76a3c..9905d2e68d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex2a_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex2a_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex2a_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex2a_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex2a_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex2a_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex2a_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2a_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagednotxTest.java index e9469def64..4a4acf0cdc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.de public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPmservletTest.java index 42dc032196..2ae4893cc6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex2a_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex2a_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPuservletTest.java index c84222d34c..cf2fef5c4d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex2a_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex2a_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateful3Test.java index de385be0c5..1d0193ff5c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.derived public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex2a_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex2a_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex2a_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex2a_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex2a_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex2a_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex2a_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2a_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateless3Test.java index 3cecf55737..dcffe3045b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2a/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex2a_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex2a_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex2a_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex2a_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex2a_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex2a_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex2a_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2a_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagedTest.java index 9d5b465684..ad6237104c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex2b_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex2b_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex2b_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex2b_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex2b_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex2b_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex2b_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2b_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagednotxTest.java index 92641f5b95..b4a4d082ae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.de public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPmservletTest.java index f2cd3d7ac0..f913960a38 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex2b_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex2b_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPuservletTest.java index d314882542..768c593fe3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex2b_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex2b_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateful3Test.java index 25063bd581..699580ddf4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.derived public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex2b_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex2b_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex2b_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex2b_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex2b_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex2b_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex2b_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2b_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateless3Test.java index 3998fdaa15..b67a9c455e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex2b/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex2b_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex2b_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex2b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex2b_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex2b_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex2b_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex2b_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex2b_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex2b_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex2b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagedTest.java index 1f351a0bd5..a2337b44ff 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex3a_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex3a_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex3a_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex3a_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex3a_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex3a_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex3a_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3a_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagednotxTest.java index fc4d50df11..d5a3020226 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.de public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPmservletTest.java index c2a919b8fc..5500053607 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex3a_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex3a_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPuservletTest.java index 98ac0047d1..49721f3cc6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex3a_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex3a_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateful3Test.java index 2f52c9ec75..2e98f5212d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.derived public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex3a_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex3a_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex3a_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex3a_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex3a_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex3a_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex3a_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3a_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateless3Test.java index 438c9db773..585bc56770 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3a/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex3a_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex3a_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex3a_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex3a_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex3a_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex3a_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex3a_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3a_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagedTest.java index 73ba3ac76e..a7aa4db558 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex3b_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex3b_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex3b_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex3b_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex3b_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex3b_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex3b_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3b_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagednotxTest.java index 92e7209140..e94265846d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.de public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPmservletTest.java index 1bbe0d6324..035f053441 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex3b_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex3b_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPuservletTest.java index d6553ee448..f91a96c241 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex3b_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex3b_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateful3Test.java index 6f064eec90..3ab517fa02 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.derived public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex3b_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex3b_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex3b_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex3b_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex3b_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex3b_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex3b_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3b_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateless3Test.java index 3809ad5977..483cbbab96 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex3b/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex3b_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex3b_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex3b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex3b_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex3b_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex3b_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex3b_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex3b_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex3b_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex3b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagedTest.java index bb8f02f951..feae5ca106 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex4a_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex4a_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex4a_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4a_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex4a_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex4a_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex4a_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4a_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagednotxTest.java index e3551af00b..f536a8ee9b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.de public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPmservletTest.java index ef54825184..57a5d46f4a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4a_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex4a_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPuservletTest.java index 75d03474dd..5ee0f49bdb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4a_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex4a_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateful3Test.java index c1af085495..f0a351e594 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.derived public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex4a_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex4a_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex4a_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4a_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex4a_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex4a_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex4a_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4a_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateless3Test.java index 5d6f356a7f..4f6009aeb6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4a/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex4a_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex4a_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex4a_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4a_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex4a_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex4a_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex4a_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4a_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagedTest.java index c426355c0d..95e1c54aef 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex4b_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex4b_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex4b_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4b_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex4b_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex4b_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex4b_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4b_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagednotxTest.java index 45105b6f9e..52eb12091a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.de public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPmservletTest.java index 822a3be2c6..1a75d3d68d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4b_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex4b_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPuservletTest.java index 8cefedb98f..fb8f340e1b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4b_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex4b_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateful3Test.java index abef9e7bc4..4d95d2a510 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.derived public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex4b_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex4b_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex4b_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4b_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex4b_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex4b_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex4b_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4b_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateless3Test.java index 2f88adf059..db918f9523 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex4b/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex4b_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex4b_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex4b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex4b_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex4b_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex4b_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex4b_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex4b_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex4b_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex4b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagedTest.java index 7fbfdc7f76..118ff46ecb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex5a_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex5a_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex5a_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5a_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex5a_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex5a_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex5a_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5a_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagednotxTest.java index ee16db25b3..b79efddf21 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.de public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPmservletTest.java index 8ff9595e5c..512e01e048 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5a_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex5a_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPuservletTest.java index 9b71ba25fa..f99bd23394 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5a_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex5a_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateful3Test.java index f6cddd7f06..42e8d69593 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.derived public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex5a_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex5a_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex5a_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5a_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex5a_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex5a_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex5a_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5a_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateless3Test.java index 7014ca40e8..f755ff0159 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5a/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex5a_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex5a_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex5a_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5a_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex5a_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex5a_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex5a_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5a_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagedTest.java index df2aab0891..bc822ab722 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex5b_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex5b_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex5b_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5b_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex5b_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex5b_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex5b_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5b_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.derivedid.ex5b.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagednotxTest.java index 1f9e60e2ab..94cb5d98e1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.de public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.derivedid.ex5b.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPmservletTest.java index 414b617d29..13c3ae3292 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5b_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex5b_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPuservletTest.java index a56be049ce..a9704a8517 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5b_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex5b_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateful3Test.java index 634afd7e24..870084e872 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.derived public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex5b_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex5b_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex5b_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5b_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex5b_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex5b_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex5b_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5b_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.derivedid.ex5b.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateless3Test.java index d59a103ee4..d7bf8666c4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex5b/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex5b_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex5b_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex5b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex5b_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex5b_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex5b_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex5b_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex5b_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex5b_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.derivedid.ex5b.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex5b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagedTest.java index 0447779cac..b3b4fe9f27 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex6a_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex6a_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex6a_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6a_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex6a_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex6a_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex6a_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6a_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6a_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagednotxTest.java index be4e8feeed..1a462cfcfa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.de public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6a_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPmservletTest.java index b8b6ed758c..583c4d8efc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6a_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex6a_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPuservletTest.java index 22ab55d90b..1716cc28f5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6a_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex6a_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateful3Test.java index c117f2ea97..1d394e908b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.derived public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex6a_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex6a_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex6a_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6a_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex6a_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex6a_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex6a_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6a_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6a_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateless3Test.java index 5249ae1ad7..91097ead7a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6a/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex6a_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex6a_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6a_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex6a_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6a_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex6a_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex6a_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex6a_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6a_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6a_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagedTest.java index 1b0ee510a8..b3945ee64f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex6b_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex6b_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex6b_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6b_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex6b_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex6b_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex6b_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6b_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6b_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagednotxTest.java index f800bf3fc3..b5a38b48b2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.de public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6b_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPmservletTest.java index f5e7ba873b..a4853ca606 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6b_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex6b_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPuservletTest.java index 778fd17af8..5a4540baee 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6b_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_deriverdid_ex6b_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateful3Test.java index aa5d3b87de..64893f751a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.derived public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex6b_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex6b_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex6b_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6b_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex6b_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex6b_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex6b_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6b_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6b_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateless3Test.java index 26be2f789d..55a5660e06 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/derivedid/ex6b/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.derive public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_deriverdid_ex6b_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_deriverdid_ex6b_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_deriverdid_ex6b_vehicles_client.jar"); // The class files jpa_core_deriverdid_ex6b_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_deriverdid_ex6b_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_deriverdid_ex6b_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_deriverdid_ex6b_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_deriverdid_ex6b_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_deriverdid_ex6b_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_deriverdid_ex6b_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagedTest.java index da15ae8475..1f817d2627 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -96,7 +95,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_entityManager_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_vehicles_client.jar"); // The class files jpa_core_entityManager_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -127,7 +126,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagednotxTest.java index ffb0f22134..69b35c740e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -96,7 +95,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.e public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_entityManager_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_vehicles_client.jar"); // The class files jpa_core_entityManager_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -127,7 +126,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateful3Test.java index 7456a49a7e..61023c8cef 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -96,7 +95,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_entityManager_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_vehicles_client.jar"); // The class files jpa_core_entityManager_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -127,7 +126,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateless3Test.java index 3eeaf38800..a9f51f6b2b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -96,7 +95,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_entityManager_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_vehicles_client.jar"); // The class files jpa_core_entityManager_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -127,7 +126,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagedTest.java index 5bbe760bbd..1c8bc03771 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -96,7 +95,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_entityManager_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_vehicles_client.jar"); // The class files jpa_core_entityManager_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -127,7 +126,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagednotxTest.java index 1ffcb1dc6e..06ddcc28a1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -96,7 +95,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.e public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_entityManager_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_vehicles_client.jar"); // The class files jpa_core_entityManager_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -127,7 +126,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PuservletTest.java index b9cc2261c2..b2f626c8ae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2PuservletTest.java @@ -109,6 +109,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.VehicleRunnable.class, com.sun.ts.tests.common.vehicle.ejb3share.UserTransactionWrapper.class, com.sun.ts.lib.harness.EETest.class, + com.sun.ts.lib.harness.Status.class, com.sun.ts.lib.harness.ServiceEETest.class, com.sun.ts.tests.common.vehicle.ejb3share.EntityTransactionWrapper.class, ee.jakarta.tck.persistence.core.entityManager.Client2.class, diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateful3Test.java index 5bed48fba3..1877152043 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -96,7 +95,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_entityManager_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_vehicles_client.jar"); // The class files jpa_core_entityManager_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -127,7 +126,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateless3Test.java index 0a99d43a82..fa96409f7c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -96,7 +95,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_entityManager_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_vehicles_client.jar"); // The class files jpa_core_entityManager_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -127,7 +126,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagedTest.java index b34b2877b8..f6f607ea8e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -96,7 +95,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_entityManager_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_vehicles_client.jar"); // The class files jpa_core_entityManager_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -127,7 +126,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagednotxTest.java index d7bfc5badd..6c6c4a83dd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -96,7 +95,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.e public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_entityManager_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_vehicles_client.jar"); // The class files jpa_core_entityManager_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -127,7 +126,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateful3Test.java index 7a13a1c5c9..00cedafabc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -96,7 +95,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_entityManager_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_vehicles_client.jar"); // The class files jpa_core_entityManager_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -127,7 +126,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateless3Test.java index 70dc7b9ac1..be2d4f016e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -96,7 +95,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_entityManager_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager_vehicles_client.jar"); // The class files jpa_core_entityManager_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -127,7 +126,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1AppmanagednotxTest.java index 1b904fedf8..f4af4071a9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.e public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager2_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_entityManager2_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2_vehicles_client.jar"); // The class files jpa_core_entityManager2_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager2_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager2_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager2_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager2_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1Stateless3Test.java index 0b91a49e52..b54b36ac64 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager2_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_entityManager2_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2_vehicles_client.jar"); // The class files jpa_core_entityManager2_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager2_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager2_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager2_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager2_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2AppmanagednotxTest.java index aebefda289..1c580d4f45 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.e public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager2_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_entityManager2_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2_vehicles_client.jar"); // The class files jpa_core_entityManager2_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager2_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager2_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager2_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager2_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2Stateless3Test.java index 4d84d1678d..e48ac52c0e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManager2_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_entityManager2_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManager2_vehicles_client.jar"); // The class files jpa_core_entityManager2_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManager2_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManager2_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManager2_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManager2_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagedTest.java index 7f935afad8..03654e2e50 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactory_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactory_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_vehicles_client.jar"); // The class files jpa_core_entityManagerFactory_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -107,7 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManagerFactory_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactory_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactory_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagednotxTest.java index 46bb2001b2..4553ed64ca 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.e public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_vehicles_client.jar"); // The class files jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -107,7 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateful3Test.java index 18fbc3b44a..b0c86d058d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactory_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactory_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_vehicles_client.jar"); // The class files jpa_core_entityManagerFactory_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -107,7 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManagerFactory_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactory_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactory_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateless3Test.java index 658861d49d..361a39610c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactory_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactory_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_vehicles_client.jar"); // The class files jpa_core_entityManagerFactory_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -107,7 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManagerFactory_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactory_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactory_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagedTest.java index 45f8811b1b..169880f3ba 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactory_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactory_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_vehicles_client.jar"); // The class files jpa_core_entityManagerFactory_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -107,7 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManagerFactory_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactory_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactory_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagednotxTest.java index 1183f3f66c..45ea5c9a66 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.e public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_vehicles_client.jar"); // The class files jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -107,7 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateful3Test.java index daf8572730..a57e1f2ff0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactory_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactory_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_vehicles_client.jar"); // The class files jpa_core_entityManagerFactory_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -107,7 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManagerFactory_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactory_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactory_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateless3Test.java index 99522ec84e..4021364044 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactory_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactory_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_vehicles_client.jar"); // The class files jpa_core_entityManagerFactory_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -107,7 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManagerFactory_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactory_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactory_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagedTest.java index 69dd662f43..613fe90f79 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactory_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactory_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_vehicles_client.jar"); // The class files jpa_core_entityManagerFactory_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -107,7 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManagerFactory_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactory_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactory_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagednotxTest.java index 626fd8702f..5c04adea32 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.e public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_vehicles_client.jar"); // The class files jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -107,7 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateful3Test.java index 2ad0d66cfa..e7b404c688 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactory_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactory_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_vehicles_client.jar"); // The class files jpa_core_entityManagerFactory_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -107,7 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManagerFactory_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactory_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactory_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateless3Test.java index aaf4244bad..8f1604f792 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactory/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.entit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactory_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactory_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactory_vehicles_client.jar"); // The class files jpa_core_entityManagerFactory_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -107,7 +106,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_entityManagerFactory_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactory_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactory_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactory_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagedTest.java index c306789d1a..3b38f0499e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException_vehicles_client.jar"); // The class files jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entityManagerFactoryCloseException_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagednotxTest.java index 5b0261636e..fde9b5defb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException_vehicles_client.jar"); // The class files jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entityManagerFactoryCloseException_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPmservletTest.java index 2e20e711c8..51e6d43b03 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManagerFactoryCloseException_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_entityManagerFactoryCloseException_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } @@ -100,8 +100,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test JavaArchive jpa_core_entityManagerFactoryCloseException_lib = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException.jar"); // The resources - libURL = Client.class.getResource("/persistence.xml"); - jpa_core_entityManagerFactoryCloseException_lib.addAsResource(libURL, "/persistence.xml"); + libURL = Client.class.getResource("persistence.xml"); + jpa_core_entityManagerFactoryCloseException_lib.addAsResource(libURL, "persistence.xml"); jpa_core_entityManagerFactoryCloseException_pmservlet_vehicle_web.addAsLibrary(jpa_core_entityManagerFactoryCloseException_lib); @@ -146,4 +146,4 @@ public void exceptionsTest() throws java.lang.Exception { } -} \ No newline at end of file +} diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPuservletTest.java index 04091202ee..5aee7e83c9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManagerFactoryCloseException_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_entityManagerFactoryCloseException_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } @@ -100,8 +100,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test JavaArchive jpa_core_entityManagerFactoryCloseException_lib = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException.jar"); // The resources - libURL = Client.class.getResource("/persistence.xml"); - jpa_core_entityManagerFactoryCloseException_lib.addAsResource(libURL, "/persistence.xml"); + libURL = Client.class.getResource("persistence.xml"); + jpa_core_entityManagerFactoryCloseException_lib.addAsResource(libURL, "persistence.xml"); jpa_core_entityManagerFactoryCloseException_puservlet_vehicle_web.addAsLibrary(jpa_core_entityManagerFactoryCloseException_lib); @@ -146,4 +146,4 @@ public void exceptionsTest() throws java.lang.Exception { } -} \ No newline at end of file +} diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateful3Test.java index 06e21476f9..d49fefeeaa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityM public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException_vehicles_client.jar"); // The class files jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entityManagerFactoryCloseException_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateless3Test.java index 7b5a4b4670..6e6c8006f5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManagerFactoryCloseExceptions/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityManagerFactoryCloseException_vehicles_client.jar"); // The class files jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entityManagerFactoryCloseException_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientAppmanagednotxTest.java index 12971552ca..f45003a669 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityTransaction_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityTransaction_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_entityTransaction_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityTransaction_vehicles_client.jar"); // The class files jpa_core_entityTransaction_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -87,11 +86,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityTransaction_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entityTransaction_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityTransaction_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityTransaction_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityTransaction_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -120,12 +119,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entityTransaction_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entityTransaction_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPmservletTest.java index db6208c060..e2634ca780 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPmservletTest.java @@ -86,7 +86,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityTransaction_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_entityTransaction_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPuservletTest.java index 3ef0e6e8c1..9d4c96de58 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientPuservletTest.java @@ -86,7 +86,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityTransaction_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_entityTransaction_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientStateless3Test.java index ebbca6c7bd..2249f1fbeb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entityTransaction/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entityTransaction_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityTransaction_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_entityTransaction_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entityTransaction_vehicles_client.jar"); // The class files jpa_core_entityTransaction_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -87,11 +86,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entityTransaction_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entityTransaction_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entityTransaction_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entityTransaction_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entityTransaction_stateless3_vehicle_client, Client.class, resURL); @@ -120,12 +119,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.entityTransaction.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entityTransaction_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entityTransaction_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagedTest.java index 4b590ace1a..5ca9ea26da 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entitytest_apitests_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_entitytest_apitests_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests_vehicles_client.jar"); // The class files jpa_core_entitytest_apitests_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_apitests_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entitytest_apitests_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entitytest_apitests_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entitytest_apitests_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_apitests_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_apitests_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_apitests_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagednotxTest.java index 34ddd3b059..c4a66239a0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests_vehicles_client.jar"); // The class files jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_apitests_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPmservletTest.java index 8ff6ad1225..6dd8371afb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_apitests_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_entitytest_apitests_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPuservletTest.java index 6e438293b7..7b5126594c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_apitests_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_entitytest_apitests_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateful3Test.java index 98cf26ef50..17219de56a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entitytest_apitests_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_entitytest_apitests_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests_vehicles_client.jar"); // The class files jpa_core_entitytest_apitests_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_apitests_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entitytest_apitests_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entitytest_apitests_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entitytest_apitests_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_apitests_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_apitests_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_apitests_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateless3Test.java index 485fb1a503..7691b5e6e3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/apitests/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entitytest_apitests_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_entitytest_apitests_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_apitests_vehicles_client.jar"); // The class files jpa_core_entitytest_apitests_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_apitests_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entitytest_apitests_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entitytest_apitests_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entitytest_apitests_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_apitests_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_apitests_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagedTest.java index 9d11c46e3a..593caccdcb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entitytest_bigdecimal_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_entitytest_bigdecimal_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal_vehicles_client.jar"); // The class files jpa_core_entitytest_bigdecimal_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_bigdecimal_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entitytest_bigdecimal_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entitytest_bigdecimal_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entitytest_bigdecimal_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_bigdecimal_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.entitytest.bigdecimal.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_bigdecimal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_bigdecimal_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagednotxTest.java index fadfef41dc..4af2f39dbf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal_vehicles_client.jar"); // The class files jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.entitytest.bigdecimal.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_bigdecimal_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPmservletTest.java index 914447b5d4..475971245f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_bigdecimal_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_entitytest_bigdecimal_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPuservletTest.java index d5817474eb..164642b947 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_bigdecimal_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_entitytest_bigdecimal_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateful3Test.java index 51a7213a89..2f40a2d23d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entitytest_bigdecimal_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_entitytest_bigdecimal_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal_vehicles_client.jar"); // The class files jpa_core_entitytest_bigdecimal_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_bigdecimal_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entitytest_bigdecimal_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entitytest_bigdecimal_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entitytest_bigdecimal_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_bigdecimal_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.entitytest.bigdecimal.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_bigdecimal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_bigdecimal_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateless3Test.java index ef6d9377f8..5b1b00c6ff 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/bigdecimal/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entitytest_bigdecimal_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_entitytest_bigdecimal_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_bigdecimal_vehicles_client.jar"); // The class files jpa_core_entitytest_bigdecimal_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_bigdecimal_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entitytest_bigdecimal_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entitytest_bigdecimal_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entitytest_bigdecimal_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_bigdecimal_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.entitytest.bigdecimal.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_bigdecimal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_bigdecimal_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagedTest.java index cac7cd3dba..d670cea748 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entitytest_biginteger_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_entitytest_biginteger_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger_vehicles_client.jar"); // The class files jpa_core_entitytest_biginteger_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_biginteger_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entitytest_biginteger_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entitytest_biginteger_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entitytest_biginteger_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_biginteger_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_biginteger_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_biginteger_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagednotxTest.java index 60ecfb4525..ea575fcd55 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger_vehicles_client.jar"); // The class files jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_biginteger_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPmservletTest.java index 489779bbe9..4db7f06e86 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_biginteger_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_entitytest_biginteger_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPuservletTest.java index 0df3336959..d093285884 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_biginteger_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_entitytest_biginteger_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateful3Test.java index 16c72b7a54..a165fd487c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entitytest_biginteger_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_entitytest_biginteger_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger_vehicles_client.jar"); // The class files jpa_core_entitytest_biginteger_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_biginteger_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entitytest_biginteger_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entitytest_biginteger_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entitytest_biginteger_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_biginteger_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_biginteger_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_biginteger_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateless3Test.java index fa2ccc9394..86fde0e332 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/biginteger/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_entitytest_biginteger_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_entitytest_biginteger_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_entitytest_biginteger_vehicles_client.jar"); // The class files jpa_core_entitytest_biginteger_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_entitytest_biginteger_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_entitytest_biginteger_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_entitytest_biginteger_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_entitytest_biginteger_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_entitytest_biginteger_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_biginteger_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_entitytest_biginteger_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagedTest.java index 6303a87a14..e76672b452 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagednotxTest.java index d721530c50..a14cd15ded 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPmservletTest.java index 9e9c735ad3..32e91bdbb6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_manyXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_cascadeall_manyXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPuservletTest.java index 89c2987637..8bea66855d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_manyXmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_cascadeall_manyXmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateful3Test.java index 3b44901557..1305411f8f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateless3Test.java index 89950fbee1..e34da77d52 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXmany/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXmany_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagedTest.java index 547d197541..52a39d3b19 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagednotxTest.java index 2963175ad6..9000141eb9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPmservletTest.java index 541d0acb57..1ce7109cb4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_manyXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_cascadeall_manyXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPuservletTest.java index fe6dd59dde..a1e7765687 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_manyXone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_cascadeall_manyXone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateful3Test.java index 0f920c36b7..d6d150c318 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_manyXone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_manyXone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_manyXone_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_manyXone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_manyXone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_manyXone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_manyXone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXone_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateless3Test.java index eb1abfb7c0..d958c6685b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/manyXone/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_manyXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_manyXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_manyXone_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_manyXone_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_manyXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_manyXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_manyXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_manyXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_manyXone_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagedTest.java index 7d8bf4a7fb..30c9e40c87 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagednotxTest.java index 20a18e97d1..774e18f844 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPmservletTest.java index 9b5ea3c141..9e98a32acb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_oneXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_cascadeall_oneXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPuservletTest.java index 607e6c57d3..35a25a97f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_oneXmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_cascadeall_oneXmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateful3Test.java index 7eee6faa3b..6fad787cee 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateless3Test.java index 9f920132d0..779984fa2b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXmany/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXmany_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagedTest.java index 23875c4ae5..805828fdb5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagednotxTest.java index 89e1b8f66e..b87c166791 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPmservletTest.java index 38acdf1963..9f73a630aa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_oneXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_cascadeall_oneXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPuservletTest.java index 3840a7dd59..ad983a9647 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_oneXone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_cascadeall_oneXone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateful3Test.java index 92f0dbdb9a..55355c786e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_oneXone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_oneXone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_oneXone_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_oneXone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_oneXone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_oneXone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_oneXone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXone_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateless3Test.java index 224cbecfc9..da1193acc5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/cascadeall/oneXone/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_cascadeall_oneXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_cascadeall_oneXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_cascadeall_oneXone_vehicles_client.jar"); // The class files jpa_core_et_cascadeall_oneXone_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_cascadeall_oneXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_cascadeall_oneXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_cascadeall_oneXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_cascadeall_oneXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_cascadeall_oneXone_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_cascadeall_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientPmservletTest.java index a104eaf89a..45543acd32 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientPmservletTest.java @@ -83,7 +83,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_detach_basic_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_detach_basic_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientStateless3Test.java index 1d48fd4ea5..d819faa4ee 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/basic/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -57,7 +56,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_detach_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_basic_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_detach_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_basic_vehicles_client.jar"); // The class files jpa_core_et_detach_basic_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -84,11 +83,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_detach_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_detach_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_detach_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_detach_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_detach_basic_stateless3_vehicle_client, Client.class, resURL); @@ -117,12 +116,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_detach_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_detach_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientPmservletTest.java index 537a968b18..7e0e4ed952 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientPmservletTest.java @@ -83,7 +83,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_detach_manyXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_detach_manyXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientStateless3Test.java index 9167d19896..e57a029368 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXmany/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -57,7 +56,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_detach_manyXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_manyXmany_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_detach_manyXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_manyXmany_vehicles_client.jar"); // The class files jpa_core_et_detach_manyXmany_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -84,11 +83,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_detach_manyXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_detach_manyXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_detach_manyXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_detach_manyXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_detach_manyXmany_stateless3_vehicle_client, Client.class, resURL); @@ -117,12 +116,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_detach_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_detach_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientPmservletTest.java index e056882e43..db35218736 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientPmservletTest.java @@ -83,7 +83,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_detach_manyXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_detach_manyXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientStateless3Test.java index f5611c308e..b1b486c6f0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/manyXone/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -57,7 +56,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_detach_manyXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_manyXone_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_detach_manyXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_manyXone_vehicles_client.jar"); // The class files jpa_core_et_detach_manyXone_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -84,11 +83,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_detach_manyXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_detach_manyXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_detach_manyXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_detach_manyXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_detach_manyXone_stateless3_vehicle_client, Client.class, resURL); @@ -117,12 +116,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_detach_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_detach_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientPmservletTest.java index d9357ee2d4..6a56dd4b28 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientPmservletTest.java @@ -83,7 +83,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_detach_oneXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_detach_oneXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientStateless3Test.java index cdda9a5b82..99a5f0746b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXmany/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -57,7 +56,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_detach_oneXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_oneXmany_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_detach_oneXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_oneXmany_vehicles_client.jar"); // The class files jpa_core_et_detach_oneXmany_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -84,11 +83,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_detach_oneXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_detach_oneXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_detach_oneXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_detach_oneXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_detach_oneXmany_stateless3_vehicle_client, Client.class, resURL); @@ -117,12 +116,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_detach_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_detach_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientPmservletTest.java index e9c701ebc5..c510fd953c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientPmservletTest.java @@ -83,7 +83,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_detach_oneXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_detach_oneXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientStateless3Test.java index 9ddf4a2941..f0f0282882 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/detach/oneXone/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -57,7 +56,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_detach_oneXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_oneXone_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_detach_oneXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_detach_oneXone_vehicles_client.jar"); // The class files jpa_core_et_detach_oneXone_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -84,11 +83,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_detach_oneXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_detach_oneXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_detach_oneXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_detach_oneXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_detach_oneXone_stateless3_vehicle_client, Client.class, resURL); @@ -117,12 +116,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_detach_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_detach_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagedTest.java index 99d8563274..a630f7e4cd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_basic_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_basic_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic_vehicles_client.jar"); // The class files jpa_core_et_persist_basic_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_basic_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagednotxTest.java index d130e69302..3f14e7dbe5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_basic_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_basic_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic_vehicles_client.jar"); // The class files jpa_core_et_persist_basic_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_basic_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPmservletTest.java index 166397f2ad..10e3cdde20 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_basic_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_persist_basic_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPuservletTest.java index 9ba253d9f6..8380f8a913 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_basic_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_persist_basic_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateful3Test.java index ca9c3dcae6..f119b28e5b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_basic_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_basic_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic_vehicles_client.jar"); // The class files jpa_core_et_persist_basic_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_basic_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateless3Test.java index 3a37f99ca4..5bef02fe7c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/basic/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_basic_vehicles_client.jar"); // The class files jpa_core_et_persist_basic_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_basic_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagedTest.java index b75f162a86..390da92f33 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_manyXmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_manyXmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany_vehicles_client.jar"); // The class files jpa_core_et_persist_manyXmany_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_manyXmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_manyXmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_manyXmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_manyXmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXmany_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagednotxTest.java index b1401b7dc6..dfd2008953 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany_vehicles_client.jar"); // The class files jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPmservletTest.java index 034432511e..0a5609b51e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_manyXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_persist_manyXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPuservletTest.java index d970345045..e6c33926aa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_manyXmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_persist_manyXmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateful3Test.java index 3d421d756e..ca099cd436 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_manyXmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_manyXmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany_vehicles_client.jar"); // The class files jpa_core_et_persist_manyXmany_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_manyXmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_manyXmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_manyXmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_manyXmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXmany_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateless3Test.java index ca39c8bb9c..d4a2daf3d7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXmany/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_manyXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_manyXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXmany_vehicles_client.jar"); // The class files jpa_core_et_persist_manyXmany_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_manyXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_manyXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_manyXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_manyXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXmany_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagedTest.java index 9167d7163f..8851737769 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_manyXone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_manyXone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone_vehicles_client.jar"); // The class files jpa_core_et_persist_manyXone_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_manyXone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_manyXone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_manyXone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_manyXone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXone_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagednotxTest.java index 435b5711d9..a9aec9bcb3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone_vehicles_client.jar"); // The class files jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPmservletTest.java index 6164e0ecb4..857c52eb44 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_manyXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_persist_manyXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPuservletTest.java index 04323f1460..1fe05fe682 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_manyXone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_persist_manyXone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateful3Test.java index 012ea90ecd..7c0b4a9e2e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_manyXone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_manyXone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone_vehicles_client.jar"); // The class files jpa_core_et_persist_manyXone_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_manyXone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_manyXone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_manyXone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_manyXone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXone_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateless3Test.java index b613191827..cd88819c83 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/manyXone/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_manyXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_manyXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_manyXone_vehicles_client.jar"); // The class files jpa_core_et_persist_manyXone_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_manyXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_manyXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_manyXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_manyXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_manyXone_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_manyXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagedTest.java index 0155451c0f..99cfcbb8d7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_oneXmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_oneXmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany_vehicles_client.jar"); // The class files jpa_core_et_persist_oneXmany_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_oneXmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_oneXmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_oneXmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmany_appmanaged_vehicle_client, Client.class, resURL); @@ -136,12 +135,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagednotxTest.java index 62105754a1..29be36e674 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany_vehicles_client.jar"); // The class files jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -136,12 +135,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPmservletTest.java index 3775ebe360..94dea0a501 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPmservletTest.java @@ -102,7 +102,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_persist_oneXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPuservletTest.java index 038a5238ec..6c7a295383 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientPuservletTest.java @@ -102,7 +102,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_persist_oneXmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateful3Test.java index a30a217d01..0748855cd2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_oneXmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_oneXmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany_vehicles_client.jar"); // The class files jpa_core_et_persist_oneXmany_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_oneXmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_oneXmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_oneXmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmany_stateful3_vehicle_client, Client.class, resURL); @@ -136,12 +135,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateless3Test.java index 3446302590..2dc6f61576 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXmany/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_oneXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_oneXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmany_vehicles_client.jar"); // The class files jpa_core_et_persist_oneXmany_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_oneXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_oneXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_oneXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmany_stateless3_vehicle_client, Client.class, resURL); @@ -136,12 +135,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagedTest.java index b00cdea1af..0af19633a0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_oneXone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_oneXone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone_vehicles_client.jar"); // The class files jpa_core_et_persist_oneXone_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_oneXone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_oneXone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_oneXone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXone_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagednotxTest.java index b5a3e9f824..1669d1f1b8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone_vehicles_client.jar"); // The class files jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPmservletTest.java index ad19163f19..f87834703d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_persist_oneXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPuservletTest.java index 1c6c864260..c379647d4a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_persist_oneXone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateful3Test.java index 645ba3d4fe..8b6f066b5f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_oneXone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_oneXone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone_vehicles_client.jar"); // The class files jpa_core_et_persist_oneXone_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_oneXone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_oneXone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_oneXone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXone_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateless3Test.java index a120458250..c708b7f973 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/persist/oneXone/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_oneXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_oneXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXone_vehicles_client.jar"); // The class files jpa_core_et_persist_oneXone_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_oneXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_oneXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_oneXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXone_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagedTest.java index 865576e81c..bdb642be44 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_remove_basic_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_et_remove_basic_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic_vehicles_client.jar"); // The class files jpa_core_et_remove_basic_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_remove_basic_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_remove_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_remove_basic_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_basic_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_basic_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagednotxTest.java index 3365cec5b1..5f2bd5908d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_remove_basic_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_et_remove_basic_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic_vehicles_client.jar"); // The class files jpa_core_et_remove_basic_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_remove_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_remove_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_remove_basic_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_basic_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_basic_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPmservletTest.java index 18da6ab32c..faa4e644eb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_basic_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_remove_basic_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPuservletTest.java index c15ec72d26..b4aa077fb2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_basic_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_remove_basic_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateful3Test.java index 561c8fe5ee..08689b7fc2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_remove_basic_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_et_remove_basic_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic_vehicles_client.jar"); // The class files jpa_core_et_remove_basic_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_remove_basic_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_remove_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_remove_basic_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_basic_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_basic_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateless3Test.java index 10adecc289..2b6bbc5de5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/basic/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_remove_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_remove_basic_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_basic_vehicles_client.jar"); // The class files jpa_core_et_remove_basic_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_remove_basic_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_remove_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_remove_basic_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_basic_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_basic_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagedTest.java index 9ce7a58730..4fbccb84a0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_remove_oneXmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_et_remove_oneXmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany_vehicles_client.jar"); // The class files jpa_core_et_remove_oneXmany_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_oneXmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_remove_oneXmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_remove_oneXmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_remove_oneXmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXmany_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagednotxTest.java index c186afd0f4..4fcc09ea68 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany_vehicles_client.jar"); // The class files jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPmservletTest.java index c45b94a4be..55a2184952 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_oneXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_remove_oneXmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPuservletTest.java index feec239501..3d5fa538b9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_oneXmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_remove_oneXmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateful3Test.java index b110657d50..3d26eec94f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_remove_oneXmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_et_remove_oneXmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany_vehicles_client.jar"); // The class files jpa_core_et_remove_oneXmany_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_oneXmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_remove_oneXmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_remove_oneXmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_remove_oneXmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXmany_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateless3Test.java index 27521de8bb..3165c70bd6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXmany/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_remove_oneXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_remove_oneXmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXmany_vehicles_client.jar"); // The class files jpa_core_et_remove_oneXmany_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_oneXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_remove_oneXmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_remove_oneXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_remove_oneXmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXmany_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagedTest.java index 4909f368ce..74d77022b7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_remove_oneXone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_et_remove_oneXone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone_vehicles_client.jar"); // The class files jpa_core_et_remove_oneXone_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_oneXone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_remove_oneXone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_remove_oneXone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_remove_oneXone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXone_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagednotxTest.java index 3a93163894..6a29f5ee1a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone_vehicles_client.jar"); // The class files jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPmservletTest.java index 8bec1a56ae..3d2b47b2a5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_oneXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_remove_oneXone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPuservletTest.java index 1c7e4797aa..e926e2d7b6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_oneXone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_remove_oneXone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateful3Test.java index 9882082c46..030b437831 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_remove_oneXone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_et_remove_oneXone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone_vehicles_client.jar"); // The class files jpa_core_et_remove_oneXone_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_oneXone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_remove_oneXone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_remove_oneXone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_remove_oneXone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXone_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateless3Test.java index e5ae897805..4b8ce388c8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/entitytest/remove/oneXone/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.entity public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_remove_oneXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_remove_oneXone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_remove_oneXone_vehicles_client.jar"); // The class files jpa_core_et_remove_oneXone_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_remove_oneXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_remove_oneXone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_remove_oneXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_remove_oneXone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_remove_oneXone_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_remove_oneXone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagedTest.java index 3156026e34..969ec13d3e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.enums. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_enums_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_enums_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums_vehicles_client.jar"); // The class files jpa_core_enums_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_enums_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_enums_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_enums_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_enums_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_enums_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_enums_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_enums_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagednotxTest.java index bfb0a61cc2..21e0bff5ed 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.en public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_enums_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_enums_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums_vehicles_client.jar"); // The class files jpa_core_enums_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_enums_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_enums_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_enums_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_enums_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_enums_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_enums_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_enums_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPmservletTest.java index 61f90de612..c53e8502e8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_enums_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_enums_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPuservletTest.java index 8f09113996..fdc39881a4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_enums_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_enums_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateful3Test.java index 184ecbc2e7..4d73fb834f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.enums.C public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_enums_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_enums_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums_vehicles_client.jar"); // The class files jpa_core_enums_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_enums_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_enums_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_enums_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_enums_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_enums_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_enums_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_enums_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateless3Test.java index 69553b0d4c..22e0d9915c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/enums/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.enums. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_enums_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_enums_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_enums_vehicles_client.jar"); // The class files jpa_core_enums_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_enums_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_enums_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_enums_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_enums_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_enums_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_enums_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_enums_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientPmservletTest.java index f343a5252a..c33c7ff4c3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientPmservletTest.java @@ -83,7 +83,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_exceptions_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_exceptions_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientStateless3Test.java index 7575436838..322f331d60 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/exceptions/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -57,7 +56,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.except public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_exceptions_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_exceptions_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_exceptions_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_exceptions_vehicles_client.jar"); // The class files jpa_core_exceptions_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -84,11 +83,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_exceptions_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_exceptions_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_exceptions_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_exceptions_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_exceptions_stateless3_vehicle_client, Client.class, resURL); @@ -117,12 +116,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_exceptions_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_exceptions_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagedTest.java index ba0a7ae484..4c5ac07457 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.inheri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inheritance_abstractentity_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_inheritance_abstractentity_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity_vehicles_client.jar"); // The class files jpa_core_inheritance_abstractentity_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inheritance_abstractentity_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inheritance_abstractentity_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inheritance_abstractentity_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inheritance_abstractentity_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inheritance_abstractentity_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inheritance_abstractentity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inheritance_abstractentity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagednotxTest.java index 7450e624a8..44cab0e5de 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.in public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity_vehicles_client.jar"); // The class files jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inheritance_abstractentity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPmservletTest.java index 75b00af834..cf8cdeac6e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inheritance_abstractentity_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_inheritance_abstractentity_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPuservletTest.java index 743792d5d0..b8d622fd09 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inheritance_abstractentity_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_inheritance_abstractentity_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateful3Test.java index 85e43f18e6..b26656853f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.inherit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inheritance_abstractentity_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_inheritance_abstractentity_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity_vehicles_client.jar"); // The class files jpa_core_inheritance_abstractentity_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inheritance_abstractentity_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inheritance_abstractentity_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inheritance_abstractentity_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inheritance_abstractentity_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inheritance_abstractentity_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inheritance_abstractentity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inheritance_abstractentity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateless3Test.java index 6c61505f6f..86839d0b77 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/abstractentity/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.inheri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inheritance_abstractentity_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_inheritance_abstractentity_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inheritance_abstractentity_vehicles_client.jar"); // The class files jpa_core_inheritance_abstractentity_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inheritance_abstractentity_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inheritance_abstractentity_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inheritance_abstractentity_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inheritance_abstractentity_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inheritance_abstractentity_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inheritance_abstractentity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inheritance_abstractentity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagedTest.java index deb9ac8c09..f022e40157 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.inheri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inherit_msc_annotation_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_inherit_msc_annotation_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation_vehicles_client.jar"); // The class files jpa_core_inherit_msc_annotation_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_msc_annotation_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inherit_msc_annotation_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inherit_msc_annotation_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inherit_msc_annotation_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_annotation_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_annotation_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_annotation_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagednotxTest.java index 2ebd400f92..c78e8b21e8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.in public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation_vehicles_client.jar"); // The class files jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_annotation_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPmservletTest.java index e1fa689db7..036aa63e62 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_msc_annotation_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_inherit_msc_annotation_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPuservletTest.java index 9179f2aaee..ee954b0cfa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_msc_annotation_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_inherit_msc_annotation_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateful3Test.java index 9279d4f892..d5e23d9061 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.inherit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inherit_msc_annotation_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_inherit_msc_annotation_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation_vehicles_client.jar"); // The class files jpa_core_inherit_msc_annotation_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_msc_annotation_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inherit_msc_annotation_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inherit_msc_annotation_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inherit_msc_annotation_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_annotation_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_annotation_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_annotation_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateless3Test.java index d6cee9a2c0..2650f6f91b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/annotation/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.inheri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inherit_msc_annotation_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_inherit_msc_annotation_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_annotation_vehicles_client.jar"); // The class files jpa_core_inherit_msc_annotation_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_msc_annotation_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inherit_msc_annotation_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inherit_msc_annotation_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inherit_msc_annotation_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_annotation_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_annotation_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_annotation_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagedTest.java index 92d096e94a..4405aa3838 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.inheri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inherit_msc_descriptors_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_inherit_msc_descriptors_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors_vehicles_client.jar"); // The class files jpa_core_inherit_msc_descriptors_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_msc_descriptors_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inherit_msc_descriptors_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inherit_msc_descriptors_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inherit_msc_descriptors_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_descriptors_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_descriptors_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_descriptors_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagednotxTest.java index 89c4cae898..518776c13b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.in public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors_vehicles_client.jar"); // The class files jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_descriptors_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPmservletTest.java index b841d83650..e01062481c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_msc_descriptors_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_inherit_msc_descriptors_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPuservletTest.java index 70fc262bb9..08b3b4fae7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_msc_descriptors_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_inherit_msc_descriptors_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateful3Test.java index e1ce327499..4fe88194b5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.inherit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inherit_msc_descriptors_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_inherit_msc_descriptors_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors_vehicles_client.jar"); // The class files jpa_core_inherit_msc_descriptors_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_msc_descriptors_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inherit_msc_descriptors_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inherit_msc_descriptors_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inherit_msc_descriptors_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_descriptors_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_descriptors_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_descriptors_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateless3Test.java index 1541766de2..8a0de80562 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/mappedsc/descriptors/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.inheri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inherit_msc_descriptors_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_inherit_msc_descriptors_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_msc_descriptors_vehicles_client.jar"); // The class files jpa_core_inherit_msc_descriptors_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_msc_descriptors_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inherit_msc_descriptors_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inherit_msc_descriptors_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inherit_msc_descriptors_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_msc_descriptors_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_descriptors_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inherit_msc_descriptors_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagedTest.java index 3e6b061477..69fb157a83 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.inheri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inherit_nonentity_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_inherit_nonentity_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity_vehicles_client.jar"); // The class files jpa_core_inherit_nonentity_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_nonentity_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inherit_nonentity_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inherit_nonentity_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inherit_nonentity_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_nonentity_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inherit_nonentity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inherit_nonentity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagednotxTest.java index 8a2fd12442..3accedbcb6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.in public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity_vehicles_client.jar"); // The class files jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inherit_nonentity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPmservletTest.java index ad10be7122..86536417a3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_nonentity_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_inherit_nonentity_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPuservletTest.java index 205b07a8df..4a35d52df2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_nonentity_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_inherit_nonentity_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateful3Test.java index fcbe3d5771..6aee212d86 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.inherit public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inherit_nonentity_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_inherit_nonentity_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity_vehicles_client.jar"); // The class files jpa_core_inherit_nonentity_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_nonentity_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inherit_nonentity_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inherit_nonentity_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inherit_nonentity_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_nonentity_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inherit_nonentity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inherit_nonentity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateless3Test.java index b866f76cf8..9d54c0f56b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/inheritance/nonentity/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.inheri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_inherit_nonentity_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_inherit_nonentity_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_inherit_nonentity_vehicles_client.jar"); // The class files jpa_core_inherit_nonentity_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_inherit_nonentity_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_inherit_nonentity_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_inherit_nonentity_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_inherit_nonentity_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_inherit_nonentity_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_inherit_nonentity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_inherit_nonentity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientAppmanagednotxTest.java index 1336428c2f..d9f9cbc928 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -57,7 +56,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.lo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_lock_entitymanager_vehicles_client.jar"); // The class files jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -84,11 +83,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -117,12 +116,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_lock_entitymanager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientPuservletTest.java index e477a38c81..3c3fcdf33d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/entitymanager/ClientPuservletTest.java @@ -83,7 +83,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_lock_entitymanager_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_lock_entitymanager_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientAppmanagednotxTest.java index 1c098fa8d7..b73dee8cdf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -57,7 +56,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.lo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_lock_query_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_lock_query_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_lock_query_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_lock_query_vehicles_client.jar"); // The class files jpa_core_lock_query_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -84,11 +83,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_lock_query_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_lock_query_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_lock_query_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_lock_query_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_lock_query_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -117,12 +116,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_lock_query_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_lock_query_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientPuservletTest.java index 2cd8954dbc..52358adc76 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/lock/query/ClientPuservletTest.java @@ -83,7 +83,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_lock_query_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_lock_query_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagedTest.java index bd9be7020b..295b2a09ec 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_attribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_attribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_attribute_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_attribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_attribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_attribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_attribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_attribute_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.attribute.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_attribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_attribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagednotxTest.java index fa5d641a64..698b71e1cf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.attribute.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_attribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPmservletTest.java index 2fca950f04..05a6aaac84 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_attribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_attribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPuservletTest.java index 29a67a0a64..4c25825110 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_attribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_attribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateful3Test.java index 492cc1ea1b..9a9c1fb97e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_attribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_attribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_attribute_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_attribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_attribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_attribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_attribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_attribute_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.attribute.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_attribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_attribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateless3Test.java index fc3cd83fed..ab64ee5f63 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/attribute/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_attribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_attribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_attribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_attribute_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_attribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_attribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_attribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_attribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_attribute_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.attribute.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_attribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_attribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagedTest.java index 8ee0211091..ee96de9549 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_basictype_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_basictype_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_basictype_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_basictype_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_basictype_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_basictype_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_basictype_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_basictype_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.basictype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_basictype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_basictype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagednotxTest.java index b5a2953341..073aebc491 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.basictype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_basictype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPmservletTest.java index f9797a4b60..7b36f64251 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_basictype_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_basictype_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPuservletTest.java index 1b69457245..f8141564e2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_basictype_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_basictype_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateful3Test.java index ca6d9b9459..949066dada 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_basictype_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_basictype_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_basictype_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_basictype_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_basictype_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_basictype_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_basictype_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_basictype_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.basictype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_basictype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_basictype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateless3Test.java index f69eeacc28..69d4792893 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/basictype/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_basictype_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_basictype_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_basictype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_basictype_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_basictype_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_basictype_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_basictype_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_basictype_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_basictype_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.basictype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_basictype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_basictype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagedTest.java index e9b4303f3f..b18f15ce3a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_bindable_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_bindable_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable_vehicles_client.jar"); // The class files jpa_core_metamodelapi_bindable_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_bindable_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_bindable_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_bindable_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_bindable_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_bindable_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_bindable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_bindable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagednotxTest.java index 46e2e19f6b..53f8b8d996 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable_vehicles_client.jar"); // The class files jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_bindable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPmservletTest.java index d5b8fd0665..181c77f0d1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_bindable_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_bindable_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPuservletTest.java index 5d564b3b4c..c99fa99cc4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_bindable_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_bindable_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateful3Test.java index 807ea27d6d..a8b2512625 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_bindable_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_bindable_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable_vehicles_client.jar"); // The class files jpa_core_metamodelapi_bindable_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_bindable_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_bindable_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_bindable_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_bindable_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_bindable_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_bindable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_bindable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateless3Test.java index 30089a1b3b..9df892b108 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/bindable/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_bindable_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_bindable_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_bindable_vehicles_client.jar"); // The class files jpa_core_metamodelapi_bindable_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_bindable_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_bindable_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_bindable_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_bindable_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_bindable_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_bindable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_bindable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagedTest.java index fabb819a9d..ac46a3581a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_collectionattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagednotxTest.java index 6ca5a0a269..ed9aeacfa9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_collectionattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPmservletTest.java index 8dc07ba816..8afc32b435 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_collectionattribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_collectionattribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPuservletTest.java index 782298c55a..0566b78f26 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_collectionattribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_collectionattribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateful3Test.java index 3c456a8f80..2342ccb3d7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_collectionattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateless3Test.java index 7793d1b506..bd87c22f15 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/collectionattribute/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_collectionattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_collectionattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagedTest.java index 22f73ba5b9..ed91988e0a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_embeddabletype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagednotxTest.java index 9685376d1b..38f83fab47 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_embeddabletype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPmservletTest.java index f7e8f7c997..6592a0675a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_embeddabletype_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_embeddabletype_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPuservletTest.java index beab593c95..87d57a19c3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_embeddabletype_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_embeddabletype_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateful3Test.java index f194eeab07..006b038d33 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_embeddabletype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateless3Test.java index 2c304a2b90..bba5b77c49 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/embeddabletype/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_embeddabletype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_embeddabletype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagedTest.java index 2654b0c552..df0b0d0388 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_entitytype_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_entitytype_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_entitytype_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_entitytype_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_entitytype_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_entitytype_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_entitytype_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_entitytype_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.entitytype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_entitytype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_entitytype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagednotxTest.java index a0997a8dab..f0aa6f5a5c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.entitytype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_entitytype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPmservletTest.java index d1d78c573e..b81fb92979 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_entitytype_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_entitytype_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPuservletTest.java index b64842bb4a..15e7ada820 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_entitytype_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_entitytype_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateful3Test.java index 62af6c955d..4345bc305e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_entitytype_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_entitytype_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_entitytype_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_entitytype_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_entitytype_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_entitytype_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_entitytype_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_entitytype_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.entitytype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_entitytype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_entitytype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateless3Test.java index 5d02a28dcd..3603057005 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/entitytype/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_entitytype_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_entitytype_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_entitytype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_entitytype_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_entitytype_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_entitytype_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_entitytype_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_entitytype_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_entitytype_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.metamodelapi.entitytype.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_entitytype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_entitytype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagedTest.java index 1431def04f..0a1737a20c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_identifiabletype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagednotxTest.java index c2e7619fe9..e935a524f5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_identifiabletype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPmservletTest.java index ec9bbcc719..9458b98dfb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_identifiabletype_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_identifiabletype_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPuservletTest.java index 3f1627d377..491fc0caef 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_identifiabletype_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_identifiabletype_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateful3Test.java index 9ae21290d3..afca3a7796 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_identifiabletype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateless3Test.java index e042e87b38..399061d37b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/identifiabletype/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_identifiabletype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_identifiabletype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagedTest.java index bc46bc9145..60c369e557 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_listattribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_listattribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_listattribute_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_listattribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_listattribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_listattribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_listattribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_listattribute_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_listattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_listattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagednotxTest.java index eab7d936cb..f0bb5f3f3e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_listattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPmservletTest.java index a7efa96b0c..9d2bdd3c54 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_listattribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_listattribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPuservletTest.java index 68dc6bf91d..946bf9d04e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_listattribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_listattribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateful3Test.java index 03afa8abb6..9050d5ef0a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_listattribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_listattribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_listattribute_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_listattribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_listattribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_listattribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_listattribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_listattribute_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_listattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_listattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateless3Test.java index d5bcc6053f..44051ec8fc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/listattribute/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_listattribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_listattribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_listattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_listattribute_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_listattribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_listattribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_listattribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_listattribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_listattribute_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_listattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_listattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagedTest.java index 159648143b..5b503aabd8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_managedtype_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_managedtype_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_managedtype_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_managedtype_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_managedtype_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_managedtype_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_managedtype_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_managedtype_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_managedtype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_managedtype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagednotxTest.java index 0191271ebf..9ba713e9ca 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_managedtype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPmservletTest.java index d1b4c88e54..d14ec870d2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_managedtype_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_managedtype_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPuservletTest.java index c1e7bd0483..c22ba09a45 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_managedtype_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_managedtype_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateful3Test.java index 01d8be2cc2..be89410e35 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_managedtype_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_managedtype_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_managedtype_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_managedtype_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_managedtype_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_managedtype_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_managedtype_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_managedtype_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_managedtype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_managedtype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateless3Test.java index 0a1936ab67..34d370079c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/managedtype/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_managedtype_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_managedtype_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_managedtype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_managedtype_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_managedtype_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_managedtype_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_managedtype_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_managedtype_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_managedtype_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_managedtype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_managedtype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagedTest.java index d599567611..8d11c6b6b6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mapattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagednotxTest.java index 6c58d66b7a..e96a392f87 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mapattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPmservletTest.java index dd09b780a0..2aa4ab391a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_mapattribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_mapattribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPuservletTest.java index 8c2f79ac0a..90d365adbd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_mapattribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_mapattribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateful3Test.java index 8649a86dc2..2aff2f335e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_mapattribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_mapattribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_mapattribute_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_mapattribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_mapattribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_mapattribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_mapattribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mapattribute_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mapattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mapattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateless3Test.java index 0abc465242..e402b8647f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mapattribute/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_mapattribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_mapattribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mapattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_mapattribute_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_mapattribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_mapattribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_mapattribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_mapattribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mapattribute_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mapattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mapattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagedTest.java index 775fee39c7..59a4281d19 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mappedsuperclasstype_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagednotxTest.java index c6a3c165c7..c939994a4b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mappedsuperclasstype_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPmservletTest.java index 336ad41d82..137f048f73 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_mappedsuperclasstype_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_mappedsuperclasstype_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPuservletTest.java index 3d1d94bb1d..746ae737c0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_mappedsuperclasstype_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_mappedsuperclasstype_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateful3Test.java index e733e86631..e54c7c9f03 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mappedsuperclasstype_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateless3Test.java index 88023534fd..4f29c7edc3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/mappedsuperclasstype/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_mappedsuperclasstype_vehicles_client.jar"); // The class files jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_mappedsuperclasstype_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagedTest.java index 3d7914543d..f0b571ccf4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_metamodel_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_metamodel_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel_vehicles_client.jar"); // The class files jpa_core_metamodelapi_metamodel_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_metamodel_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_metamodel_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_metamodel_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_metamodel_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_metamodel_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_metamodel_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_metamodel_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagednotxTest.java index 2e9c3fc9bc..d878735de0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel_vehicles_client.jar"); // The class files jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_metamodel_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPmservletTest.java index baae8004e8..d2d6bf4fd8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_metamodel_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_metamodel_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPuservletTest.java index b565fd911a..8008703c01 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_metamodel_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_metamodel_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateful3Test.java index c1134a40dd..8e655572cc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_metamodel_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_metamodel_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel_vehicles_client.jar"); // The class files jpa_core_metamodelapi_metamodel_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_metamodel_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_metamodel_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_metamodel_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_metamodel_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_metamodel_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_metamodel_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_metamodel_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateless3Test.java index 711136ee04..b18a498911 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/metamodel/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_metamodel_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_metamodel_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_metamodel_vehicles_client.jar"); // The class files jpa_core_metamodelapi_metamodel_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_metamodel_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_metamodel_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_metamodel_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_metamodel_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_metamodel_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_metamodel_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_metamodel_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagedTest.java index a6f1b02008..0d11c29779 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_pluralattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagednotxTest.java index 79101cfb64..966d94bc8a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_pluralattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPmservletTest.java index 9da5f62c31..a402fac287 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_pluralattribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_pluralattribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPuservletTest.java index 90e7f362ee..150cc8491c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_pluralattribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_pluralattribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateful3Test.java index 461cdd3917..5523e51eb8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_pluralattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateless3Test.java index 81464852f7..1b6ebf30c7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/pluralattribute/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_pluralattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_pluralattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagedTest.java index bb6e2e5026..13f3182463 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_setattribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_setattribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_setattribute_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_setattribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_setattribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_setattribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_setattribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_setattribute_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_setattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_setattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagednotxTest.java index 8562598faf..7a788fc570 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_setattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPmservletTest.java index 8e024f9984..7520443def 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_setattribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_setattribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPuservletTest.java index ed070a9220..434cccbdc5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_setattribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_setattribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateful3Test.java index c4c0042f33..5fd8289b70 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_setattribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_setattribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_setattribute_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_setattribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_setattribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_setattribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_setattribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_setattribute_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_setattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_setattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateless3Test.java index f5855fd4e3..7051255a7a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/setattribute/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_setattribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_setattribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_setattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_setattribute_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_setattribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_setattribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_setattribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_setattribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_setattribute_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_setattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_setattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagedTest.java index 878705b756..4fe5d6eadc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_singularattribute_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagednotxTest.java index 35d2c40ace..b3e77c63e1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_singularattribute_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPmservletTest.java index 7bae5c4a0d..4d93cfee2c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_singularattribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_singularattribute_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPuservletTest.java index e9760bc23b..8737d76982 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_singularattribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_singularattribute_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateful3Test.java index d8fff746db..a32db517bb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_singularattribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_singularattribute_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_singularattribute_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_singularattribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_singularattribute_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_singularattribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_singularattribute_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_singularattribute_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_singularattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_singularattribute_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateless3Test.java index 7d2bcdfa54..e809b7aa57 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/singularattribute/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_singularattribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_singularattribute_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_singularattribute_vehicles_client.jar"); // The class files jpa_core_metamodelapi_singularattribute_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_singularattribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_singularattribute_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_singularattribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_singularattribute_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_singularattribute_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_singularattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_singularattribute_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagedTest.java index 8547a969cf..44d96e9e19 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_type_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_type_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type_vehicles_client.jar"); // The class files jpa_core_metamodelapi_type_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_type_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_type_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_type_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_type_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_type_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_type_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_type_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagednotxTest.java index 94b8ddb602..f1f03946fd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.me public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type_vehicles_client.jar"); // The class files jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_type_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPmservletTest.java index 155c088c82..63bece2d83 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_type_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_type_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPuservletTest.java index ae945913b8..be090ff408 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_type_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_metamodelapi_type_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateful3Test.java index 0ea8771db1..dc87976bb7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.metamod public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_type_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_type_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type_vehicles_client.jar"); // The class files jpa_core_metamodelapi_type_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_type_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_type_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_type_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_type_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_type_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_type_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_type_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateless3Test.java index a945b1b2da..6e8c73d560 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/metamodelapi/type/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.metamo public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_metamodelapi_type_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_metamodelapi_type_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_metamodelapi_type_vehicles_client.jar"); // The class files jpa_core_metamodelapi_type_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_metamodelapi_type_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_metamodelapi_type_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_metamodelapi_type_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_metamodelapi_type_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_metamodelapi_type_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_type_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_metamodelapi_type_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagedTest.java index e0dd75b9b8..02fdc3db79 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.nested public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_nestedembedding_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_nestedembedding_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding_vehicles_client.jar"); // The class files jpa_core_nestedembedding_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_nestedembedding_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_nestedembedding_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_nestedembedding_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_nestedembedding_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_nestedembedding_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_nestedembedding_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_nestedembedding_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagednotxTest.java index 084b7b8d3e..dc34a0458f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ne public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_nestedembedding_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_nestedembedding_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding_vehicles_client.jar"); // The class files jpa_core_nestedembedding_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_nestedembedding_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_nestedembedding_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_nestedembedding_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_nestedembedding_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_nestedembedding_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_nestedembedding_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_nestedembedding_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPmservletTest.java index b826c2fd20..ebb3530fb3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_nestedembedding_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_nestedembedding_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPuservletTest.java index 16150c6f6c..74e3d4d2da 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_nestedembedding_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_nestedembedding_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateful3Test.java index faf8b5ac36..f4cea6b197 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.nestede public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_nestedembedding_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_nestedembedding_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding_vehicles_client.jar"); // The class files jpa_core_nestedembedding_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_nestedembedding_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_nestedembedding_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_nestedembedding_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_nestedembedding_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_nestedembedding_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_nestedembedding_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_nestedembedding_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateless3Test.java index 8d0f23eed7..422729b370 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/nestedembedding/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.nested public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_nestedembedding_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_nestedembedding_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_nestedembedding_vehicles_client.jar"); // The class files jpa_core_nestedembedding_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_nestedembedding_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_nestedembedding_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_nestedembedding_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_nestedembedding_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_nestedembedding_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_nestedembedding_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_nestedembedding_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagedTest.java index c245c2dc9c..7e97195f75 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_attributeoverride_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_override_attributeoverride_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride_vehicles_client.jar"); // The class files jpa_core_override_attributeoverride_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_attributeoverride_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_attributeoverride_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_attributeoverride_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_attributeoverride_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_attributeoverride_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_attributeoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_attributeoverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagednotxTest.java index 3be1ca9a0e..5ec4083936 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ov public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride_vehicles_client.jar"); // The class files jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_attributeoverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPmservletTest.java index 0920459dd3..e69d4a1da5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_attributeoverride_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_attributeoverride_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPuservletTest.java index 6326b0b8d2..7bd2ceac44 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_attributeoverride_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_attributeoverride_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateful3Test.java index ec76a0b31a..d1756b646d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.overrid public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_attributeoverride_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_override_attributeoverride_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride_vehicles_client.jar"); // The class files jpa_core_override_attributeoverride_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_attributeoverride_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_attributeoverride_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_attributeoverride_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_attributeoverride_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_attributeoverride_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_attributeoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_attributeoverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateless3Test.java index 27f6604df5..8596aeb124 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/attributeoverride/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_attributeoverride_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_override_attributeoverride_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_attributeoverride_vehicles_client.jar"); // The class files jpa_core_override_attributeoverride_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_attributeoverride_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_attributeoverride_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_attributeoverride_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_attributeoverride_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_attributeoverride_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_attributeoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_attributeoverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagedTest.java index f06c942ff8..5d2cb8bdf2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_callbacklistener_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_override_callbacklistener_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener_vehicles_client.jar"); // The class files jpa_core_override_callbacklistener_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_callbacklistener_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_callbacklistener_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_callbacklistener_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_callbacklistener_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_callbacklistener_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_callbacklistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_callbacklistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagednotxTest.java index e0962a7aa8..5a29a820f3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ov public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener_vehicles_client.jar"); // The class files jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_callbacklistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPmservletTest.java index 602868ef29..529d52009b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_callbacklistener_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_callbacklistener_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPuservletTest.java index 30bc4fed7a..922b0607ec 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_callbacklistener_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_callbacklistener_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateful3Test.java index 3a983d66b4..d5a5f4fae5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.overrid public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_callbacklistener_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_override_callbacklistener_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener_vehicles_client.jar"); // The class files jpa_core_override_callbacklistener_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_callbacklistener_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_callbacklistener_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_callbacklistener_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_callbacklistener_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_callbacklistener_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_callbacklistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_callbacklistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateless3Test.java index 666960e29e..648e44f0c8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/callbacklistener/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_callbacklistener_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_override_callbacklistener_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_callbacklistener_vehicles_client.jar"); // The class files jpa_core_override_callbacklistener_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_callbacklistener_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_callbacklistener_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_callbacklistener_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_callbacklistener_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_callbacklistener_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_callbacklistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_callbacklistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagedTest.java index b39212e0ae..fd19b6da26 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_embeddable_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_override_embeddable_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable_vehicles_client.jar"); // The class files jpa_core_override_embeddable_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_embeddable_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_embeddable_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_embeddable_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_embeddable_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_embeddable_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_embeddable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_embeddable_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagednotxTest.java index a1a030b3cf..675c9846f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ov public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_embeddable_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_override_embeddable_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable_vehicles_client.jar"); // The class files jpa_core_override_embeddable_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_embeddable_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_embeddable_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_embeddable_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_embeddable_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_embeddable_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_embeddable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_embeddable_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPmservletTest.java index 7a3d4079b2..0768a07f6b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_embeddable_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_embeddable_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPuservletTest.java index 249969ab2e..e98cd4c605 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_embeddable_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_embeddable_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateful3Test.java index d062c4b858..824557a706 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.overrid public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_embeddable_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_override_embeddable_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable_vehicles_client.jar"); // The class files jpa_core_override_embeddable_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_embeddable_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_embeddable_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_embeddable_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_embeddable_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_embeddable_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_embeddable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_embeddable_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateless3Test.java index c5f4083505..c3370fae86 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/embeddable/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_embeddable_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_override_embeddable_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_embeddable_vehicles_client.jar"); // The class files jpa_core_override_embeddable_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_embeddable_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_embeddable_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_embeddable_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_embeddable_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_embeddable_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_embeddable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_embeddable_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagedTest.java index 98e2122ffd..0bff03215a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_entity_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_override_entity_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity_vehicles_client.jar"); // The class files jpa_core_override_entity_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_entity_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_entity_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_entity_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_entity_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entity_appmanaged_vehicle_client, Client.class, resURL); @@ -136,12 +135,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_entity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_entity_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagednotxTest.java index 59107f3c59..d47045cbd3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ov public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_entity_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_override_entity_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity_vehicles_client.jar"); // The class files jpa_core_override_entity_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_entity_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_entity_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_entity_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_entity_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entity_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -136,12 +135,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_entity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_entity_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPmservletTest.java index 8abe01b318..10ed833e87 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPmservletTest.java @@ -102,7 +102,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_entity_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_entity_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPuservletTest.java index 5944b29e50..e37aabf055 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientPuservletTest.java @@ -102,7 +102,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_entity_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_entity_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateful3Test.java index e088dab753..00d03b16e3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.overrid public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_entity_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_override_entity_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity_vehicles_client.jar"); // The class files jpa_core_override_entity_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_entity_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_entity_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_entity_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_entity_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entity_stateful3_vehicle_client, Client.class, resURL); @@ -136,12 +135,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_entity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_entity_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateless3Test.java index 5a62f2ec32..590bf1819a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entity/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -76,7 +75,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_entity_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_override_entity_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entity_vehicles_client.jar"); // The class files jpa_core_override_entity_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -103,11 +102,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_entity_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_entity_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_entity_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_entity_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entity_stateless3_vehicle_client, Client.class, resURL); @@ -136,12 +135,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_entity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_entity_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagedTest.java index 9a47f3e7ab..13e03fe76e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_entitylistener_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_override_entitylistener_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener_vehicles_client.jar"); // The class files jpa_core_override_entitylistener_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_entitylistener_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_entitylistener_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_entitylistener_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_entitylistener_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entitylistener_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_entitylistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_entitylistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagednotxTest.java index 5417a6c6d7..7eb050a92b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ov public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_entitylistener_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_override_entitylistener_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener_vehicles_client.jar"); // The class files jpa_core_override_entitylistener_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_entitylistener_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_entitylistener_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_entitylistener_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_entitylistener_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entitylistener_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_entitylistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_entitylistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPmservletTest.java index e9abfe9d21..a76fbacac3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_entitylistener_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_entitylistener_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPuservletTest.java index be881b6516..96787ac378 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_entitylistener_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_entitylistener_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateful3Test.java index 1bef195aab..4d05edded2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.overrid public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_entitylistener_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_override_entitylistener_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener_vehicles_client.jar"); // The class files jpa_core_override_entitylistener_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_entitylistener_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_entitylistener_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_entitylistener_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_entitylistener_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entitylistener_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_entitylistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_entitylistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateless3Test.java index a56d567cb0..114b50c37a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/entitylistener/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_entitylistener_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_override_entitylistener_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_entitylistener_vehicles_client.jar"); // The class files jpa_core_override_entitylistener_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_entitylistener_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_entitylistener_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_entitylistener_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_entitylistener_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_entitylistener_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_entitylistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_entitylistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagedTest.java index c2e9770a1d..0d9e772d01 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_joincolumn_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_override_joincolumn_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn_vehicles_client.jar"); // The class files jpa_core_override_joincolumn_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_joincolumn_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_joincolumn_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_joincolumn_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_joincolumn_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_joincolumn_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_joincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_joincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagednotxTest.java index c59e72ef06..70bd8975b3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ov public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_joincolumn_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_override_joincolumn_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn_vehicles_client.jar"); // The class files jpa_core_override_joincolumn_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_joincolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_joincolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_joincolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_joincolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_joincolumn_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_joincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_joincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPmservletTest.java index c1a3b44c99..b415ae5b62 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_joincolumn_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_joincolumn_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPuservletTest.java index 567d65ba9e..8b7b764791 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_joincolumn_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_joincolumn_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateful3Test.java index 1c5ceb48b3..3e2a157314 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.overrid public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_joincolumn_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_override_joincolumn_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn_vehicles_client.jar"); // The class files jpa_core_override_joincolumn_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_joincolumn_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_joincolumn_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_joincolumn_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_joincolumn_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_joincolumn_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_joincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_joincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateless3Test.java index dd83a33b90..9c7daaaad4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/joincolumn/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_joincolumn_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_override_joincolumn_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_joincolumn_vehicles_client.jar"); // The class files jpa_core_override_joincolumn_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_joincolumn_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_joincolumn_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_joincolumn_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_joincolumn_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_joincolumn_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_joincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_joincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagedTest.java index 2b2e66cc2d..ae2ba07c53 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_manytomany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_override_manytomany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany_vehicles_client.jar"); // The class files jpa_core_override_manytomany_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_manytomany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_manytomany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_manytomany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_manytomany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_manytomany_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_manytomany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_manytomany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagednotxTest.java index 14d589bc24..3b50284a40 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ov public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_manytomany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_override_manytomany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany_vehicles_client.jar"); // The class files jpa_core_override_manytomany_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_manytomany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_manytomany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_manytomany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_manytomany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_manytomany_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_manytomany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_manytomany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPmservletTest.java index a6f260a1e2..a6b1250b48 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_manytomany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_manytomany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPuservletTest.java index 02049391e5..fd58fbeee1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_manytomany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_manytomany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateful3Test.java index b0346cbb79..21780ab98e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.overrid public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_manytomany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_override_manytomany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany_vehicles_client.jar"); // The class files jpa_core_override_manytomany_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_manytomany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_manytomany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_manytomany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_manytomany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_manytomany_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_manytomany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_manytomany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateless3Test.java index ef8ef6e0b6..5153fcdffb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/manytomany/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_manytomany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_override_manytomany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_manytomany_vehicles_client.jar"); // The class files jpa_core_override_manytomany_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_manytomany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_manytomany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_manytomany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_manytomany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_manytomany_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_manytomany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_manytomany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagedTest.java index dafe32a2eb..b4442a6227 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_mapkey_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_override_mapkey_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey_vehicles_client.jar"); // The class files jpa_core_override_mapkey_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_mapkey_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_mapkey_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_mapkey_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_mapkey_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_mapkey_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_mapkey_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagednotxTest.java index cb359fbb53..ca4998fa7d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ov public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_mapkey_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_override_mapkey_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey_vehicles_client.jar"); // The class files jpa_core_override_mapkey_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_mapkey_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_mapkey_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_mapkey_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_mapkey_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_mapkey_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_mapkey_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPmservletTest.java index 247b6a5d15..9ea58801ec 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_mapkey_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_mapkey_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPuservletTest.java index e6f0a6d005..de725e3a41 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_mapkey_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_mapkey_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateful3Test.java index 99a29a4246..b01ab52097 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.overrid public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_mapkey_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_override_mapkey_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey_vehicles_client.jar"); // The class files jpa_core_override_mapkey_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_mapkey_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_mapkey_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_mapkey_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_mapkey_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_mapkey_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_mapkey_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateless3Test.java index 37b90a6a4f..2a2f0cab13 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/mapkey/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_mapkey_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_override_mapkey_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_mapkey_vehicles_client.jar"); // The class files jpa_core_override_mapkey_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_mapkey_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_mapkey_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_mapkey_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_mapkey_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_mapkey_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_mapkey_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagedTest.java index 7eb2ea1fa1..0a50f2f118 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_nocallbacklistener_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_override_nocallbacklistener_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener_vehicles_client.jar"); // The class files jpa_core_override_nocallbacklistener_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_nocallbacklistener_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_nocallbacklistener_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_nocallbacklistener_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_nocallbacklistener_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_nocallbacklistener_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_nocallbacklistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_nocallbacklistener_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagednotxTest.java index a9427738d5..d6317f2db9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ov public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener_vehicles_client.jar"); // The class files jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_nocallbacklistener_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPmservletTest.java index a6c6cb2099..a57b1fd2ff 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_nocallbacklistener_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_nocallbacklistener_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPuservletTest.java index a0a0c34118..98097ff0c4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_nocallbacklistener_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_nocallbacklistener_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateful3Test.java index 83bd156347..689ecf7ed4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.overrid public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_nocallbacklistener_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_override_nocallbacklistener_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener_vehicles_client.jar"); // The class files jpa_core_override_nocallbacklistener_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_nocallbacklistener_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_nocallbacklistener_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_nocallbacklistener_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_nocallbacklistener_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_nocallbacklistener_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_nocallbacklistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_nocallbacklistener_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateless3Test.java index 8fe6ef0fd3..c7d33dcab2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/nocallbacklistener/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_nocallbacklistener_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_override_nocallbacklistener_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_nocallbacklistener_vehicles_client.jar"); // The class files jpa_core_override_nocallbacklistener_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_nocallbacklistener_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_nocallbacklistener_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_nocallbacklistener_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_nocallbacklistener_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_nocallbacklistener_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_nocallbacklistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_nocallbacklistener_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagedTest.java index 287639fb73..530757bcd4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_table_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_override_table_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table_vehicles_client.jar"); // The class files jpa_core_override_table_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_table_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_table_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_table_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_table_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_table_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_table_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_table_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagednotxTest.java index 02deae200a..9c7df05fa4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ov public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_table_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_override_table_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table_vehicles_client.jar"); // The class files jpa_core_override_table_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_table_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_table_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_table_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_table_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_table_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_table_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_table_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPmservletTest.java index b9291b43be..9945d157e8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_table_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_table_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPuservletTest.java index 9d78921e54..0ca0e4c275 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_table_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_override_table_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateful3Test.java index c83d96ecac..da89292032 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.overrid public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_table_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_override_table_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table_vehicles_client.jar"); // The class files jpa_core_override_table_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_table_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_table_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_table_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_table_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_table_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_table_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_table_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateless3Test.java index f488c34a09..b952f2e5fd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/override/table/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.overri public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_override_table_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_override_table_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_override_table_vehicles_client.jar"); // The class files jpa_core_override_table_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_override_table_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_override_table_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_override_table_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_override_table_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_override_table_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_override_table_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_override_table_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagedTest.java index 92d64cbffe..5f90ed15f5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.persis public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_PersistenceUtilUtil_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_PersistenceUtilUtil_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil_vehicles_client.jar"); // The class files jpa_core_PersistenceUtilUtil_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_PersistenceUtilUtil_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_PersistenceUtilUtil_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_PersistenceUtilUtil_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_PersistenceUtilUtil_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_PersistenceUtilUtil_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_PersistenceUtilUtil_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_PersistenceUtilUtil_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagednotxTest.java index a37133f73a..435ef97f6a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.pe public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil_vehicles_client.jar"); // The class files jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_PersistenceUtilUtil_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPmservletTest.java index 3263af9876..b10bf35e7f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_PersistenceUtilUtil_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_PersistenceUtilUtil_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPuservletTest.java index 4f6eb0bf9f..55e5e0db2f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_PersistenceUtilUtil_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_PersistenceUtilUtil_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateful3Test.java index f1b8829229..39ab83d35c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.persist public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_PersistenceUtilUtil_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_PersistenceUtilUtil_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil_vehicles_client.jar"); // The class files jpa_core_PersistenceUtilUtil_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_PersistenceUtilUtil_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_PersistenceUtilUtil_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_PersistenceUtilUtil_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_PersistenceUtilUtil_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_PersistenceUtilUtil_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_PersistenceUtilUtil_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_PersistenceUtilUtil_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateless3Test.java index f6fc2d237b..770c14063c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUnitUtil/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.persis public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_PersistenceUtilUtil_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_PersistenceUtilUtil_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_PersistenceUtilUtil_vehicles_client.jar"); // The class files jpa_core_PersistenceUtilUtil_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_PersistenceUtilUtil_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_PersistenceUtilUtil_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_PersistenceUtilUtil_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_PersistenceUtilUtil_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_PersistenceUtilUtil_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_PersistenceUtilUtil_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_PersistenceUtilUtil_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagedTest.java index 77e85c6e45..6d85bcc8a7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.persis public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_persistenceUtil_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_persistenceUtil_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil_vehicles_client.jar"); // The class files jpa_core_persistenceUtil_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_persistenceUtil_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_persistenceUtil_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_persistenceUtil_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_persistenceUtil_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_persistenceUtil_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_persistenceUtil_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_persistenceUtil_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagednotxTest.java index ff458dc311..d2d971b832 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.pe public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_persistenceUtil_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_persistenceUtil_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil_vehicles_client.jar"); // The class files jpa_core_persistenceUtil_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_persistenceUtil_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_persistenceUtil_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_persistenceUtil_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_persistenceUtil_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_persistenceUtil_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_persistenceUtil_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_persistenceUtil_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPmservletTest.java index ffc10d49c6..60cb6edc2a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_persistenceUtil_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_persistenceUtil_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPuservletTest.java index ed69d07d57..5de07fb7c2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_persistenceUtil_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_persistenceUtil_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateful3Test.java index de2eb6c4ef..f867f53497 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.persist public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_persistenceUtil_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_persistenceUtil_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil_vehicles_client.jar"); // The class files jpa_core_persistenceUtil_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_persistenceUtil_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_persistenceUtil_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_persistenceUtil_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_persistenceUtil_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_persistenceUtil_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_persistenceUtil_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_persistenceUtil_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateless3Test.java index a8532ba793..80c5aaf935 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/persistenceUtil/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.persis public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_persistenceUtil_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_persistenceUtil_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_persistenceUtil_vehicles_client.jar"); // The class files jpa_core_persistenceUtil_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_persistenceUtil_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_persistenceUtil_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_persistenceUtil_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_persistenceUtil_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_persistenceUtil_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_persistenceUtil_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_persistenceUtil_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1AppmanagednotxTest.java index 2e2cfd22ef..102c26b3b8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_apitests_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_apitests_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_vehicles_client.jar"); // The class files jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1Stateless3Test.java index e52084eda3..ff11dfd839 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_apitests_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_apitests_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_vehicles_client.jar"); // The class files jpa_core_query_apitests_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_apitests_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_apitests_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_apitests_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2AppmanagednotxTest.java index 71731d2871..6b1d535a39 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_apitests_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_apitests_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_vehicles_client.jar"); // The class files jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2Stateless3Test.java index 1af140e799..1c50036f9c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_apitests_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_apitests_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_vehicles_client.jar"); // The class files jpa_core_query_apitests_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_apitests_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_apitests_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_apitests_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3AppmanagednotxTest.java index b4eecbf84b..98ab8ab5b0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_apitests_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_apitests_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_vehicles_client.jar"); // The class files jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3Stateless3Test.java index 1f7e6f290b..7941b0f67d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_apitests_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_apitests_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_vehicles_client.jar"); // The class files jpa_core_query_apitests_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_apitests_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_apitests_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_apitests_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4AppmanagednotxTest.java index f88cd91e26..007839c472 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client4AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_apitests_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_apitests_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_vehicles_client.jar"); // The class files jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_apitests_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_appmanagedNoTx_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4Stateless3Test.java index 3b398d83be..4ac454c761 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/apitests/Client4Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client4Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_apitests_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_apitests_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_apitests_vehicles_client.jar"); // The class files jpa_core_query_apitests_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_apitests_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_apitests_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_apitests_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_apitests_stateless3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1AppmanagednotxTest.java index c68dad0984..925c4d3dec 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_flushmode_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_flushmode_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_vehicles_client.jar"); // The class files jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_flushmode_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1Stateless3Test.java index 96973c0513..10b2ccbf2c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_flushmode_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_flushmode_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_vehicles_client.jar"); // The class files jpa_core_query_flushmode_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_flushmode_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_flushmode_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_flushmode_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_flushmode_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2AppmanagednotxTest.java index 7d81074277..88216a4f50 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_flushmode_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_flushmode_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_vehicles_client.jar"); // The class files jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_flushmode_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2Stateless3Test.java index 666b29ccae..c8c38ff6d7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_flushmode_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_flushmode_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_vehicles_client.jar"); // The class files jpa_core_query_flushmode_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_flushmode_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_flushmode_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_flushmode_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_flushmode_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3AppmanagednotxTest.java index e8b3aff73e..d00703a32d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_flushmode_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_flushmode_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_vehicles_client.jar"); // The class files jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_flushmode_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_flushmode_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3Stateless3Test.java index f92a341799..52bc2edc5b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/flushmode/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_flushmode_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_flushmode_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_flushmode_vehicles_client.jar"); // The class files jpa_core_query_flushmode_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -92,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_flushmode_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_flushmode_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_flushmode_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_flushmode_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagedTest.java index 5d57d08a9b..1cdc818c44 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_query_language_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagednotxTest.java index fd572a93b1..b89ffe8d95 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateful3Test.java index c218e26072..d33b564d0f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.query. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_query_language_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateless3Test.java index bab6e314f8..cae431ea60 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_language_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagedTest.java index 0f25b5669d..c1a633e8e2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_query_language_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagednotxTest.java index 15611f3801..6ed49f9ba8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateful3Test.java index 1c76104855..1dc9859751 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.query. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_query_language_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateless3Test.java index 038a1d0ff5..148a2ed811 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_language_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagedTest.java index 4ffb39ea1b..00d101956d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_query_language_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagednotxTest.java index 986581905f..d74dd66136 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateful3Test.java index df584f9027..fa480f4d68 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.query. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_query_language_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateless3Test.java index 04e1910fb5..d5ac0645f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_language_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagedTest.java index 70ad9b84b3..d245ca60df 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagedTest extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_query_language_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanaged_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagednotxTest.java index 758c1ac251..90f89f4a87 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanagedNoTx_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateful3Test.java index a9d78b7d1d..e231e8be07 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateful3Test extends ee.jakarta.tck.persistence.core.query. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_query_language_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateful3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateless3Test.java index a1a30ea297..ebb1f3fe23 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client4Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_language_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateless3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagedTest.java index 15e6da1d43..f81c9ae018 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5AppmanagedTest extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_query_language_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanaged_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagednotxTest.java index 4dcc1331d2..bf8a5cef50 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanagedNoTx_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateful3Test.java index ee4030fcdc..17fd704f9d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5Stateful3Test extends ee.jakarta.tck.persistence.core.query. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_query_language_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateful3_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateless3Test.java index 420f7a227d..c38b476a5f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client5Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client5Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_language_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client5.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateless3_vehicle_client, Client5.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagedTest.java index f263467858..2fb5d19ba6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6AppmanagedTest extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_query_language_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanaged_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagednotxTest.java index 8b54ebe0b2..00f208adf6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_language_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_appmanagedNoTx_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateful3Test.java index c0a529a54d..e21472e77a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6Stateful3Test extends ee.jakarta.tck.persistence.core.query. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_query_language_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateful3_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateless3Test.java index cdcd920813..282ba78ada 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/language/Client6Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client6Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_language_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_language_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_language_vehicles_client.jar"); // The class files jpa_core_query_language_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_language_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client6.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_language_stateless3_vehicle_client, Client6.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagedTest.java index ec1b2772ec..e60483233e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_parameter_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_query_parameter_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_vehicles_client.jar"); // The class files jpa_core_query_parameter_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_parameter_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_parameter_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_parameter_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagednotxTest.java index 7198c05b1d..82e9f9d4e2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_parameter_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_parameter_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_vehicles_client.jar"); // The class files jpa_core_query_parameter_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_parameter_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_parameter_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_parameter_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateful3Test.java index 425fcbb1a6..10ba3b1955 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.query. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_parameter_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_query_parameter_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_vehicles_client.jar"); // The class files jpa_core_query_parameter_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_parameter_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_parameter_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_parameter_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateless3Test.java index c61b034704..8a367c383c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_parameter_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_parameter_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_vehicles_client.jar"); // The class files jpa_core_query_parameter_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_parameter_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_parameter_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_parameter_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagedTest.java index d6d512f04b..2d1a0c7c37 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_parameter_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_query_parameter_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_vehicles_client.jar"); // The class files jpa_core_query_parameter_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_parameter_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_parameter_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_parameter_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagednotxTest.java index 569a192c69..04ed673097 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_parameter_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_query_parameter_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_vehicles_client.jar"); // The class files jpa_core_query_parameter_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_parameter_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_parameter_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_parameter_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateful3Test.java index 297b6adc35..e93ab70b43 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.query. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_parameter_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_query_parameter_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_vehicles_client.jar"); // The class files jpa_core_query_parameter_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_parameter_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_parameter_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_parameter_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateless3Test.java index 0a330dc1ed..af9aadffc7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/query/parameter/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_query_parameter_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_query_parameter_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_query_parameter_vehicles_client.jar"); // The class files jpa_core_query_parameter_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_query_parameter_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_query_parameter_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_query_parameter_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_query_parameter_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagedTest.java index 59ff70733e..9b4e6e0cb4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_annotations_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_relationship_annotations_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations_vehicles_client.jar"); // The class files jpa_core_relationship_annotations_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_annotations_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_annotations_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_annotations_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_annotations_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_annotations_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_annotations_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_annotations_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagednotxTest.java index 2c785e52c6..67864fc153 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.re public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_annotations_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_relationship_annotations_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations_vehicles_client.jar"); // The class files jpa_core_relationship_annotations_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_annotations_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_annotations_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_annotations_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_annotations_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_annotations_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_annotations_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_annotations_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPmservletTest.java index 1be0f55e63..4a2eb485a0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_annotations_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_annotations_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPuservletTest.java index 1b8080ff25..be8c18de72 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_annotations_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_annotations_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateful3Test.java index 0f3e51c83b..643b7875c2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.relatio public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_annotations_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_annotations_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations_vehicles_client.jar"); // The class files jpa_core_relationship_annotations_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_annotations_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_annotations_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_annotations_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_annotations_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_annotations_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_annotations_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_annotations_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateless3Test.java index 4e556d837a..502d266b2a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/annotations/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_annotations_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_annotations_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_annotations_vehicles_client.jar"); // The class files jpa_core_relationship_annotations_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_annotations_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_annotations_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_annotations_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_annotations_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_annotations_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_annotations_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_annotations_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagedTest.java index e34016bf5b..015e078fe3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany_vehicles_client.jar"); // The class files jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagednotxTest.java index e0d2e30ec5..3022207a14 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.re public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany_vehicles_client.jar"); // The class files jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPmservletTest.java index 9a5f6124c1..92b7688b53 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidirmanyxmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_bidirmanyxmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPuservletTest.java index 216814ca74..594c70c729 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidirmanyxmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_bidirmanyxmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateful3Test.java index 4fd77b9dfe..c14e0d363b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.relatio public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany_vehicles_client.jar"); // The class files jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateless3Test.java index 7f7dad0777..7f46dc9304 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxmany/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxmany_vehicles_client.jar"); // The class files jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagedTest.java index 3055e64392..6ee2853dac 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone_vehicles_client.jar"); // The class files jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagednotxTest.java index 9f64e0d9ff..0b7e1869e4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.re public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone_vehicles_client.jar"); // The class files jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPmservletTest.java index 761127b7f9..6141dd15c1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidirmanyxone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_bidirmanyxone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPuservletTest.java index 66fa4ca996..268c1d7bf4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidirmanyxone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_bidirmanyxone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateful3Test.java index 6996d3ec86..8d6a07e929 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.relatio public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidirmanyxone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidirmanyxone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone_vehicles_client.jar"); // The class files jpa_core_relationship_bidirmanyxone_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidirmanyxone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidirmanyxone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidirmanyxone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidirmanyxone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxone_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateless3Test.java index 70c4a3e759..eab02a8724 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidirmanyxone/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidirmanyxone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidirmanyxone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidirmanyxone_vehicles_client.jar"); // The class files jpa_core_relationship_bidirmanyxone_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidirmanyxone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidirmanyxone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidirmanyxone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidirmanyxone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidirmanyxone_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidirmanyxone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagedTest.java index 9eef537126..c325a25dd9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidironexmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidironexmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany_vehicles_client.jar"); // The class files jpa_core_relationship_bidironexmany_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidironexmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidironexmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidironexmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidironexmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexmany_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagednotxTest.java index 6c282b52dc..2779d26c42 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.re public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany_vehicles_client.jar"); // The class files jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPmservletTest.java index e5abe19899..7351dc54e9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidironexmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_bidironexmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPuservletTest.java index 79b415a236..a6227f4d69 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidironexmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_bidironexmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateful3Test.java index b816396092..48bf5e2a69 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.relatio public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidironexmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidironexmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany_vehicles_client.jar"); // The class files jpa_core_relationship_bidironexmany_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidironexmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidironexmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidironexmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidironexmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexmany_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateless3Test.java index 8a8f30fcc3..a5cd531ecc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexmany/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidironexmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidironexmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexmany_vehicles_client.jar"); // The class files jpa_core_relationship_bidironexmany_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidironexmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidironexmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidironexmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidironexmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexmany_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagedTest.java index d97fa8bd9c..479838663f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidironexone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidironexone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone_vehicles_client.jar"); // The class files jpa_core_relationship_bidironexone_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidironexone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidironexone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidironexone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidironexone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexone_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagednotxTest.java index 9b72592665..7b248636a8 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.re public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone_vehicles_client.jar"); // The class files jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPmservletTest.java index 5552f5a339..3fc1d7c27f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidironexone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_bidironexone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPuservletTest.java index 1054878cd2..c988dee5dc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidironexone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_bidironexone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateful3Test.java index 619a66492e..97b3a66928 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.relatio public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidironexone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidironexone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone_vehicles_client.jar"); // The class files jpa_core_relationship_bidironexone_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidironexone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidironexone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidironexone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidironexone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexone_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateless3Test.java index af06bad7e8..6547afa054 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/bidironexone/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_bidironexone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_bidironexone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_bidironexone_vehicles_client.jar"); // The class files jpa_core_relationship_bidironexone_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_bidironexone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_bidironexone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_bidironexone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_bidironexone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_bidironexone_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_bidironexone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagedTest.java index 324d479025..4bf345d5d2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_defaults_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_relationship_defaults_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults_vehicles_client.jar"); // The class files jpa_core_relationship_defaults_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_defaults_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_defaults_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_defaults_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_defaults_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_defaults_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_defaults_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_defaults_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagednotxTest.java index bf15759899..76c7c15151 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.re public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_defaults_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_relationship_defaults_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults_vehicles_client.jar"); // The class files jpa_core_relationship_defaults_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_defaults_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_defaults_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_defaults_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_defaults_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_defaults_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_defaults_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_defaults_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPmservletTest.java index d4374248cb..5a581ee42c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_defaults_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_defaults_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPuservletTest.java index bf5cbffd89..aa3840b278 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_defaults_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_defaults_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateful3Test.java index 19ae593917..7051700eb0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.relatio public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_defaults_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_defaults_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults_vehicles_client.jar"); // The class files jpa_core_relationship_defaults_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_defaults_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_defaults_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_defaults_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_defaults_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_defaults_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_defaults_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_defaults_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateless3Test.java index 32e875ee8f..0ac3811ac1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/defaults/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_defaults_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_defaults_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_defaults_vehicles_client.jar"); // The class files jpa_core_relationship_defaults_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_defaults_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_defaults_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_defaults_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_defaults_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_defaults_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_defaults_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_defaults_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagedTest.java index 6c6537323f..c37f62f294 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_descriptors_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_relationship_descriptors_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors_vehicles_client.jar"); // The class files jpa_core_relationship_descriptors_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_descriptors_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_descriptors_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_descriptors_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_descriptors_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_descriptors_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_descriptors_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_descriptors_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagednotxTest.java index d1f4bfbefe..baae3ac2ae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.re public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors_vehicles_client.jar"); // The class files jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_descriptors_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPmservletTest.java index 9845186fdd..748846b772 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_descriptors_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_descriptors_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPuservletTest.java index 5c28c517c2..a975103cc7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_descriptors_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_descriptors_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateful3Test.java index befeefe7fb..524004ccd1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.relatio public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_descriptors_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_descriptors_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors_vehicles_client.jar"); // The class files jpa_core_relationship_descriptors_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_descriptors_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_descriptors_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_descriptors_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_descriptors_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_descriptors_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_descriptors_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_descriptors_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateless3Test.java index d4c77a7e16..0115ce1821 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/descriptors/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_descriptors_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_descriptors_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_descriptors_vehicles_client.jar"); // The class files jpa_core_relationship_descriptors_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_descriptors_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_descriptors_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_descriptors_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_descriptors_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_descriptors_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_descriptors_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_descriptors_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagedTest.java index 9194e61c0f..a678eb938e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unimanyxmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unimanyxmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany_vehicles_client.jar"); // The class files jpa_core_relationship_unimanyxmany_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unimanyxmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unimanyxmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unimanyxmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unimanyxmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxmany_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagednotxTest.java index 2306de09da..2389de7a90 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.re public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany_vehicles_client.jar"); // The class files jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPmservletTest.java index 271d613296..08f229f7f4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unimanyxmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_unimanyxmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPuservletTest.java index 37bd7f31c0..23255a3d2f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unimanyxmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_unimanyxmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateful3Test.java index 74987119f1..dd4618f4ed 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.relatio public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unimanyxmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unimanyxmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany_vehicles_client.jar"); // The class files jpa_core_relationship_unimanyxmany_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unimanyxmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unimanyxmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unimanyxmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unimanyxmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxmany_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateless3Test.java index 939c6d653c..33941d6505 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxmany/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unimanyxmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unimanyxmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxmany_vehicles_client.jar"); // The class files jpa_core_relationship_unimanyxmany_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unimanyxmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unimanyxmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unimanyxmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unimanyxmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxmany_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagedTest.java index 684d909ba1..5d92b19e2e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unimanyxone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unimanyxone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone_vehicles_client.jar"); // The class files jpa_core_relationship_unimanyxone_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unimanyxone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unimanyxone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unimanyxone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unimanyxone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxone_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagednotxTest.java index e6253707e3..60b5f4b315 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.re public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone_vehicles_client.jar"); // The class files jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPmservletTest.java index 8db4bad9de..67dd12d0f7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unimanyxone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_unimanyxone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPuservletTest.java index c264794593..76303bb4d6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unimanyxone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_unimanyxone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateful3Test.java index 40e64d55d3..470274868b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.relatio public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unimanyxone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unimanyxone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone_vehicles_client.jar"); // The class files jpa_core_relationship_unimanyxone_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unimanyxone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unimanyxone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unimanyxone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unimanyxone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxone_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateless3Test.java index 8c3720a04e..d3936537fa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unimanyxone/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unimanyxone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unimanyxone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unimanyxone_vehicles_client.jar"); // The class files jpa_core_relationship_unimanyxone_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unimanyxone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unimanyxone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unimanyxone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unimanyxone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unimanyxone_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unimanyxone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagedTest.java index 94e9f38019..48d28164f7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unionexmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unionexmany_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany_vehicles_client.jar"); // The class files jpa_core_relationship_unionexmany_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unionexmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unionexmany_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unionexmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unionexmany_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexmany_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.relationship.unionexmany.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexmany_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagednotxTest.java index 2702524cd9..13effdb94c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.re public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany_vehicles_client.jar"); // The class files jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.relationship.unionexmany.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexmany_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPmservletTest.java index b3fbf48496..f174545ec3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unionexmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_unionexmany_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPuservletTest.java index a22845cc7d..69b6944b14 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unionexmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_unionexmany_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateful3Test.java index 98494faf36..48eb9dddde 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.relatio public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unionexmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unionexmany_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany_vehicles_client.jar"); // The class files jpa_core_relationship_unionexmany_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unionexmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unionexmany_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unionexmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unionexmany_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexmany_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.relationship.unionexmany.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexmany_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateless3Test.java index 57f1f12812..ae4df256c5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexmany/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unionexmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unionexmany_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexmany_vehicles_client.jar"); // The class files jpa_core_relationship_unionexmany_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unionexmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unionexmany_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unionexmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unionexmany_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexmany_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test ee.jakarta.tck.persistence.core.relationship.unionexmany.Client.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexmany_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagedTest.java index 90566c0395..41efafc7f3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unionexone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unionexone_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone_vehicles_client.jar"); // The class files jpa_core_relationship_unionexone_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unionexone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unionexone_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unionexone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unionexone_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexone_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexone_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagednotxTest.java index a62624a829..b7e8a85d63 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.re public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone_vehicles_client.jar"); // The class files jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexone_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPmservletTest.java index 3ade172f83..d4037dd2d5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unionexone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_unionexone_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPuservletTest.java index 10ce6361eb..24bc222689 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unionexone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_relationship_unionexone_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateful3Test.java index 548f781da2..441e8c7b3d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.relatio public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unionexone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unionexone_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone_vehicles_client.jar"); // The class files jpa_core_relationship_unionexone_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unionexone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unionexone_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unionexone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unionexone_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexone_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexone_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateless3Test.java index 6bc5f80e58..8f14a50443 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/relationship/unionexone/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.relati public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_relationship_unionexone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_relationship_unionexone_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_relationship_unionexone_vehicles_client.jar"); // The class files jpa_core_relationship_unionexone_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_relationship_unionexone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_relationship_unionexone_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_relationship_unionexone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_relationship_unionexone_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_relationship_unionexone_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_relationship_unionexone_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagedTest.java index 158a875f3f..793f1f26ca 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.types. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_auto_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_types_auto_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto_vehicles_client.jar"); // The class files jpa_core_types_auto_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_auto_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_types_auto_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_auto_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_auto_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_auto_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_types_auto_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_types_auto_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagednotxTest.java index ef68e1f42d..c3916db4f4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ty public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_auto_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_types_auto_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto_vehicles_client.jar"); // The class files jpa_core_types_auto_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_auto_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_types_auto_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_auto_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_auto_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_auto_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_types_auto_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_types_auto_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPmservletTest.java index ecb97f777e..c8dcd30099 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_auto_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_types_auto_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPuservletTest.java index 15a061222a..6e1243bf70 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_auto_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_types_auto_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateful3Test.java index 61b1a5e103..f180c9a7ff 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.types.a public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_auto_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_types_auto_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto_vehicles_client.jar"); // The class files jpa_core_types_auto_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_auto_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_types_auto_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_auto_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_auto_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_auto_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_types_auto_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_types_auto_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateless3Test.java index d20c378bff..0358db7d16 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/auto/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.types. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_auto_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_types_auto_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_auto_vehicles_client.jar"); // The class files jpa_core_types_auto_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_auto_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_types_auto_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_auto_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_auto_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_auto_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_types_auto_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_types_auto_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagedTest.java index a13eb975a9..776d7eb121 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.types. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_field_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_types_field_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field_vehicles_client.jar"); // The class files jpa_core_types_field_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_field_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_types_field_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_field_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_field_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_types_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_types_field_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagednotxTest.java index 6e309df84d..28e329dccc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ty public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_field_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_types_field_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field_vehicles_client.jar"); // The class files jpa_core_types_field_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_field_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_types_field_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_field_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_field_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_types_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_types_field_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPmservletTest.java index 6a0db7c8b4..01f591de01 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_field_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_types_field_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPuservletTest.java index fca71fa421..3db361ba23 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_field_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_types_field_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateful3Test.java index bace1af112..9ba944926f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.types.f public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_field_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_types_field_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field_vehicles_client.jar"); // The class files jpa_core_types_field_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_field_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_types_field_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_field_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_field_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_types_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_types_field_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateless3Test.java index 9449c1b063..c7f17c6aec 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/field/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.types. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_field_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_types_field_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_field_vehicles_client.jar"); // The class files jpa_core_types_field_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_field_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_types_field_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_field_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_field_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_types_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_types_field_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagedTest.java index b9d98b49e5..d7c0ef2a95 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.types public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagednotxTest.java index eef68436e1..ed96c2fd9d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.t public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateful3Test.java index acb5954cfa..22fe58b725 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.types. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateless3Test.java index bfd8601586..38750129d2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.types public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagedTest.java index f670be5966..2dc0837248 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.types public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagednotxTest.java index 7866246e34..d6688d4caa 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.t public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateful3Test.java index 04174cef69..05d3f24cb5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.types. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateless3Test.java index 39b7f07cc2..c3a4c55d4b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.types public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagedTest.java index 42d7f3fe84..8b08ae4745 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagedTest extends ee.jakarta.tck.persistence.core.types public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanaged_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagednotxTest.java index 5fcee4ac6f..49f4242d23 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3AppmanagednotxTest extends ee.jakarta.tck.persistence.core.t public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateful3Test.java index 09167a46b8..0810e0e4e7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateful3Test extends ee.jakarta.tck.persistence.core.types. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateful3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateless3Test.java index f1973789db..048df360c1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client3Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client3Stateless3Test extends ee.jakarta.tck.persistence.core.types public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client3.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateless3_vehicle_client, Client3.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagedTest.java index 0b36dc9852..e5004c49f3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagedTest extends ee.jakarta.tck.persistence.core.types public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanaged_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagednotxTest.java index 5765a95016..5867f59238 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4AppmanagednotxTest extends ee.jakarta.tck.persistence.core.t public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_appmanagedNoTx_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateful3Test.java index 5dc5def4a7..dd8d83e016 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateful3Test extends ee.jakarta.tck.persistence.core.types. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateful3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateless3Test.java index 00d698b1e8..600ace1748 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/generator/Client4Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client4Stateless3Test extends ee.jakarta.tck.persistence.core.types public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_generator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_types_generator_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_generator_vehicles_client.jar"); // The class files jpa_core_types_generator_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -96,7 +95,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_generator_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_generator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_generator_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client4.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_generator_stateless3_vehicle_client, Client4.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagedTest.java index c0e62b27e7..18fd906bf4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.types. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_pkey_compound_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_types_pkey_compound_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound_vehicles_client.jar"); // The class files jpa_core_types_pkey_compound_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_pkey_compound_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_types_pkey_compound_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_pkey_compound_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_pkey_compound_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_pkey_compound_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_types_pkey_compound_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_types_pkey_compound_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagednotxTest.java index 08c862dea9..112c60bd0a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ty public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound_vehicles_client.jar"); // The class files jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_types_pkey_compound_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPmservletTest.java index b201a59526..3f6a4fe2f7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_pkey_compound_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_types_pkey_compound_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPuservletTest.java index 0614e32e82..85b36eea91 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_pkey_compound_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_types_pkey_compound_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateful3Test.java index 71675ae7c4..e5e3bd0132 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.types.p public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_pkey_compound_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_types_pkey_compound_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound_vehicles_client.jar"); // The class files jpa_core_types_pkey_compound_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_pkey_compound_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_types_pkey_compound_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_pkey_compound_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_pkey_compound_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_pkey_compound_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_types_pkey_compound_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_types_pkey_compound_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateless3Test.java index e2f0bd65fd..04171a1c44 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/primarykey/compound/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.types. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_pkey_compound_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_types_pkey_compound_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_pkey_compound_vehicles_client.jar"); // The class files jpa_core_types_pkey_compound_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_types_pkey_compound_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_types_pkey_compound_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_pkey_compound_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_pkey_compound_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_pkey_compound_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_types_pkey_compound_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_types_pkey_compound_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagedTest.java index 3ebcdea2d6..913858543a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagedTest extends ee.jakarta.tck.persistence.core.types public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_property_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_types_property_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_vehicles_client.jar"); // The class files jpa_core_types_property_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_property_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_property_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_property_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_appmanaged_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagednotxTest.java index 4accbdc6b9..57b55bf2a2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1AppmanagednotxTest extends ee.jakarta.tck.persistence.core.t public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_property_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_types_property_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_vehicles_client.jar"); // The class files jpa_core_types_property_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_property_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_property_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_property_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_appmanagedNoTx_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateful3Test.java index 4675a0c52f..aaf03a1103 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateful3Test extends ee.jakarta.tck.persistence.core.types. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_property_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_types_property_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_vehicles_client.jar"); // The class files jpa_core_types_property_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_property_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_property_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_property_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_stateful3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateless3Test.java index feeb644ccd..5ebb2e3f79 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client1Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client1Stateless3Test extends ee.jakarta.tck.persistence.core.types public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_property_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_types_property_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_vehicles_client.jar"); // The class files jpa_core_types_property_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_property_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_property_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_property_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client1.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_stateless3_vehicle_client, Client1.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagedTest.java index acdb0c5445..6b5052b8db 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagedTest extends ee.jakarta.tck.persistence.core.types public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_property_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_types_property_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_vehicles_client.jar"); // The class files jpa_core_types_property_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_property_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_property_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_property_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_appmanaged_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagednotxTest.java index 3c606f236c..8f46fbb56d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2AppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2AppmanagednotxTest extends ee.jakarta.tck.persistence.core.t public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_property_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_types_property_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_vehicles_client.jar"); // The class files jpa_core_types_property_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_property_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_property_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_property_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_appmanagedNoTx_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateful3Test.java index 2745b39202..f513067690 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateful3Test extends ee.jakarta.tck.persistence.core.types. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_property_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_types_property_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_vehicles_client.jar"); // The class files jpa_core_types_property_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_property_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_property_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_property_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_stateful3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateless3Test.java index 386d19a78b..fe9cfdd2f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/types/property/Client2Stateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class Client2Stateless3Test extends ee.jakarta.tck.persistence.core.types public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_types_property_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_types_property_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_types_property_vehicles_client.jar"); // The class files jpa_core_types_property_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -95,7 +94,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(resURL != null) { jpa_core_types_property_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_types_property_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_types_property_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client2.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_types_property_stateless3_vehicle_client, Client2.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagedTest.java index 5f44ead350..59959eaddd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.core.versio public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_versioning_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_versioning_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning_vehicles_client.jar"); // The class files jpa_core_versioning_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_versioning_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_versioning_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_versioning_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_versioning_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_versioning_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_versioning_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_versioning_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagednotxTest.java index f345f7f2df..54ccbf46e1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.core.ve public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_versioning_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_versioning_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning_vehicles_client.jar"); // The class files jpa_core_versioning_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_versioning_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_versioning_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_versioning_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_versioning_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_versioning_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_versioning_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_versioning_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPmservletTest.java index a7bbfc66f0..dcaae4ca27 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_versioning_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_versioning_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPuservletTest.java index f7d7e03afe..3cdd496014 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_versioning_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_versioning_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateful3Test.java index c0c0f95ca4..c89fca020f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.core.version public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_versioning_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_versioning_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning_vehicles_client.jar"); // The class files jpa_core_versioning_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_versioning_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_versioning_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_versioning_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_versioning_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_versioning_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_versioning_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_versioning_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateless3Test.java index 503d93d96e..55dbf1dfc4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/core/versioning/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.core.versio public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_versioning_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_versioning_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_versioning_vehicles_client.jar"); // The class files jpa_core_versioning_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_versioning_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_versioning_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_versioning_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_versioning_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_versioning_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_versioning_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_versioning_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/Client.java index d515b3450e..8fca145a53 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/Client.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/Client.java @@ -21,11 +21,7 @@ import java.util.Map; import java.util.Properties; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - +import com.sun.ts.lib.harness.Status; import ee.jakarta.tck.persistence.common.PMClientBase; import jakarta.persistence.EntityManager; @@ -43,6 +39,11 @@ public class Client extends PMClientBase { public Client() { } + public static void main(String[] args) { + Client theTests = new Client(); + Status s = theTests.run(args, System.out, System.err); + s.exit(); + } public void setup(String[] args, Properties p) throws Exception { @@ -58,7 +59,6 @@ public void setup(String[] args, Properties p) throws Exception { } } - @AfterEach public void cleanup() throws Exception { logTrace( "cleanup complete, calling super.cleanup"); super.cleanup(); @@ -72,7 +72,6 @@ public void cleanup() throws Exception { * * @test_Strategy: Create an EntityManagerFactory via SynchronizationType,Map */ - @Test public void createEntityManagerSynchronizationTypeMapTest() throws Exception { boolean pass1 = false; boolean pass2 = false; @@ -112,7 +111,6 @@ public void createEntityManagerSynchronizationTypeMapTest() throws Exception { * * @test_Strategy: Create an EntityManagerFactory via SynchronizationType */ - @Test public void createEntityManagerSynchronizationTypeTest() throws Exception { boolean pass1 = false; boolean pass2 = false; @@ -153,7 +151,6 @@ public void createEntityManagerSynchronizationTypeTest() throws Exception { * @test_Strategy: Call EntityManager.joinTransaction() method when no * transaction exists */ - @Test public void joinTransactionTransactionRequiredExceptionTest() throws Exception { boolean pass = false; try { diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientAppmanagedTest.java index 79fb6cf556..6742142a34 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientAppmanagedTest.java @@ -1,6 +1,6 @@ package ee.jakarta.tck.persistence.ee.entityManager; -import ee.jakarta.tck.persistence.ee.entityManager.Client; + import java.net.URL; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OperateOnDeployment; @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -73,7 +72,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.ee.entityMa public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_ee_entityManager_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_appmanaged_vehicle_client.jar"); + JavaArchive jpa_ee_entityManager_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_vehicles_client.jar"); // The class files jpa_ee_entityManager_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -100,11 +99,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_entityManager_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_entityManager_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_entityManager_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_ee_entityManager_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_entityManager_appmanaged_vehicle_client, Client.class, resURL); @@ -133,12 +132,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_ee_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_ee_entityManager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientPmservletTest.java index 594a79fd05..9ba19a121c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientPmservletTest.java @@ -99,7 +99,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_entityManager_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_ee_entityManager_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateful3Test.java index 3d8e548e0e..9b1e3cecff 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -73,7 +72,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.ee.entityMan public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_ee_entityManager_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_stateful3_vehicle_client.jar"); + JavaArchive jpa_ee_entityManager_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_vehicles_client.jar"); // The class files jpa_ee_entityManager_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -100,11 +99,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_entityManager_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_entityManager_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_entityManager_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_ee_entityManager_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_entityManager_stateful3_vehicle_client, Client.class, resURL); @@ -133,12 +132,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_ee_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_ee_entityManager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateless3Test.java index d3ebe00b24..0a5ce41a90 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -73,7 +72,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.ee.entityMa public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_ee_entityManager_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_stateless3_vehicle_client.jar"); + JavaArchive jpa_ee_entityManager_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManager_vehicles_client.jar"); // The class files jpa_ee_entityManager_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -100,11 +99,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_entityManager_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_entityManager_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_entityManager_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_ee_entityManager_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_entityManager_stateless3_vehicle_client, Client.class, resURL); @@ -133,12 +132,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_ee_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_ee_entityManager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/Client.java index b0c033061f..39f2cb09f1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/Client.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/Client.java @@ -19,10 +19,6 @@ import java.util.Properties; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; import ee.jakarta.tck.persistence.common.PMClientBase; import ee.jakarta.tck.persistence.core.entityManagerFactory.Order; @@ -40,10 +36,10 @@ public Client() { } - public void setup() throws Exception { + public void setup(String[] args, Properties p) throws Exception { logTrace( "setup"); try { - super.setup(); + super.setup(args,p); removeTestData(); createOrderTestData(); } catch (Exception e) { @@ -68,7 +64,7 @@ public void cleanup() throws Exception { * * @test_Strategy: Create an EntityManagerFactory via String */ - @Test + public void createEntityManagerFactoryStringTest() throws Exception { boolean pass = false; diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientAppmanagedTest.java index 30346616c4..b45be45134 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.ee.entityMa public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_ee_entityManagerFactory_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_appmanaged_vehicle_client.jar"); + JavaArchive jpa_ee_entityManagerFactory_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_vehicles_client.jar"); // The class files jpa_ee_entityManagerFactory_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_entityManagerFactory_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_entityManagerFactory_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_entityManagerFactory_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_ee_entityManagerFactory_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_entityManagerFactory_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_ee_entityManagerFactory_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientPmservletTest.java index 798ded05e2..dd64378359 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientPmservletTest.java @@ -1,5 +1,6 @@ package ee.jakarta.tck.persistence.ee.entityManagerFactory; +import ee.jakarta.tck.persistence.common.schema30.Util; import ee.jakarta.tck.persistence.ee.entityManagerFactory.Client; import java.net.URL; import org.jboss.arquillian.container.test.api.Deployment; @@ -90,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_entityManagerFactory_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_ee_entityManagerFactory_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } @@ -116,8 +117,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test JavaArchive jpa_ee_entityManagerFactory = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory.jar"); // The class files jpa_ee_entityManagerFactory.addClasses( - ee.jakarta.tck.persistence.ee.entityManagerFactory.Order.class - ); + Util.getSchema30classes() + ).addClass(Order.class); // The persistence.xml descriptor URL parURL = Client.class.getResource("persistence.xml"); if(parURL != null) { diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateful3Test.java index 75990fa470..164e9711ee 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.ee.entityMan public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_ee_entityManagerFactory_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_stateful3_vehicle_client.jar"); + JavaArchive jpa_ee_entityManagerFactory_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_vehicles_client.jar"); // The class files jpa_ee_entityManagerFactory_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_entityManagerFactory_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_entityManagerFactory_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_entityManagerFactory_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_ee_entityManagerFactory_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_entityManagerFactory_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_ee_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_ee_entityManagerFactory_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateless3Test.java index d6abe8256c..4bf688d301 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.ee.entityMa public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_ee_entityManagerFactory_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_stateless3_vehicle_client.jar"); + JavaArchive jpa_ee_entityManagerFactory_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_entityManagerFactory_vehicles_client.jar"); // The class files jpa_ee_entityManagerFactory_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_entityManagerFactory_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_entityManagerFactory_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_entityManagerFactory_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_ee_entityManagerFactory_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_entityManagerFactory_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_ee_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_ee_entityManagerFactory_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/Client.java index 3c7804b8e8..b056741a56 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/Client.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/Client.java @@ -22,11 +22,11 @@ +import java.util.Properties; + import com.sun.ts.lib.harness.EETest; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import com.sun.ts.lib.harness.Status; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.EntityTransaction; @@ -49,9 +49,15 @@ public class Client extends EETest { * @class.setup_props: */ - @BeforeEach - public void setup() throws Exception { + public static void main(String[] args) { + Client theTests = new Client(); + Status s = theTests.run(args, System.out, System.err); + s.exit(); + } + + public void setup(String[] args, Properties p) throws Exception { try { + if (emf != null) { em = emf.createEntityManager(); } else { @@ -97,7 +103,6 @@ public void setup() throws Exception { * Create entities, persist them, then find. * */ - @Test public void test1() throws Exception { logTrace( "Begin test1"); @@ -158,7 +163,7 @@ public void test1() throws Exception { } } - @AfterEach + public void cleanup() throws Exception { logTrace( "cleanup"); removeTestData(); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/ClientTest.java index b1f3b86055..6923155070 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/ClientTest.java @@ -66,7 +66,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive if(resURL != null) { jpa_ee_packaging_appclient_annotation_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_packaging_appclient_annotation_client.addAsManifestResource(new StringAsset("Main-Class: ${package}.Client\n"), "MANIFEST.MF"); + jpa_ee_packaging_appclient_annotation_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_appclient_annotation_client, Client.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/persistence.xml deleted file mode 100644 index 1f6f278d03..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/annotation/persistence.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - jdbc/DB_no_tx - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/ClientTest.java index 4ecd8bd860..7c4af6cf9c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/ClientTest.java @@ -67,7 +67,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive if(resURL != null) { jpa_ee_packaging_appclient_descriptor_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_packaging_appclient_descriptor_client.addAsManifestResource(new StringAsset("Main-Class: ${package}.Client\n"), "MANIFEST.MF"); + jpa_ee_packaging_appclient_descriptor_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_appclient_descriptor_client, Client.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/jpa_ee_packaging_appclient_descriptor_client.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/jpa_ee_packaging_appclient_descriptor_client.xml deleted file mode 100644 index 7ed2ceb6c3..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/jpa_ee_packaging_appclient_descriptor_client.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - jpa_ee_packaging_appclient_descriptor - - My Persistence Unit - persistence/MyPersistenceUnit - CTS-APPCLIENT-DESCRIPTOR - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/persistence.xml deleted file mode 100644 index 70e39ce9fb..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/appclient/descriptor/persistence.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - jdbc/DB_no_tx - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/ClientTest.java index afca33b6f3..c2c9e5b503 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/ClientTest.java @@ -73,7 +73,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive if(resURL != null) { jpa_ee_packaging_ejb_descriptor_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_packaging_ejb_descriptor_client.addAsManifestResource(new StringAsset("Main-Class: ${package}.Client\n"), "MANIFEST.MF"); + jpa_ee_packaging_ejb_descriptor_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_ejb_descriptor_client, Client.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/jpa_ee_packaging_ejb_descriptor_client.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/jpa_ee_packaging_ejb_descriptor_client.xml deleted file mode 100644 index a8f44bd053..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/jpa_ee_packaging_ejb_descriptor_client.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - ejb3_pkg_descriptor_client - - ejb/Stateless3Bean - Session - ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateless3IF - Stateless3Bean - - - ejb/Stateful3Bean - Session - ee.jakarta.tck.persistence.ee.packaging.ejb.descriptor.Stateful3IF - Stateful3Bean - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/jpa_ee_packaging_ejb_descriptor_ejb.jar.sun-ejb-jar.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/jpa_ee_packaging_ejb_descriptor_ejb.jar.sun-ejb-jar.xml deleted file mode 100644 index 8dc332fc84..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/jpa_ee_packaging_ejb_descriptor_ejb.jar.sun-ejb-jar.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - Stateful3Bean - com_sun_ts_tests_jpa_packaging_descriptor_Stateful3Bean - - - Stateless3Bean - com_sun_ts_tests_jpa_packaging_descriptor_Stateless3Bean - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/jpa_ee_packaging_ejb_descriptor_ejb.jar.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/jpa_ee_packaging_ejb_descriptor_ejb.jar.xml deleted file mode 100644 index c396899782..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/jpa_ee_packaging_ejb_descriptor_ejb.jar.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - Stateful3Bean - - My Persistence Unit - persistence/MyPersistenceUnit - CTS-EE-EJB - - - - Stateless3Bean - - My Persistence Unit - persistence/MyPersistenceUnit - CTS-EE-EJB - - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/persistence.xml deleted file mode 100644 index 563d927320..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/descriptor/persistence.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - Persistence Unit for CTS EE Package Tests - jdbc/DB1 - myMappingFile.xml - myMappingFile2.xml - false - - - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/ClientTest.java index 585c0cbfdc..3512931211 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/ClientTest.java @@ -69,7 +69,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive if(resURL != null) { jpa_ee_packaging_ejb_exclude_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_packaging_ejb_exclude_client.addAsManifestResource(new StringAsset("Main-Class: ${package}.Client\n"), "MANIFEST.MF"); + jpa_ee_packaging_ejb_exclude_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_ejb_exclude_client, Client.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/jpa_ee_packaging_ejb.jar.sun-ejb-jar.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/jpa_ee_packaging_ejb.jar.sun-ejb-jar.xml deleted file mode 100644 index 4927f191d6..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/jpa_ee_packaging_ejb.jar.sun-ejb-jar.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - Stateful3Bean - com_sun_ts_tests_jpa_packaging_exclude_Stateful3Bean - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/persistence.xml deleted file mode 100644 index 3fe943dbd7..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/exclude/persistence.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - Persistence Unit for CTS EE Package Tests - jdbc/DB1 - ee.jakarta.tck.persistence.ee.packaging.ejb.exclude.B - true - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/ClientTest.java index ad9a297e3d..7021fffc90 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/ClientTest.java @@ -71,7 +71,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive if(resURL != null) { jpa_ee_packaging_ejb_resource_local_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_packaging_ejb_resource_local_client.addAsManifestResource(new StringAsset("Main-Class: ${package}.Client\n"), "MANIFEST.MF"); + jpa_ee_packaging_ejb_resource_local_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_ejb_resource_local_client, Client.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/jpa_ee_packaging_ejb_resource_local_client.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/jpa_ee_packaging_ejb_resource_local_client.xml deleted file mode 100644 index daef71c258..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/jpa_ee_packaging_ejb_resource_local_client.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - stateless3_rl_client - - ejb/Stateless3Bean - Session - ee.jakarta.tck.persistence.ee.packaging.ejb.resource_local.Stateless3IF - Stateless3Bean - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/jpa_ee_packaging_ejb_resource_local_ejb.jar.sun-ejb-jar.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/jpa_ee_packaging_ejb_resource_local_ejb.jar.sun-ejb-jar.xml deleted file mode 100644 index 26042c2190..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/jpa_ee_packaging_ejb_resource_local_ejb.jar.sun-ejb-jar.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - Stateless3Bean - com_sun_ts_tests_ejb3_rl_Stateless3Bean - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/jpa_ee_packaging_ejb_resource_local_ejb.jar.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/jpa_ee_packaging_ejb_resource_local_ejb.jar.xml deleted file mode 100644 index 7b8844852b..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/jpa_ee_packaging_ejb_resource_local_ejb.jar.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - Stateless3Bean - - persistence/ThisPersistenceUnit - - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/persistence.xml deleted file mode 100644 index 9e3d9cd234..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/resource_local/persistence.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - jdbc/DB_no_tx - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/ClientTest.java index eba23d1501..49e375fcd6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/ClientTest.java @@ -68,7 +68,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive if(resURL != null) { jpa_ee_packaging_ejb_standalone_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_packaging_ejb_standalone_client.addAsManifestResource(new StringAsset("Main-Class: ${package}.Client\n"), "MANIFEST.MF"); + jpa_ee_packaging_ejb_standalone_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_ejb_standalone_client, Client.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/jpa_ee_packaging_ejb_standalone_client.jar.sun-application-client.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/jpa_ee_packaging_ejb_standalone_client.jar.sun-application-client.xml deleted file mode 100644 index 687d6c1a59..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/jpa_ee_packaging_ejb_standalone_client.jar.sun-application-client.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - ejb/Stateful3Bean - com_sun_ts_tests_jpa_ee_packaging_ejb_standalone_Stateful3Bean - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/jpa_ee_packaging_ejb_standalone_component_ejb.jar.sun-ejb-jar.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/jpa_ee_packaging_ejb_standalone_component_ejb.jar.sun-ejb-jar.xml deleted file mode 100644 index e59a697362..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/jpa_ee_packaging_ejb_standalone_component_ejb.jar.sun-ejb-jar.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - Stateful3Bean - com_sun_ts_tests_jpa_ee_packaging_ejb_standalone_Stateful3Bean - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/jpa_ee_packaging_ejb_standalone_component_ejb.jar.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/jpa_ee_packaging_ejb_standalone_component_ejb.jar.xml deleted file mode 100644 index 5ff92fdf4f..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/jpa_ee_packaging_ejb_standalone_component_ejb.jar.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - Stateful3Bean - - My Persistence Context - persistence-unit must only be specified if multiple PUs exist - - persistence/MyPersistenceContext - CTS-EJB-STANDALONE - Transaction - - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/persistence.xml deleted file mode 100644 index ff651df904..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/ejb/standalone/persistence.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - Persistence Unit for CTS EE Package Tests. - If the transaction-type is not specified, - the default is JTA. - - jdbc/DB1 - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/application.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/application.xml deleted file mode 100644 index 1cbbcac1b1..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/application.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - jpa_ee_packaging_web_scope_web.war - jpa_ee_packaging_web_scope - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/jpa_ee_packaging_web_scope_web.war.sun-web.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/jpa_ee_packaging_web_scope_web.war.sun-web.xml deleted file mode 100644 index a0ebf9ad1b..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/jpa_ee_packaging_web_scope_web.war.sun-web.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - jpa_ee_packaging_web_scope - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/jpa_ee_packaging_web_scope_web.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/jpa_ee_packaging_web_scope_web.xml deleted file mode 100644 index 920a789129..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/jpa_ee_packaging_web_scope_web.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - jpa_ee_packaging_web_scope - - ServletTest - ee.jakarta.tck.persistence.ee.packaging.web.scope.ServletTest - - - ServletTest - /ServletTest - - - 54 - - - My Entity Manager - persistence/MyEM - AccountManager - Transaction - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/persistence.xml deleted file mode 100644 index 66a9fdaeb2..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/scope/persistence.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - Persistence Unit for CTS EE Package Tests - jdbc/DB1 - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/jpa_ee_packaging_web_standalone_component_web.war.sun-web.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/jpa_ee_packaging_web_standalone_component_web.war.sun-web.xml deleted file mode 100644 index 1cda511d15..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/jpa_ee_packaging_web_standalone_component_web.war.sun-web.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - jpa_ee_packaging_web_standalone - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/jpa_ee_packaging_web_standalone_component_web.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/jpa_ee_packaging_web_standalone_component_web.xml deleted file mode 100644 index a120274517..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/jpa_ee_packaging_web_standalone_component_web.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - jpa_ee_packaging_web_standalone - - ServletTest - ee.jakarta.tck.persistence.ee.packaging.web.standalone.ServletTest - - - ServletTest - /ServletTest - - - 54 - - - My Persistence Unit - persistence/MyPersistenceUnit - StandaloneAccountManager - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/persistence.xml deleted file mode 100644 index 0b2e3809c3..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/persistence.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - Persistence Unit for CTS EE Package Tests - jdbc/DB1 - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/Client.java index 9fbfe40d7b..ffccdff415 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/Client.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/Client.java @@ -23,15 +23,13 @@ import java.util.Map; import java.util.Properties; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - import ee.jakarta.tck.persistence.common.PMClientBase; import ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerFactoryImpl; import ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerImpl; import ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor; +import com.sun.ts.lib.harness.Status; + import jakarta.persistence.SharedCacheMode; import jakarta.persistence.ValidationMode; import jakarta.persistence.spi.PersistenceUnitInfo; @@ -59,11 +57,16 @@ public Client() { /* * @class.setup_props: log.file.location; */ - @BeforeEach - public void setup() throws Exception { + public static void main(String[] args) { + Client theTests = new Client(); + Status s = theTests.run(args, System.out, System.err); + s.exit(); + } + + public void setup(String[] args,Properties props) throws Exception { logTrace( "setup"); - super.setup(); - logProcessor = new LogFileProcessor(); + super.setup(args,props); + logProcessor = new LogFileProcessor(props); if (logProcessor.fetchLog()) { currentSeqNum = logProcessor.getCurrentSequenceNumber(); @@ -81,7 +84,6 @@ public void setup() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test public void createEMF() throws Exception { String expected[] = { LOGMESSAGE_PREFIX + "Called createContainerEntityManagerFactory(PersistenceUnitInfo, Map)" }; @@ -99,7 +101,6 @@ public void createEMF() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test public void getPersistenceProviderClassName() throws Exception { boolean pass1 = false; @@ -130,7 +131,7 @@ public void getPersistenceProviderClassName() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getPersistenceUnitNameTest() throws Exception { boolean pass1 = false; @@ -171,7 +172,7 @@ public void getPersistenceUnitNameTest() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getTransactionType() throws Exception { boolean pass1 = false; @@ -204,7 +205,7 @@ public void getTransactionType() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getManagedClassNames() throws Exception { boolean pass1 = false; List expected = new ArrayList(); @@ -245,7 +246,7 @@ public void getManagedClassNames() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getJarFileUrls() throws Exception { boolean pass1 = false; @@ -283,7 +284,7 @@ public void getJarFileUrls() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getPersistenceUnitRootUrl() throws Exception { boolean pass1 = false; @@ -314,7 +315,7 @@ public void getPersistenceUnitRootUrl() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getPersistenceXMLSchemaVersion() throws Exception { boolean pass1 = false; @@ -345,7 +346,7 @@ public void getPersistenceXMLSchemaVersion() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getProperties() throws Exception { boolean pass1 = true; @@ -406,7 +407,7 @@ public void getProperties() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getSharedCacheMode() throws Exception { boolean pass1 = false; @@ -437,7 +438,7 @@ public void getSharedCacheMode() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getValidationMode() throws Exception { boolean pass1 = false; @@ -467,7 +468,7 @@ public void getValidationMode() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getClassLoader() throws Exception { boolean pass1 = false; getClassObjects(); @@ -495,7 +496,7 @@ public void getClassLoader() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getNewTempClassLoader() throws Exception { boolean pass1 = false; getClassObjects(); @@ -523,7 +524,7 @@ public void getNewTempClassLoader() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getMappingFileNames() throws Exception { boolean pass1 = false; List expected = new ArrayList(); @@ -567,7 +568,7 @@ public void getMappingFileNames() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getJtaDataSource() throws Exception { boolean pass1 = false; @@ -595,7 +596,7 @@ public void getJtaDataSource() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void excludeUnlistedClasses() throws Exception { boolean pass1 = false; @@ -623,7 +624,7 @@ public void excludeUnlistedClasses() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getProviderUtil() throws Exception { String expected[] = { LOGMESSAGE_PREFIX + "Called getProviderUtil()" }; @@ -642,7 +643,7 @@ public void getProviderUtil() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void isLoaded() throws Exception { String expected[] = { LOGMESSAGE_PREFIX + "Called isLoaded()" }; @@ -664,7 +665,7 @@ public void getClassObjects() { puInfo = emfImpl.puInfo; } - @AfterEach + public void cleanup() throws Exception { logTrace( "cleanup"); logTrace( "calling super.cleanup"); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientAppmanagedTest.java index 4192ef9b2a..094e6f7dd9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientAppmanagedTest.java @@ -24,7 +24,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("platform") -@Tag("web") @Tag("tck-appclient") public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Client { @@ -57,7 +56,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.ee.pluggabi public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client.jar"); + JavaArchive jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_vehicles_client.jar"); // The class files jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -84,7 +83,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } @@ -117,12 +116,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL != null) { jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL != null) { jpa_ee_pluggability_contracts_jta_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientPmservletTest.java index 1c3d4c0007..bba8984292 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientPmservletTest.java @@ -83,7 +83,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_ee_pluggability_contracts_jta_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientStateful3Test.java index 24e50735dc..b2f3e0ffee 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientStateful3Test.java @@ -24,7 +24,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("platform") -@Tag("web") @Tag("tck-appclient") public class ClientStateful3Test extends ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Client { @@ -57,7 +56,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.ee.pluggabil public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client.jar"); + JavaArchive jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_vehicles_client.jar"); // The class files jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -84,7 +83,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_pluggability_contracts_jta_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } @@ -117,12 +116,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL != null) { jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL != null) { jpa_ee_pluggability_contracts_jta_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientStateless3Test.java index d9450de310..460f8e3ec4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/ClientStateless3Test.java @@ -24,7 +24,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("platform") -@Tag("web") @Tag("tck-appclient") public class ClientStateless3Test extends ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Client { @@ -57,7 +56,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.ee.pluggabi public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client.jar"); + JavaArchive jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_pluggability_contracts_jta_vehicles_client.jar"); // The class files jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -84,7 +83,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_pluggability_contracts_jta_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } @@ -117,12 +116,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL != null) { jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL != null) { jpa_ee_pluggability_contracts_jta_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/persistence.xml deleted file mode 100644 index 1770ccccd6..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/persistence.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation.PersistenceProvider - jdbc/DB1 - META-INF/myMappingFile1.xml - META-INF/myMappingFile2.xml - jpa_ee_pluggability_contracts_jta.jar - ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order - false - NONE - NONE - - - - - - - com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation.PersistenceProvider - jdbc/DB1 - META-INF/myMappingFile1.xml - META-INF/myMappingFile2.xml - jpa_ee_pluggability_contracts_jta.jar - ee.jakarta.tck.persistence.ee.pluggability.contracts.jta.Order - NONE - NONE - - - - - - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/Client.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/Client.java index 1a86406819..1bdb4815bb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/Client.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/Client.java @@ -23,15 +23,13 @@ import java.util.Map; import java.util.Properties; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - import ee.jakarta.tck.persistence.common.PMClientBase; import ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerFactoryImpl; import ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.EntityManagerImpl; import ee.jakarta.tck.persistence.common.pluggability.util.LogFileProcessor; +import com.sun.ts.lib.harness.Status; + import jakarta.persistence.SharedCacheMode; import jakarta.persistence.ValidationMode; import jakarta.persistence.spi.PersistenceUnitInfo; @@ -56,14 +54,18 @@ public class Client extends PMClientBase { public Client() { } + public static void main(String[] args) { + Client theTests = new Client(); + Status s = theTests.run(args, System.out, System.err); + s.exit(); + } /* * @class.setup_props: log.file.location; */ - @BeforeEach - public void setup() throws Exception { + public void setup(String[] args, Properties props) throws Exception { logTrace( "setup"); - super.setup(); - logProcessor = new LogFileProcessor(); + super.setup(args,props); + logProcessor = new LogFileProcessor(props); if (logProcessor.fetchLog()) { currentSeqNum = logProcessor.getCurrentSequenceNumber(); @@ -80,7 +82,6 @@ public void setup() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test public void createEMF() throws Exception { String expected[] = { LOGMESSAGE_PREFIX + "Called createContainerEntityManagerFactory(PersistenceUnitInfo, Map)" }; @@ -98,7 +99,6 @@ public void createEMF() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test public void getPersistenceProviderClassName() throws Exception { boolean pass1 = false; @@ -129,7 +129,7 @@ public void getPersistenceProviderClassName() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getPersistenceUnitNameTest() throws Exception { boolean pass1 = false; @@ -168,7 +168,7 @@ public void getPersistenceUnitNameTest() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getTransactionType() throws Exception { boolean pass1 = false; @@ -201,7 +201,7 @@ public void getTransactionType() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getManagedClassNames() throws Exception { boolean pass1 = false; List expected = new ArrayList(); @@ -242,7 +242,7 @@ public void getManagedClassNames() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getJarFileUrls() throws Exception { boolean pass1 = false; @@ -280,7 +280,7 @@ public void getJarFileUrls() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getPersistenceUnitRootUrl() throws Exception { boolean pass1 = false; @@ -311,7 +311,7 @@ public void getPersistenceUnitRootUrl() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getPersistenceXMLSchemaVersion() throws Exception { boolean pass1 = false; @@ -342,7 +342,7 @@ public void getPersistenceXMLSchemaVersion() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getProperties() throws Exception { boolean pass1 = true; @@ -402,7 +402,7 @@ public void getProperties() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getSharedCacheMode() throws Exception { boolean pass1 = false; @@ -433,7 +433,7 @@ public void getSharedCacheMode() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getValidationMode() throws Exception { boolean pass1 = false; @@ -463,7 +463,7 @@ public void getValidationMode() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getClassLoader() throws Exception { boolean pass1 = false; getClassObjects(); @@ -491,7 +491,7 @@ public void getClassLoader() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getNewTempClassLoader() throws Exception { boolean pass1 = false; getClassObjects(); @@ -519,7 +519,7 @@ public void getNewTempClassLoader() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getMappingFileNames() throws Exception { boolean pass1 = false; List expected = new ArrayList(); @@ -563,7 +563,7 @@ public void getMappingFileNames() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getNonJtaDataSource() throws Exception { boolean pass1 = false; String expected[] = { LOGMESSAGE_PREFIX + "Called PersistenceUnitInfoImpl.getNonJtaDataSource()" }; @@ -589,7 +589,7 @@ public void getNonJtaDataSource() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void excludeUnlistedClasses() throws Exception { boolean pass1 = false; @@ -617,7 +617,7 @@ public void excludeUnlistedClasses() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void getProviderUtil() throws Exception { String expected[] = { LOGMESSAGE_PREFIX + "Called getProviderUtil()" }; @@ -637,7 +637,7 @@ public void getProviderUtil() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void isLoaded() throws Exception { String expected[] = { LOGMESSAGE_PREFIX + "Called isLoaded()" }; @@ -657,7 +657,7 @@ public void isLoaded() throws Exception { * @test_Strategy: Specify a third Party Persistence Provider through * persistence.xml file */ - @Test + public void isLoadedWithoutReference() throws Exception { String expected[] = { LOGMESSAGE_PREFIX + "Called isLoadedWithoutReference()" }; @@ -678,7 +678,6 @@ public void getClassObjects() { puInfo = emfImpl.puInfo; } - @AfterEach public void cleanup() throws Exception { logTrace( "cleanup"); logTrace( "calling super.cleanup"); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/ClientAppmanagednotxTest.java index 49cc3f8bad..fb6778075c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/ClientAppmanagednotxTest.java @@ -24,7 +24,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("platform") -@Tag("web") @Tag("tck-appclient") public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Client { @@ -53,7 +52,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.ee.plug public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client.jar"); + JavaArchive pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "pluggability_contracts_resource_local_vehicles_client.jar"); // The class files pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -80,7 +79,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { pluggability_contracts_resource_local_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } @@ -113,12 +112,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL != null) { pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL != null) { pluggability_contracts_resource_local_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/ClientPuservletTest.java index 772761d596..dcf9d93c5f 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/ClientPuservletTest.java @@ -79,7 +79,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test pluggability_contracts_resource_local_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { pluggability_contracts_resource_local_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/persistence.xml deleted file mode 100644 index 36d8a622a6..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/persistence.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation.PersistenceProvider - jdbc/DB_no_tx - META-INF/myMappingFile1.xml - META-INF/myMappingFile2.xml - pluggability_contracts_resource_local.jar - ee.jakarta.tck.persistence.ee.pluggability.contracts.resource_local.Order - false - NONE - NONE - - - - - - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/ClientTest.java index f3c9afd77a..4d43d1b0af 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/ClientTest.java @@ -71,7 +71,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive if(resURL != null) { jpa_ee_propagation_am_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_propagation_am_client.addAsManifestResource(new StringAsset("Main-Class: ${package}.Client\n"), "MANIFEST.MF"); + jpa_ee_propagation_am_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_propagation_am_client, Client.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/jpa_ee_propagation_am_client.jar.sun-application-client.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/jpa_ee_propagation_am_client.jar.sun-application-client.xml deleted file mode 100644 index b7f919a017..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/jpa_ee_propagation_am_client.jar.sun-application-client.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - ejb/Stateful3Bean - com_sun_ts_tests_jpa_ee_propagation_am_Stateful3Bean - - - ejb/Stateful3Bean2 - com_sun_ts_tests_jpa_ee_propagation_am_Stateful3Bean2 - - - ejb/Stateless3Bean - com_sun_ts_tests_jpa_ee_propagation_am_Stateless3Bean - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/jpa_ee_propagation_am_ejb.jar.sun-ejb-jar.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/jpa_ee_propagation_am_ejb.jar.sun-ejb-jar.xml deleted file mode 100644 index 3422b4c48e..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/jpa_ee_propagation_am_ejb.jar.sun-ejb-jar.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - Stateful3Bean - com_sun_ts_tests_jpa_ee_propagation_am_Stateful3Bean - - - Stateful3Bean2 - com_sun_ts_tests_jpa_ee_propagation_am_Stateful3Bean2 - - - Stateless3Bean - com_sun_ts_tests_jpa_ee_propagation_am_Stateless3Bean - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/persistence.xml deleted file mode 100644 index 5596d87153..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/am/persistence.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - Persistence Unit for CTS EE Propagation Tests. - If the transaction-type is not specified, - the default is JTA. - - jdbc/DB1 - ee.jakarta.tck.persistence.ee.common.A - ee.jakarta.tck.persistence.ee.common.Account - ee.jakarta.tck.persistence.ee.common.B - ee.jakarta.tck.persistence.ee.propagation.am.Member - - - Persistence Unit for CTS EE Propagation Tests. - If the transaction-type is not specified, - the default is JTA. - - jdbc/DB1 - ee.jakarta.tck.persistence.ee.common.A - ee.jakarta.tck.persistence.ee.common.Account - ee.jakarta.tck.persistence.ee.common.B - ee.jakarta.tck.persistence.ee.propagation.am.Member2 - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/ClientTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/ClientTest.java index f50033b8d4..137a61b582 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/ClientTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/ClientTest.java @@ -69,7 +69,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive if(resURL != null) { jpa_ee_propagation_cm_ext_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_propagation_cm_ext_client.addAsManifestResource(new StringAsset("Main-Class: ${package}.Client\n"), "MANIFEST.MF"); + jpa_ee_propagation_cm_ext_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_propagation_cm_ext_client, Client.class, resURL); diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/jpa_ee_propagation_cm_ext_client.jar.sun-application-client.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/jpa_ee_propagation_cm_ext_client.jar.sun-application-client.xml deleted file mode 100644 index 620f14a449..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/jpa_ee_propagation_cm_ext_client.jar.sun-application-client.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - ejb/Stateful3Bean - com_sun_ts_tests_jpa_ee_propagation_cm_ext_Stateful3Bean - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/jpa_ee_propagation_cm_ext_ejb.jar.sun-ejb-jar.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/jpa_ee_propagation_cm_ext_ejb.jar.sun-ejb-jar.xml deleted file mode 100644 index 9d250b3c71..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/jpa_ee_propagation_cm_ext_ejb.jar.sun-ejb-jar.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - Stateful3Bean - com_sun_ts_tests_jpa_ee_propagation_cm_ext_Stateful3Bean - - - TellerBean - com_sun_ts_tests_jpa_ee_propagation_cm_ext_TellerBean - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/persistence.new.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/persistence.new.xml deleted file mode 100644 index 6b31e77a55..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/persistence.new.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - Persistence Unit for CTS EE Propagation Tests. - If the transaction-type is not specified, - the default is JTA. - jdbc/DB1 - ee.jakarta.tck.persistence.ee.common.A - ee.jakarta.tck.persistence.ee.common.Account - ee.jakarta.tck.persistence.ee.common.B - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/persistence.xml deleted file mode 100644 index 3c1c832767..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/extended/persistence.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - Persistence Unit for CTS EE Propagation Tests. - If the transaction-type is not specified, - the default is JTA. - - jdbc/DB1 - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/application.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/application.xml deleted file mode 100644 index fe75261a26..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/application.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - jpa_ee_propagation_cm_jta_web.war - jpa_ee_propagation_cm_jta_web - - - - jpa_ee_propagation_cm_jta_ejb.jar - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/jpa_ee_propagation_cm_jta_ejb.jar.sun-ejb-jar.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/jpa_ee_propagation_cm_jta_ejb.jar.sun-ejb-jar.xml deleted file mode 100644 index 72732c8a6b..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/jpa_ee_propagation_cm_jta_ejb.jar.sun-ejb-jar.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - 0 - - TellerBean - com_sun_ts_tests_jpa_ee_propagation_cm_jta_TellerBean - - - TellerBean2 - com_sun_ts_tests_jpa_ee_propagation_cm_jta_TellerBean2 - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/jpa_ee_propagation_cm_jta_web.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/jpa_ee_propagation_cm_jta_web.xml deleted file mode 100644 index c95ab47da7..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/jpa_ee_propagation_cm_jta_web.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - ejb3_pkg_integration - - ServletTest - ee.jakarta.tck.persistence.ee.propagation.cm.jta.ServletTest - - - ServletTest - /ServletTest - - - 54 - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/persistence.new.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/persistence.new.xml deleted file mode 100644 index 5262efdfc2..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/persistence.new.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Persistence Unit for CTS EE Package Tests - jdbc/DB1 - ee.jakarta.tck.persistence.ee.common.A - ee.jakarta.tck.persistence.ee.common.Account - ee.jakarta.tck.persistence.ee.common.B - - - Persistence Unit for CTS EE Package Tests - jdbc/DB1 - ee.jakarta.tck.persistence.ee.common.A - ee.jakarta.tck.persistence.ee.common.Account - ee.jakarta.tck.persistence.ee.common.B - - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/persistence.xml b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/persistence.xml deleted file mode 100644 index 252d9a004a..0000000000 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/propagation/cm/jta/persistence.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - Persistence Unit for CTS EE Package Tests - jdbc/DB1 - - - Persistence Unit for CTS EE Package Tests - jdbc/DB1 - - diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagedTest.java index 2c2448be29..89486e6025 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.entitytest. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager_vehicles_client.jar"); // The class files jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmanyFetchEager_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagednotxTest.java index 43fb0da231..df8ffb4e5d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.entityt public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager_vehicles_client.jar"); // The class files jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmanyFetchEager_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPmservletTest.java index 2556c6bd02..7892f31cd4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXmanyFetchEager_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_persist_oneXmanyFetchEager_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPuservletTest.java index f3ed6bcae0..1cdc4ab0ac 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXmanyFetchEager_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_core_et_persist_oneXmanyFetchEager_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateful3Test.java index 28dfc52721..d2a0f25800 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.entitytest.p public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager_vehicles_client.jar"); // The class files jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmanyFetchEager_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateless3Test.java index 18b5d56869..ddc336b09e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/entitytest/persist/oneXmanyFetchEager/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.entitytest. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_client.jar"); + JavaArchive jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_core_et_persist_oneXmanyFetchEager_vehicles_client.jar"); // The class files jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_core_et_persist_oneXmanyFetchEager_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientAppmanagedTest.java index 5fb3b56640..18bb709d1b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -63,7 +62,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.jpa.ee.pack public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_ee_packaging_jar_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_jar_appmanaged_vehicle_client.jar"); + JavaArchive jpa_ee_packaging_jar_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_jar_vehicles_client.jar"); // The class files jpa_ee_packaging_jar_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -90,11 +89,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_packaging_jar_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_packaging_jar_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_packaging_jar_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_ee_packaging_jar_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_jar_appmanaged_vehicle_client, Client.class, resURL); @@ -123,12 +122,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_ee_packaging_jar_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_ee_packaging_jar_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientPmservletTest.java index a012d19c5d..40a6edd420 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientPmservletTest.java @@ -89,7 +89,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_packaging_jar_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_ee_packaging_jar_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } @@ -128,8 +128,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test // The resources - libURL = Client.class.getResource("/persistence.xml"); - jpa_ee_packaging_jar_lib.addAsResource(libURL, "/persistence.xml"); + libURL = Client.class.getResource("persistence.xml"); + jpa_ee_packaging_jar_lib.addAsResource(libURL, "persistence.xml"); libURL = Client.class.getResource("/orm.xml"); jpa_ee_packaging_jar_lib.addAsResource(libURL, "/orm.xml"); libURL = Client.class.getResource("/myMappingFile.xml"); @@ -182,4 +182,4 @@ public void JarFileElementsTest() throws java.lang.Exception { } -} \ No newline at end of file +} diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateful3Test.java index b577230931..21be58bbc6 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -63,7 +62,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.jpa.ee.packa public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_ee_packaging_jar_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_jar_stateful3_vehicle_client.jar"); + JavaArchive jpa_ee_packaging_jar_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_jar_vehicles_client.jar"); // The class files jpa_ee_packaging_jar_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -90,11 +89,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_packaging_jar_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_packaging_jar_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_packaging_jar_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_ee_packaging_jar_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_jar_stateful3_vehicle_client, Client.class, resURL); @@ -123,12 +122,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_ee_packaging_jar_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_ee_packaging_jar_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateless3Test.java index 4bcce58cc1..972cc33842 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -63,7 +62,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.jpa.ee.pack public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_ee_packaging_jar_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_jar_stateless3_vehicle_client.jar"); + JavaArchive jpa_ee_packaging_jar_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_ee_packaging_jar_vehicles_client.jar"); // The class files jpa_ee_packaging_jar_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -90,11 +89,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_ee_packaging_jar_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_ee_packaging_jar_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_ee_packaging_jar_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_ee_packaging_jar_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_ee_packaging_jar_stateless3_vehicle_client, Client.class, resURL); @@ -123,12 +122,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_ee_packaging_jar_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_ee_packaging_jar_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagedTest.java index 05710cdca8..212396dc72 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.jpa22.gener public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_client.jar"); + JavaArchive jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators_vehicles_client.jar"); // The class files jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_generators_tablegenerators_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagednotxTest.java index 6060014d80..178279ca88 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.jpa22.g public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators_vehicles_client.jar"); // The class files jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_generators_tablegenerators_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPmservletTest.java index 29ff77e8cd..c6e22726c7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_generators_tablegenerators_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_generators_tablegenerators_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPuservletTest.java index e889c3490a..7c8add64e3 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_generators_tablegenerators_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_generators_tablegenerators_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateful3Test.java index f44f6d265e..ff650089c7 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.jpa22.genera public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_generators_tablegenerators_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators_stateful3_vehicle_client.jar"); + JavaArchive jpa_jpa22_generators_tablegenerators_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators_vehicles_client.jar"); // The class files jpa_jpa22_generators_tablegenerators_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_generators_tablegenerators_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_generators_tablegenerators_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_generators_tablegenerators_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_generators_tablegenerators_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_generators_tablegenerators_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_generators_tablegenerators_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_generators_tablegenerators_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateless3Test.java index 7620d28d78..bc62b3c885 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/generators/tablegenerators/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.jpa22.gener public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_generators_tablegenerators_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators_stateless3_vehicle_client.jar"); + JavaArchive jpa_jpa22_generators_tablegenerators_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_generators_tablegenerators_vehicles_client.jar"); // The class files jpa_jpa22_generators_tablegenerators_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_generators_tablegenerators_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_generators_tablegenerators_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_generators_tablegenerators_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_generators_tablegenerators_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_generators_tablegenerators_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_generators_tablegenerators_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_generators_tablegenerators_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagedTest.java index cc9d8164c0..ced74164eb 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.jpa22.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_query_stream_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream_appmanaged_vehicle_client.jar"); + JavaArchive jpa_jpa22_query_stream_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream_vehicles_client.jar"); // The class files jpa_jpa22_query_stream_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_query_stream_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_query_stream_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_query_stream_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_query_stream_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_query_stream_appmanaged_vehicle_client, Client.class, resURL); @@ -125,12 +124,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_query_stream_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_query_stream_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagednotxTest.java index 0de6e33466..ab1eca340d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.jpa22.q public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_query_stream_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_jpa22_query_stream_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream_vehicles_client.jar"); // The class files jpa_jpa22_query_stream_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_query_stream_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_query_stream_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_query_stream_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_query_stream_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_query_stream_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -125,12 +124,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_query_stream_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_query_stream_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPmservletTest.java index 38ee84f2ef..3f7e11353d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPmservletTest.java @@ -91,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_query_stream_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_query_stream_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPuservletTest.java index 7e659066aa..3322c36f81 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientPuservletTest.java @@ -91,7 +91,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_query_stream_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_query_stream_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateful3Test.java index f6901057a6..3e93e63900 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.jpa22.query. public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_query_stream_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream_stateful3_vehicle_client.jar"); + JavaArchive jpa_jpa22_query_stream_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream_vehicles_client.jar"); // The class files jpa_jpa22_query_stream_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_query_stream_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_query_stream_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_query_stream_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_query_stream_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_query_stream_stateful3_vehicle_client, Client.class, resURL); @@ -125,12 +124,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_query_stream_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_query_stream_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateless3Test.java index f745fd608a..5b775bed1a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/query/stream/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.jpa22.query public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_query_stream_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream_stateless3_vehicle_client.jar"); + JavaArchive jpa_jpa22_query_stream_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_query_stream_vehicles_client.jar"); // The class files jpa_jpa22_query_stream_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_query_stream_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_query_stream_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_query_stream_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_query_stream_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_query_stream_stateless3_vehicle_client, Client.class, resURL); @@ -125,12 +124,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_query_stream_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_query_stream_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagedTest.java index d361fce155..54573778dd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.jpa22.repea public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_attroverride_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagednotxTest.java index 23a5ac0eba..bc9f02a00e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.jpa22.r public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_attroverride_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPmservletTest.java index c68bc18fcd..5cc154d52c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_attroverride_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_attroverride_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPuservletTest.java index a83e5c6d3f..2a7f126d5a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_attroverride_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_attroverride_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateful3Test.java index 1bde1f70ee..0ec5d8e4b5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.jpa22.repeat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_attroverride_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride_stateful3_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_attroverride_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_attroverride_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_attroverride_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_attroverride_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_attroverride_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_attroverride_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_attroverride_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_attroverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_attroverride_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateless3Test.java index 3bc0acb512..554791761e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/attroverride/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.jpa22.repea public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_attroverride_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride_stateless3_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_attroverride_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_attroverride_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_attroverride_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_attroverride_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_attroverride_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_attroverride_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_attroverride_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_attroverride_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_attroverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_attroverride_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientAppmanagednotxTest.java index 53270c4984..4aafd7eeb9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.jpa22.r public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_converts_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -87,11 +86,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -120,12 +119,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_converts_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPmservletTest.java index d44131e62e..376dedfe1d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPmservletTest.java @@ -86,7 +86,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_converts_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_converts_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPuservletTest.java index 047c3d2ab1..0c6ffe77fc 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientPuservletTest.java @@ -86,7 +86,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_converts_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_converts_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientStateless3Test.java index 9719b83d15..9e6a272197 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/convert/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -60,7 +59,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.jpa22.repea public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_converts_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_converts_stateless3_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_converts_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_converts_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_converts_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -87,11 +86,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_converts_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_converts_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_converts_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_converts_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_converts_stateless3_vehicle_client, Client.class, resURL); @@ -120,12 +119,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_converts_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_converts_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagedTest.java index e90fff442a..585e3774bf 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.jpa22.repea public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_joincolumns_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagednotxTest.java index 1a4117207e..52189d3cc5 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.jpa22.r public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_joincolumns_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPmservletTest.java index c98ddc4751..e7331cbcc2 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_joincolumns_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_joincolumns_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPuservletTest.java index b6099dc0ef..357f103705 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_joincolumns_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_joincolumns_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateful3Test.java index 09df8947a1..e57ddb7015 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.jpa22.repeat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_joincolumns_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateless3Test.java index f9c6149434..82dcc582d9 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/joincolumn/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.jpa22.repea public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_joincolumns_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_joincolumns_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagedTest.java index 30b7722ab0..93ac431147 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.jpa22.repea public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagednotxTest.java index 5a282f8cda..bdf433230c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.jpa22.r public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPmservletTest.java index 74bb6a0370..bd4ea49cf4 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_mapkeyjoincolumn_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPuservletTest.java index 3ff7fd2841..353fbc9a6e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_mapkeyjoincolumn_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateful3Test.java index f570eee274..90ecf30843 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.jpa22.repeat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateless3Test.java index 0876883ced..ac0b5edd6a 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/mapkeyjoincolumn/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.jpa22.repea public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_mapkeyjoincolumn_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_mapkeyjoincolumn_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagedTest.java index 1c919f13a2..67fb151efd 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.jpa22.repea public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedentitygraph_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagednotxTest.java index ef47b7e6c2..45ad82d7de 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.jpa22.r public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedentitygraph_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPmservletTest.java index 1ee29f274d..e1fcb93958 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namedentitygraph_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_namedentitygraph_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPuservletTest.java index 1f5f966820..f9d089297d 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namedentitygraph_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_namedentitygraph_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateful3Test.java index 66a154262b..303f9835ae 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.jpa22.repeat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedentitygraph_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateless3Test.java index 7a60115a69..04fbeabf65 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.jpa22.repea public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedentitygraph_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedentitygraph_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagedTest.java index 57e06e4974..016029b074 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.jpa22.repea public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namednativequery_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagednotxTest.java index d3262e0f14..b6f2972d9c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.jpa22.r public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namednativequery_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPmservletTest.java index 710aa97364..3d71c612c1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namednativequery_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_namednativequery_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPuservletTest.java index 8fbb7368b2..abc2b17b25 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namednativequery_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_namednativequery_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateful3Test.java index 31ae439c0f..ad5265011c 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.jpa22.repeat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namednativequery_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateless3Test.java index 2dc361f7fa..cf362dd4b1 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namednativequery/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.jpa22.repea public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namednativequery_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namednativequery_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagedTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagedTest.java index f820fb0c1d..cdc294eea0 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagedTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagedTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagedTest extends ee.jakarta.tck.persistence.jpa22.repea public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedstoredprocedure_appmanaged_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagednotxTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagednotxTest.java index 3f38360bee..37185a861b 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagednotxTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientAppmanagednotxTest.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientAppmanagednotxTest extends ee.jakarta.tck.persistence.jpa22.r public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.appmanagedNoTx.AppManagedNoTxVehicleBean.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedstoredprocedure_appmanagedNoTx_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPmservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPmservletTest.java index 38286c9e17..c27ac36d2e 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPmservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPmservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namedstoredprocedure_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/pmservlet/pmservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_namedstoredprocedure_pmservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPuservletTest.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPuservletTest.java index 6771366921..e35e18b1de 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPuservletTest.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientPuservletTest.java @@ -90,7 +90,7 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namedstoredprocedure_puservlet_vehicle_web.addAsWebInfResource(warResURL, "web.xml"); } // The sun-web.xml descriptor - warResURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); + warResURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/puservlet/puservlet_vehicle_web.war.sun-web.xml"); if(warResURL != null) { jpa_jpa22_repeatable_namedstoredprocedure_puservlet_vehicle_web.addAsWebInfResource(warResURL, "sun-web.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateful3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateful3Test.java index cad2b86b90..76e3b68c76 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateful3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateful3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateful3Test extends ee.jakarta.tck.persistence.jpa22.repeat public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedstoredprocedure_stateful3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateless3Test.java b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateless3Test.java index 2250f09eb0..3933201d57 100644 --- a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateless3Test.java +++ b/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/ClientStateless3Test.java @@ -27,7 +27,6 @@ @ExtendWith(ArquillianExtension.class) @Tag("persistence") @Tag("platform") -@Tag("web") @Tag("tck-appclient") @TestMethodOrder(MethodOrderer.MethodName.class) @@ -64,7 +63,7 @@ public class ClientStateless3Test extends ee.jakarta.tck.persistence.jpa22.repea public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) { // Client // the jar with the correct archive name - JavaArchive jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_client.jar"); + JavaArchive jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_client = ShrinkWrap.create(JavaArchive.class, "jpa_jpa22_repeatable_namedstoredprocedure_vehicles_client.jar"); // The class files jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_client.addClasses( com.sun.ts.tests.common.vehicle.VehicleRunnerFactory.class, @@ -91,11 +90,11 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } // The sun-application-client.xml file need to be added or should this be in in the vendor Arquillian extension? - resURL = Client.class.getResource("//com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); + resURL = Client.class.getResource("/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.jar.sun-application-client.xml"); if(resURL != null) { jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_client.addAsManifestResource(resURL, "application-client.xml"); } - jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: com.sun.ts.tests.common.vehicle.VehicleClient\n"), "MANIFEST.MF"); + jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_client.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // Call the archive processor archiveProcessor.processClientArchive(jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_client, Client.class, resURL); @@ -124,12 +123,12 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test com.sun.ts.tests.common.vehicle.ejb3share.NoopTransactionWrapper.class ); // The ejb-jar.xml descriptor - URL ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.xml"); + URL ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "ejb-jar.xml"); } // The sun-ejb-jar.xml file - ejbResURL1 = Client.class.getResource("//vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); + ejbResURL1 = Client.class.getResource("/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml"); if(ejbResURL1 != null) { jpa_jpa22_repeatable_namedstoredprocedure_stateless3_vehicle_ejb.addAsManifestResource(ejbResURL1, "sun-ejb-jar.xml"); } diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/persistence.xml b/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/entityManager/persistence.xml similarity index 100% rename from jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManager/persistence.xml rename to jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/entityManager/persistence.xml diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/persistence.xml b/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/entityManagerFactory/persistence.xml similarity index 100% rename from jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/entityManagerFactory/persistence.xml rename to jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/entityManagerFactory/persistence.xml diff --git a/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/persistence.xml b/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/persistence.xml index 1770ccccd6..b2febc8429 100644 --- a/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/persistence.xml +++ b/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/pluggability/contracts/jta/persistence.xml @@ -23,7 +23,7 @@ https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd" version="3.2"> - com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation.PersistenceProvider + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider jdbc/DB1 META-INF/myMappingFile1.xml META-INF/myMappingFile2.xml @@ -38,7 +38,7 @@ - com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation.PersistenceProvider + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider jdbc/DB1 META-INF/myMappingFile1.xml META-INF/myMappingFile2.xml diff --git a/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/persistence.xml b/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/persistence.xml index 36d8a622a6..14052d76d3 100644 --- a/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/persistence.xml +++ b/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/pluggability/contracts/resource_local/persistence.xml @@ -23,7 +23,7 @@ https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd" version="3.2"> - com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation.PersistenceProvider + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider jdbc/DB_no_tx META-INF/myMappingFile1.xml META-INF/myMappingFile2.xml diff --git a/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/propagation/cm/extended/persistence.xml b/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/propagation/cm/extended/persistence.xml index 3c1c832767..6b31e77a55 100644 --- a/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/propagation/cm/extended/persistence.xml +++ b/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/propagation/cm/extended/persistence.xml @@ -16,17 +16,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 --> - - - - Persistence Unit for CTS EE Propagation Tests. + + + Persistence Unit for CTS EE Propagation Tests. If the transaction-type is not specified, - the default is JTA. - - jdbc/DB1 - + the default is JTA. + jdbc/DB1 + ee.jakarta.tck.persistence.ee.common.A + ee.jakarta.tck.persistence.ee.common.Account + ee.jakarta.tck.persistence.ee.common.B + + diff --git a/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/propagation/cm/jta/persistence.xml b/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/propagation/cm/jta/persistence.xml index 252d9a004a..5262efdfc2 100644 --- a/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/propagation/cm/jta/persistence.xml +++ b/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/ee/propagation/cm/jta/persistence.xml @@ -16,18 +16,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 --> - - - - Persistence Unit for CTS EE Package Tests - jdbc/DB1 - - - Persistence Unit for CTS EE Package Tests - jdbc/DB1 - + + + Persistence Unit for CTS EE Package Tests + jdbc/DB1 + ee.jakarta.tck.persistence.ee.common.A + ee.jakarta.tck.persistence.ee.common.Account + ee.jakarta.tck.persistence.ee.common.B + + + Persistence Unit for CTS EE Package Tests + jdbc/DB1 + ee.jakarta.tck.persistence.ee.common.A + ee.jakarta.tck.persistence.ee.common.Account + ee.jakarta.tck.persistence.ee.common.B + + diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/persistence.xml b/jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/persistence.xml similarity index 100% rename from jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/persistence.xml rename to jpa/platform-tests/src/main/resources/ee/jakarta/tck/persistence/jpa/ee/packaging/jar/persistence.xml diff --git a/jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/persistence.new.xml b/jpa/platform-tests/src/main/resources/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/persistence.xml similarity index 100% rename from jpa/platform-tests/src/main/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/persistence.new.xml rename to jpa/platform-tests/src/main/resources/java/ee/jakarta/tck/persistence/ee/packaging/web/standalone/persistence.xml diff --git a/jpa/spec-tests/pom.xml b/jpa/spec-tests/pom.xml index 17625d94a1..8eed8581aa 100644 --- a/jpa/spec-tests/pom.xml +++ b/jpa/spec-tests/pom.xml @@ -46,6 +46,12 @@ src/main/resources + + **/*.xml + **/*.map + **/*.txt + **/*.sig* + diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1.java index 0adfdee127..2269e20e04 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client1.java @@ -59,7 +59,7 @@ public void setup(String[] args, Properties p) throws Exception { super.setup(args,p); removeTestData(); createEmployeeTestData(); - dataBaseName = System.getProperty("jdbc.db"); + dataBaseName = p.getProperty("jdbc.db"); } public static void main(String[] args) { diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2.java index d9b3b44ab0..f9a77fba61 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client2.java @@ -57,7 +57,7 @@ public void setup(String[] args, Properties p) throws Exception { super.setup(args,p); removeTestData(); createEmployee2TestData(); - dataBaseName = System.getProperty("jdbc.db"); + dataBaseName = p.getProperty("jdbc.db"); } catch (Exception e) { logErr( "Exception: ", e); throw new Exception("Setup failed:", e); diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2.java index c6306cf0b7..846e39a119 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client2.java @@ -9,8 +9,8 @@ public class Client2 extends Client { - public void setup2(String[] args, Properties p) throws Exception { - logTrace( "setup2"); + public void setup(String[] args, Properties p) throws Exception { + logTrace( "setup"); try { super.setup(args,p); removeTestData(); diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3.java index 009d63df0e..750112adb7 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client3.java @@ -5,8 +5,8 @@ public class Client3 extends Client { - public void setup3(String[] args, Properties p) throws Exception { - logTrace( "setup3"); + public void setup(String[] args, Properties p) throws Exception { + logTrace( "setup"); try { super.setup(args,p); diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4.java index ded72f9b8d..da15f1d0d7 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/field/Client4.java @@ -9,8 +9,8 @@ public class Client4 extends Client { - public void setup4(String[] args, Properties p) throws Exception { - logTrace( "setup3"); + public void setup(String[] args, Properties p) throws Exception { + logTrace( "setup"); try { super.setup(args,p); diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2.java index 864b870881..9384943ca4 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/access/property/Client2.java @@ -4,8 +4,8 @@ public class Client2 extends Client { - public void setup2(String[] args, Properties p) throws Exception { - logTrace( "setup2"); + public void setup(String[] args, Properties p) throws Exception { + logTrace( "setup"); try { super.setup(args,p); @@ -36,7 +36,7 @@ public void transientTest() throws Exception { clearCache(); d1 = null; d1 = getEntityManager().find(DataTypes.class, 1); - logMsg( "d1.toString():" + d1.toString()); + logMsg( "d1.toString():" + d1); if (null != d1) { if (d1.getShouldNotPersist() == null) { diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1.java index 45fc21013b..a32f247eef 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/mapkey/Client1.java @@ -39,7 +39,7 @@ public static void main(String[] args) { s.exit(); } - public void setupCreateTestData(String args[], Properties p) throws Exception { + public void setup(String args[], Properties p) throws Exception { logTrace( "setup"); try { super.setup(args,p); diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2.java index 14fcd8d7ff..d470f1685d 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client2.java @@ -41,7 +41,7 @@ public static void main(String[] args) { } public void setup(String[] args, Properties p) throws Exception { - logTrace( "setup2"); + logTrace( "setup"); try { super.setup(args,p); diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3.java index e1d85f6dda..d7795514fd 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client3.java @@ -36,7 +36,7 @@ public static void main(String[] args) { } public void setup(String[] args, Properties p) throws Exception { - logTrace( "setup3"); + logTrace( "setup"); try { super.setup(args,p); diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4.java index fa9e73e094..46b08eb563 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/tableGenerator/Client4.java @@ -37,8 +37,8 @@ public static void main(String[] args) { } - public void setup4(String[] args, Properties p) throws Exception { - logTrace( "setup4"); + public void setup(String[] args, Properties p) throws Exception { + logTrace( "setup"); try { super.setup(args,p); diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/persistence_ee.xml b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/persistence.xml similarity index 100% rename from jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/persistence_ee.xml rename to jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/cache/basicTests/persistence.xml diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5.java index 596438738f..2880cf0042 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/CriteriaQuery/Client5.java @@ -907,71 +907,85 @@ public void ShortOperandResultTypeTests() throws Exception { throw new Exception("ShortOperandResultTypeTests failed"); } - public void createATestData() { - try { - getEntityTransaction().begin(); - final Integer integer = 1234; - final short basicShort = 12; - final Short basicBigShort = basicShort; - final float basicFloat = 12.3f; - final Float basicBigFloat = basicFloat; - final long basicLong = 1234l; - final Long basicBigLong = basicLong; - final double basicDouble = 1234.5; - final Double basicBigDouble = basicDouble; - final char[] charArray = { 'a', 'b', 'c' }; - final Character[] bigCharacterArray = { 'a', 'b', 'c' }; - final byte[] byteArray = "abc".getBytes(); - final Byte[] bigByteArray = { (byte) 111, (byte) 101, (byte) 100 }; - final BigInteger bigInteger = new BigInteger("12345"); - final BigDecimal bigDecimal = new BigDecimal(bigInteger); - final Date date = new Date(); - final long timeInSeconds = date.getTime(); - final Time time = new Time(timeInSeconds); - final Timestamp timeStamp = new Timestamp(timeInSeconds); - final Calendar calendar = Calendar.getInstance(); - - A aRef = new A("9", null, 9, integer, basicShort, basicBigShort, basicFloat, basicBigFloat, basicLong, - basicBigLong, basicDouble, basicBigDouble, 'a', charArray, bigCharacterArray, byteArray, - bigByteArray, bigInteger, bigDecimal, date, time, timeStamp, calendar); - - getEntityManager().persist(aRef); - getEntityManager().flush(); - getEntityTransaction().commit(); - - } catch (Exception e) { - logErr( "Unexpected Exception in createTestData:", e); - } finally { - try { - if (getEntityTransaction().isActive()) { - getEntityTransaction().rollback(); - } - } catch (Exception re) { - logErr( "Unexpected Exception during Rollback:", re); - } - } - - } + public void setupAData(String[] args, Properties p) throws Exception { + logTrace("setupData"); + try { + super.setup(args, p); + removeATestData(); + createATestData(); + } catch (Exception e) { + throw new Exception("Setup failed:", e); + } + } private void removeATestData() { - logTrace( "removeTestData"); - if (getEntityTransaction().isActive()) { - getEntityTransaction().rollback(); - } - try { - getEntityTransaction().begin(); - getEntityManager().createNativeQuery("DELETE FROM A_BASIC").executeUpdate(); - getEntityTransaction().commit(); - } catch (Exception e) { - logErr( "Exception encountered while removing entities:", e); - } finally { - try { - if (getEntityTransaction().isActive()) { - getEntityTransaction().rollback(); - } - } catch (Exception re) { - logErr( "Unexpected Exception in removeTestData:", re); - } - } - } + logTrace("removeTestData"); + if (getEntityTransaction().isActive()) { + getEntityTransaction().rollback(); + } + try { + getEntityTransaction().begin(); + getEntityManager().createNativeQuery("DELETE FROM A_BASIC") + .executeUpdate(); + getEntityTransaction().commit(); + } catch (Exception e) { + logErr("Exception encountered while removing entities:", e); + } finally { + try { + if (getEntityTransaction().isActive()) { + getEntityTransaction().rollback(); + } + } catch (Exception re) { + logErr("Unexpected Exception in removeTestData:", re); + } + } + } + public void createATestData() { + try { + getEntityTransaction().begin(); + final Integer integer = 1234; + final short basicShort = 12; + final Short basicBigShort = basicShort; + final float basicFloat = 12.3f; + final Float basicBigFloat = basicFloat; + final long basicLong = 1234l; + final Long basicBigLong = basicLong; + final double basicDouble = 1234.5; + final Double basicBigDouble = basicDouble; + final char[] charArray = { 'a', 'b', 'c' }; + final Character[] bigCharacterArray = { 'a', 'b', 'c' }; + final byte[] byteArray = "abc".getBytes(); + final Byte[] bigByteArray = { (byte) 111, (byte) 101, (byte) 100 }; + final BigInteger bigInteger = new BigInteger("12345"); + final BigDecimal bigDecimal = new BigDecimal(bigInteger); + final Date date = new Date(); + final long timeInSeconds = date.getTime(); + final Time time = new Time(timeInSeconds); + final Timestamp timeStamp = new Timestamp(timeInSeconds); + final Calendar calendar = Calendar.getInstance(); + + A aRef = new A("9", null, 9, integer, basicShort, basicBigShort, + basicFloat, basicBigFloat, basicLong, basicBigLong, basicDouble, + basicBigDouble, 'a', charArray, bigCharacterArray, byteArray, + bigByteArray, bigInteger, bigDecimal, date, time, timeStamp, + calendar); + + getEntityManager().persist(aRef); + getEntityManager().flush(); + getEntityTransaction().commit(); + + } catch (Exception e) { + logErr("Unexpected Exception in createTestData:", e); + } finally { + try { + if (getEntityTransaction().isActive()) { + getEntityTransaction().rollback(); + } + } catch (Exception re) { + logErr("Unexpected Exception during Rollback:", re); + } + } + + } + } diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client.java index 00e7ab7502..52fa89e732 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/criteriaapi/parameter/Client.java @@ -21,6 +21,8 @@ +import java.util.Properties; + import ee.jakarta.tck.persistence.common.PMClientBase; public abstract class Client extends PMClientBase { @@ -78,6 +80,18 @@ protected void createTestData() { } } + public void setupEmployee(String[] args, Properties p) throws Exception { + logTrace("setupEmployee"); + try { + super.setup(args, p); + removeTestData(); + createTestData(); + } catch (Exception e) { + logErr("Exception: ", e); + throw new Exception("setupEmployee failed:", e); + } + } + protected void removeTestData() { logTrace( "removeTestData"); if (getEntityTransaction().isActive()) { diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1.java index 02bd16a093..bbf78f4032 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client1.java @@ -86,7 +86,7 @@ public void setup(String[] args, Properties p) throws Exception { map.putAll(getEntityManager().getProperties()); map.put("foo", "bar"); displayMap(map); - dataBaseName = System.getProperty("jdbc.db"); + dataBaseName = p.getProperty("jdbc.db"); } catch (Exception e) { logErr( "Exception: ", e); throw new Exception("Setup failed:", e); diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2.java index 230aa4cc7d..d3fc0d4507 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client2.java @@ -79,7 +79,7 @@ public void setupOrderData(String[] args, Properties p) throws Exception { map.putAll(getEntityManager().getProperties()); map.put("foo", "bar"); displayMap(map); - dataBaseName = System.getProperty("jdbc.db"); + dataBaseName = p.getProperty("jdbc.db"); } catch (Exception e) { logErr( "Exception: ", e); throw new Exception("Setup failed:", e); @@ -95,6 +95,13 @@ public void cleanup() throws Exception { } } + public void cleanupData() throws Exception { + logTrace("Cleanup data"); + removeTestData(); + cleanup(); + } + + public List getResultSetsFromStoredProcedure(StoredProcedureQuery spq) { logTrace( "in getResultSetsFromStoredProcedure"); boolean results = true; diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3.java index 4a36488a6c..ecd6faa3bf 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager/Client3.java @@ -71,7 +71,7 @@ public void setup(String[] args, Properties p) throws Exception { map.putAll(getEntityManager().getProperties()); map.put("foo", "bar"); displayMap(map); - dataBaseName = System.getProperty("jdbc.db"); + dataBaseName = p.getProperty("jdbc.db"); } catch (Exception e) { logErr( "Exception: ", e); throw new Exception("Setup failed:", e); @@ -82,7 +82,7 @@ public void cleanup() throws Exception { try { logTrace( "Cleanup data"); removeTestData(); - cleanup(); + super.cleanup(); } finally { } diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1.java index 7fc3ac000c..de7c69a458 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client1.java @@ -79,7 +79,7 @@ public void setup(String[] args, Properties p) throws Exception { map.putAll(getEntityManager().getProperties()); map.put("foo", "bar"); displayMap(map); - dataBaseName = System.getProperty("jdbc.db"); + dataBaseName = p.getProperty("jdbc.db"); } catch (Exception e) { logErr( "Exception: ", e); throw new Exception("Setup failed:", e); diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2.java index bda806521b..5256ed194f 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client2.java @@ -69,7 +69,7 @@ public void setup(String[] args, Properties p) throws Exception { map.putAll(getEntityManager().getProperties()); map.put("foo", "bar"); displayMap(map); - dataBaseName = System.getProperty("jdbc.db"); + dataBaseName = p.getProperty("jdbc.db"); } catch (Exception e) { logErr( "Exception: ", e); throw new Exception("Setup failed:", e); @@ -81,7 +81,7 @@ public void cleanup() throws Exception { try { logTrace( "Cleanup data"); removeTestData(); - cleanup(); + super.cleanup(); } finally { } diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client3.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client3.java index 9be088a29b..b2bb0ffddb 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client3.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/entityManager2/Client3.java @@ -68,7 +68,7 @@ public void setup(String[] args, Properties p) throws Exception { map.putAll(getEntityManager().getProperties()); map.put("foo", "bar"); displayMap(map); - dataBaseName = System.getProperty("jdbc.db"); + dataBaseName = p.getProperty("jdbc.db"); } catch (Exception e) { logErr( "Exception: ", e); throw new Exception("Setup failed:", e); @@ -80,7 +80,7 @@ public void cleanup() throws Exception { try { logTrace( "Cleanup data"); removeTestData(); - cleanup(); + super.cleanup(); } finally { } diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/Client.java index fabf6303bb..77db1fcb5d 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/Client.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedentitygraph/Client.java @@ -62,7 +62,7 @@ public void cleanup() throws Exception { try { logTrace( "Cleanup data"); removeTestData(); - cleanup(); + super.cleanup(); } finally { } diff --git a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/Client.java b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/Client.java index 2809c7c55d..0dfdf81e76 100644 --- a/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/Client.java +++ b/jpa/spec-tests/src/main/java/ee/jakarta/tck/persistence/jpa22/repeatable/namedstoredprocedurequery/Client.java @@ -72,18 +72,18 @@ public void setup(String[] args, Properties p) throws Exception { map.putAll(getEntityManager().getProperties()); map.put("foo", "bar"); displayMap(map); - dataBaseName = System.getProperty("jdbc.db"); + dataBaseName = p.getProperty("jdbc.db"); } catch (Exception e) { logErr( "Exception: ", e); throw new Exception("Setup failed:", e); } } - public void cleanupData() throws Exception { + public void cleanup() throws Exception { try { logTrace( "Cleanup data"); removeTestData(); - cleanup(); + super.cleanup(); } finally { } diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml b/jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml similarity index 100% rename from common/src/main/java/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml rename to jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_client.xml diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml b/jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml similarity index 100% rename from common/src/main/java/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml rename to jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/appmanaged/appmanaged_vehicle_ejb.jar.sun-ejb-jar.xml diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml b/jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml similarity index 100% rename from common/src/main/java/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml rename to jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_client.xml diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml b/jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml similarity index 100% rename from common/src/main/java/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml rename to jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/appmanagedNoTx/appmanagedNoTx_vehicle_ejb.jar.sun-ejb-jar.xml diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml b/jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml similarity index 100% rename from common/src/main/java/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml rename to jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_client.xml diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml b/jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml similarity index 100% rename from common/src/main/java/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml rename to jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/stateful3/stateful3_vehicle_ejb.jar.sun-ejb-jar.xml diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml b/jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml similarity index 100% rename from common/src/main/java/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml rename to jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_client.xml diff --git a/common/src/main/java/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml b/jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml similarity index 100% rename from common/src/main/java/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml rename to jpa/spec-tests/src/main/resources/com/sun/ts/tests/common/vehicle/stateless3/stateless3_vehicle_ejb.jar.sun-ejb-jar.xml diff --git a/jpa/spec-tests/src/main/resources/ee/jakarta/tck/persistence/core/cache/basicTests/persistence_ee.xml b/jpa/spec-tests/src/main/resources/ee/jakarta/tck/persistence/core/cache/basicTests/persistence.xml similarity index 100% rename from jpa/spec-tests/src/main/resources/ee/jakarta/tck/persistence/core/cache/basicTests/persistence_ee.xml rename to jpa/spec-tests/src/main/resources/ee/jakarta/tck/persistence/core/cache/basicTests/persistence.xml diff --git a/jpa/spec-tests/src/main/resources/ee/jakarta/tck/persistence/se/pluggability/contracts/resource_local/persistence.xml b/jpa/spec-tests/src/main/resources/ee/jakarta/tck/persistence/se/pluggability/contracts/resource_local/persistence.xml index 8ec00f0b1e..5606f4dddb 100644 --- a/jpa/spec-tests/src/main/resources/ee/jakarta/tck/persistence/se/pluggability/contracts/resource_local/persistence.xml +++ b/jpa/spec-tests/src/main/resources/ee/jakarta/tck/persistence/se/pluggability/contracts/resource_local/persistence.xml @@ -23,7 +23,7 @@ https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd" version="3.2"> - com.sun.ts.tests.jpa.common.pluggability.altprovider.implementation.PersistenceProvider + ee.jakarta.tck.persistence.common.pluggability.altprovider.implementation.PersistenceProvider diff --git a/sql/derby/derby.ddl.persistence.sql b/sql/derby/derby.ddl.persistence.sql index e8aeea0e28..b174fb6f79 100644 --- a/sql/derby/derby.ddl.persistence.sql +++ b/sql/derby/derby.ddl.persistence.sql @@ -927,7 +927,7 @@ DROP SEQUENCE SEQGENERATOR RESTRICT; CREATE SEQUENCE SEQGENERATOR AS INT START WITH 10; DROP TABLE UUIDTYPE; -CREATE TABLE UUIDTYPE (ID VARCHAR(96) NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID)); +CREATE TABLE UUIDTYPE (ID char(16) for bit data NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID)); DROP TABLE CRITERIA_TEST_COLTABLE; DROP TABLE CRITERIA_TEST_TABLE; @@ -935,4 +935,4 @@ CREATE TABLE CRITERIA_TEST_TABLE (ID INTEGER PRIMARY KEY NOT NULL, DATE_VAL DATE CREATE TABLE CRITERIA_TEST_COLTABLE(ENT_ID INTEGER NOT NULL, COLVAL VARCHAR(255), CONSTRAINT FK_CRITERIA_TEST_COLTABLE_ENT_ID FOREIGN KEY (ENT_ID) REFERENCES CRITERIA_TEST_TABLE (ID)); DROP SEQUENCE DATATYPES_SEQ RESTRICT; -CREATE SEQUENCE DATATYPES_SEQ START WITH 1 INCREMENT by 50; \ No newline at end of file +CREATE SEQUENCE DATATYPES_SEQ START WITH 1 INCREMENT by 50; diff --git a/sql/derby/derby.dml.sql b/sql/derby/derby.dml.sql index f1ccdae780..5ae5ad4be4 100644 --- a/sql/derby/derby.dml.sql +++ b/sql/derby/derby.dml.sql @@ -18,7 +18,7 @@ Dbschema_Concur_Delete=delete from concurrencetable # SQL Statements for creating procedures in side the test. #****************************************************************** -UpdCoffee_Proc=create method alias UpdCoffee_Proc for com.sun.ts.lib.tests.jdbc.CS_Procs.UpdCoffee_Proc +UpdCoffee_Proc=create method alias UpdCoffee_Proc for ee.jakarta.tck.persistence.storedprocedures.CS_Procs.UpdCoffee_Proc #****************************************************************** # SQL Statements for deleting tables for appropriate JDBC Datatypes