fix test failures/errors - add missing classes to deployables - uncomment test execute code

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/common/client/JaxrsCommonClient.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/common/client/JaxrsCommonClient.java
index b16bda8..45bb604 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/common/client/JaxrsCommonClient.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/common/client/JaxrsCommonClient.java

@@ -241,12 +241,13 @@
     clients.clear();
   }
 
-  /*public void setup(String[] args, Properties p) {
-    super.setup(args, p);
-    String property = System.getProperty("cts.tmp");
+  //public void setup(String[] args, Properties p) {
+  public void setup() {
+    super.setup();
+    String property = System.getProperty("cts.tmp", "/tmp");
     if (property != null)
       System.setProperty("java.io.tmpdir", property);
-  }*/
+  }
 
   protected JaxrsWebTestCase getTestCase() {
     if (testCase == null || isTestCaseAfterInvocation) {

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/common/client/JaxrsWebTestCase.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/common/client/JaxrsWebTestCase.java
index 82cb16c..da512c2 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/common/client/JaxrsWebTestCase.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/common/client/JaxrsWebTestCase.java

@@ -180,45 +180,45 @@
     }
   }
 
-  // /**
-  //  * Executes the test case.
-  //  * 
-  //  * @throws TestFailureException
-  //  *           if the test fails for any reason.
-  //  * @throws IllegalStateException
-  //  *           if no request was configured or if no Validator is available at
-  //  *           runtime.
-  //  */
-  // public void execute() throws TestFailureException {
-  //   verifyValidationStrategy();
-  //   verifySettings();
-  //   try {
-  //     String url = logClientRequestAndGetUrl();
+  /**
+   * Executes the test case.
+   * 
+   * @throws TestFailureException
+   *           if the test fails for any reason.
+   * @throws IllegalStateException
+   *           if no request was configured or if no Validator is available at
+   *           runtime.
+   */
+  public void execute() throws TestFailureException {
+    verifyValidationStrategy();
+    verifySettings();
+    try {
+      String url = logClientRequestAndGetUrl();
 
-  //     client = getClientWithRegisteredProviders();
-  //     WebTarget target = client.target(url.toString());
-  //     Invocation i = buildRequest(target);
-  //     response = invoke(i);
-  //     if (bufferEntity)
-  //       response.bufferEntity();
-  //   } catch (Throwable t) {
-  //     String message = t.getMessage();
+      client = getClientWithRegisteredProviders();
+      WebTarget target = client.target(url.toString());
+      Invocation i = buildRequest(target);
+      response = invoke(i);
+      if (bufferEntity)
+        response.bufferEntity();
+    } catch (Throwable t) {
+      String message = t.getMessage();
 
-  //     StringBuilder sb = new StringBuilder();
-  //     sb.append("[FATAL] Unexpected failure during test execution.\n");
-  //     // print client call code to report into JIRA when needed
-  //     sb.append(printClientCall().toString());
-  //     // Inherited message
-  //     sb.append((message == null ? t.toString() : message));
+      StringBuilder sb = new StringBuilder();
+      sb.append("[FATAL] Unexpected failure during test execution.\n");
+      // print client call code to report into JIRA when needed
+      sb.append(printClientCall().toString());
+      // Inherited message
+      sb.append((message == null ? t.toString() : message));
 
-  //     throw new TestFailureException(sb.toString(), t);
-  //   }
+      throw new TestFailureException(sb.toString(), t);
+    }
 
-  //   // Validate this test case instance
-  //   if (!strategy.validate(this)) {
-  //     throw new TestFailureException("Test FAILED!");
-  //   }
-  // }
+    // Validate this test case instance
+    if (!strategy.validate(this)) {
+      throw new TestFailureException("Test FAILED!");
+    }
+  }
 
   public void closeClient() {
     if (client != null)
@@ -247,19 +247,19 @@
       throw new TestFailureException("No resource url request set");
   }
 
-  // /**
-  //  * @return Client with all providers already registered
-  //  */
-  // protected Client getClientWithRegisteredProviders() {
-  //   Client client = ClientBuilder.newClient();
-  //   client.register(new JdkLoggingFilter(isPrintedEntity()));
-  //   for (Object o : providersToRegister)
-  //     if (o instanceof Class)
-  //       client.register((Class<?>) o); // otherwise it does not work
-  //     else
-  //       client.register(o);
-  //   return client;
-  // }
+  /**
+   * @return Client with all providers already registered
+   */
+  protected Client getClientWithRegisteredProviders() {
+    Client client = ClientBuilder.newClient();
+    client.register(new JdkLoggingFilter(isPrintedEntity()));
+    for (Object o : providersToRegister)
+      if (o instanceof Class)
+        client.register((Class<?>) o); // otherwise it does not work
+      else
+        client.register(o);
+    return client;
+  }
 
   protected String logClientRequestAndGetUrl() {
     StringBuilder url = new StringBuilder();

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/client/typedentities/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/client/typedentities/JAXRSClientIT.java
index b8508f4..4d3cee8 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/client/typedentities/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/client/typedentities/JAXRSClientIT.java

@@ -77,7 +77,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/client/typedentities/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_client_typedentities_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class, EntityMessageReader.class, EntityMessageWriter.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, EntityMessageReader.class, EntityMessageWriter.class, jakarta.ws.rs.tck.ee.rs.ext.messagebodyreaderwriter.ReadableWritableEntity.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/client/typedentitieswithxmlbinding/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/client/typedentitieswithxmlbinding/JAXRSClientIT.java
index 14bc022..88868ae 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/client/typedentitieswithxmlbinding/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/client/typedentitieswithxmlbinding/JAXRSClientIT.java

@@ -61,7 +61,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/client/typedentitieswithxmlbinding/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_client_typedentitieswithxmlbinding_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class, EntityMessageReader.class, EntityMessageWriter.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, EntityMessageReader.class, EntityMessageWriter.class, jakarta.ws.rs.tck.ee.rs.ext.messagebodyreaderwriter.ReadableWritableEntity.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/context/client/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/context/client/JAXRSClientIT.java
index a802f71..866440e 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/context/client/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/context/client/JAXRSClientIT.java

@@ -57,7 +57,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/context/client/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_context_client_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, jakarta.ws.rs.tck.common.provider.PrintingErrorHandler.class, jakarta.ws.rs.tck.common.provider.StringBean.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/context/server/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/context/server/JAXRSClientIT.java
index 2a0582a..353d2ac 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/context/server/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/context/server/JAXRSClientIT.java

@@ -53,7 +53,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/context/server/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_context_server_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class, SingletonWithInjectables.class, StringBeanEntityProviderWithInjectables.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, SingletonWithInjectables.class, StringBeanEntityProviderWithInjectables.class, jakarta.ws.rs.tck.common.provider.StringBeanEntityProvider.class, jakarta.ws.rs.tck.common.provider.PrintingErrorHandler.class, jakarta.ws.rs.tck.common.provider.StringBean.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/dynamicfeature/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/dynamicfeature/JAXRSClientIT.java
index 218a9ed..894ad79 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/dynamicfeature/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/dynamicfeature/JAXRSClientIT.java

@@ -56,7 +56,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/filter/dynamicfeature/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_filter_dynamicfeature_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class, AddTenFilter.class, AddOneInterceptor.class, AddDynamicFeature.class, AbstractAddInterceptor.class, AbstractAddFilter.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, AddTenFilter.class, AddOneInterceptor.class, AddDynamicFeature.class, AbstractAddInterceptor.class, AbstractAddFilter.class, jakarta.ws.rs.tck.common.util.JaxrsUtil.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/exception/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/exception/JAXRSClientIT.java
index 2579105..27d1e65 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/exception/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/exception/JAXRSClientIT.java

@@ -58,7 +58,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/filter/exception/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_filter_exception_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class, AbstractAddFilter.class, AbstractAddInterceptor.class, AddOneFilter.class, AddOneInterceptor.class, AddTenGlobalFilter.class, AddTenGlobalInterceptor.class, ExceptionNameBinding.class, NeverUsedExceptionMapper.class, PostMatchingThrowingFilter.class, PreMatchingThrowingFilter.class, RuntimeExceptionMapper.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, AbstractAddFilter.class, AbstractAddInterceptor.class, AddOneFilter.class, AddOneInterceptor.class, AddTenGlobalFilter.class, AddTenGlobalInterceptor.class, ExceptionNameBinding.class, NeverUsedExceptionMapper.class, PostMatchingThrowingFilter.class, PreMatchingThrowingFilter.class, RuntimeExceptionMapper.class, jakarta.ws.rs.tck.common.util.JaxrsUtil.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/globalbinding/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/globalbinding/JAXRSClientIT.java
index 4b01907..9a4b9c2 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/globalbinding/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/globalbinding/JAXRSClientIT.java

@@ -57,7 +57,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/filter/globalbinding/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_filter_globalbinding_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class, AbstractAddFilter.class, AbstractAddInterceptor.class, AddOneInterceptor.class, AddTenFilter.class, GlobalNameBinding.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, AbstractAddFilter.class, AbstractAddInterceptor.class, AddOneInterceptor.class, AddTenFilter.class, GlobalNameBinding.class, jakarta.ws.rs.tck.common.util.JaxrsUtil.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/lastvalue/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/lastvalue/JAXRSClientIT.java
index f1766e4..c49ab55 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/lastvalue/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/lastvalue/JAXRSClientIT.java

@@ -64,7 +64,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/filter/lastvalue/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_filter_lastvalue_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class, ArrayListEntityProvider.class, FirstReaderInterceptor.class, FirstWriterInterceptor.class, LinkedListEntityProvider.class, SecondReaderInterceptor.class, SecondWriterInterceptor.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, ArrayListEntityProvider.class, FirstReaderInterceptor.class, FirstWriterInterceptor.class, LinkedListEntityProvider.class, SecondReaderInterceptor.class, SecondWriterInterceptor.class, jakarta.ws.rs.tck.common.util.JaxrsUtil.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/namebinding/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/namebinding/JAXRSClientIT.java
index 30faefa..5b488ea 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/namebinding/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/filter/namebinding/JAXRSClientIT.java

@@ -56,7 +56,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/filter/namebinding/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_filter_namebinding_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class, AbstractAddInterceptor.class, AddOneInterceptor.class, AddTenInterceptor.class, AllMethodBindingResource.class, ComplementNameBinding.class, SingleNameBinding.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, AbstractAddInterceptor.class, AddOneInterceptor.class, AddTenInterceptor.class, AllMethodBindingResource.class, ComplementNameBinding.class, SingleNameBinding.class, jakarta.ws.rs.tck.common.util.JaxrsUtil.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/sort/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/sort/JAXRSClientIT.java
index 86b5be9..b388fb4 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/sort/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/sort/JAXRSClientIT.java

@@ -57,7 +57,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/provider/sort/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_provider_sort_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class, TextPlainStringBeanEntityProvider.class, TextWildCardStringBeanEntityProvider.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, TextPlainStringBeanEntityProvider.class, TextWildCardStringBeanEntityProvider.class, jakarta.ws.rs.tck.common.provider.StringBeanEntityProvider.class, jakarta.ws.rs.tck.common.provider.StringBean.class, jakarta.ws.rs.tck.common.util.JaxrsUtil.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/standard/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/standard/JAXRSClientIT.java
index 5878936..2710368 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/standard/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/standard/JAXRSClientIT.java

@@ -137,7 +137,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/provider/standard/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_provider_standard_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, jakarta.ws.rs.tck.common.impl.StringStreamingOutput.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/standardhaspriority/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/standardhaspriority/JAXRSClientIT.java
index d24d0b0..4c6504b 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/standardhaspriority/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/standardhaspriority/JAXRSClientIT.java

@@ -75,7 +75,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/provider/standardhaspriority/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_provider_standardhaspriority_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class, AbstractProvider.class, ProviderWalker.class, TckBooleanProvider.class, TckCharacterProvider.class, TckCharacterProvider.class, TckJaxbProvider.class, TckMapProvider.class, TckNumberProvider.class, TckUniversalProvider.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, AbstractProvider.class, ProviderWalker.class, TckBooleanProvider.class, TckCharacterProvider.class, TckJaxbProvider.class, TckMapProvider.class, TckNumberProvider.class, TckUniversalProvider.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/standardnotnull/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/standardnotnull/JAXRSClientIT.java
index 99cc06d..8c83c5c 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/standardnotnull/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/provider/standardnotnull/JAXRSClientIT.java

@@ -72,7 +72,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/provider/standardnotnull/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_provider_standardnotnull_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, jakarta.ws.rs.tck.common.impl.StringStreamingOutput.class, jakarta.ws.rs.tck.common.provider.PrintingErrorHandler.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/resource/annotationprecedence/subclass/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/resource/annotationprecedence/subclass/JAXRSClientIT.java
index ddd5c71..341a46d 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/resource/annotationprecedence/subclass/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/resource/annotationprecedence/subclass/JAXRSClientIT.java

@@ -58,7 +58,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/resource/annotationprecedence/subclass/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_resource_annotationprecedence_subclass_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class, ../ResourceInterface.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, jakarta.ws.rs.tck.spec.resource.annotationprecedence.ResourceInterface.class, jakarta.ws.rs.tck.spec.resource.annotationprecedence.SuperClass.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/resource/valueofandfromstring/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/resource/valueofandfromstring/JAXRSClientIT.java
index 6c72119..df709e5 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/resource/valueofandfromstring/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/resource/valueofandfromstring/JAXRSClientIT.java

@@ -57,7 +57,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/resource/valueofandfromstring/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_resource_valueofandfromstring_web.war");
-    archive.addClasses(TSAppConfig.class, Resource.class, EnumWithFromStringAndValueOf.class, ParamEntityWithFromStringAndValueOf.class);
+    archive.addClasses(TSAppConfig.class, Resource.class, EnumWithFromStringAndValueOf.class, ParamEntityWithFromStringAndValueOf.class, jakarta.ws.rs.tck.ee.rs.ParamEntityPrototype.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/returntype/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/returntype/JAXRSClientIT.java
index eff675e..9117e8e 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/returntype/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/returntype/JAXRSClientIT.java

@@ -60,7 +60,7 @@
     InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/returntype/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_returntype_web.war");
-    archive.addClasses(TSAppConfig.class, ReturnTypeTest.class, UUIDWriter.class);
+    archive.addClasses(TSAppConfig.class, ReturnTypeTest.class, UUIDWriter.class, jakarta.ws.rs.tck.ee.rs.ext.messagebodyreaderwriter.EntityMessageWriter.class, jakarta.ws.rs.tck.ee.rs.ext.messagebodyreaderwriter.ReadableWritableEntity.class, jakarta.ws.rs.tck.common.AbstractMessageBodyRW.class);
     archive.setWebXML(new StringAsset(webXml));
     return archive;
   }

diff --git a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/template/JAXRSClientIT.java b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/template/JAXRSClientIT.java
index 9c5b753..7c920ae 100644
--- a/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/template/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/jakarta/ws/rs/tck/spec/template/JAXRSClientIT.java

@@ -47,7 +47,7 @@
 
   @Deployment(testable = false)
   public static WebArchive createDeployment() throws IOException{
-    InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/templateTest/web.xml.template");
+    InputStream inStream = JAXRSClientIT.class.getClassLoader().getResourceAsStream("jakarta/ws/rs/tck/spec/template/web.xml.template");
     String webXml = editWebXmlString(inStream);
     WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxrs_spec_templateTest_web.war");
     archive.addClasses(TSAppConfig.class, TemplateTest.class);

diff --git a/jaxrs-tck/src/main/resources/jakarta/ws/rs/tck/spec/client/typeidentities/web.xml.template b/jaxrs-tck/src/main/resources/jakarta/ws/rs/tck/spec/client/typedentities/web.xml.template
similarity index 100%
rename from jaxrs-tck/src/main/resources/jakarta/ws/rs/tck/spec/client/typeidentities/web.xml.template
rename to jaxrs-tck/src/main/resources/jakarta/ws/rs/tck/spec/client/typedentities/web.xml.template