test(tomcat10): restore engine integration tests

qa/integration-tests-engine-jakarta/pom.xml

@@ -713,20 +713,8 @@
                 <!-- TODO Please delete the following exclusions after the Tomcat 10 issue with Arquillian -->
                 <!-- See Relevant issue: https://github.com/camunda/camunda-bpm-platform/issues/4434 -->
                 <exclude>**/CallActivityContextSwitchTest.java</exclude>
-                <exclude>**/TestMultipleClasspathRoots.java</exclude>
-                <exclude>**/TestResourceName.java</exclude>
-                <exclude>**/TestWarDeploymentDeployChangedOnlyWithJarAsLib.java</exclude>
-                <exclude>**/TestWarDeploymentWithDiagram.java</exclude>
-                <exclude>**/TestWarDeploymentWithoutDiagram.java</exclude>
-                <exclude>**/TestWarDeploymentWithoutProcessDefinitions.java</exclude>
-                <exclude>**/TestWarDeploymentWithoutProcessesXml.java</exclude>
                 <exclude>**/CdiBeanCallActivityResolutionTest.java</exclude>
-                <exclude>**/CdiBeanCaseTaskResolutionTest.java</exclude>
-                <exclude>**/CallActivityContextSwitchTest.java</exclude>
-                <exclude>**/FailingJobBoundaryTimerWithDelegateVariablesTest.java</exclude>
-                <exclude>**/SignalEventCatchBoundaryWithVariablesTest.java</exclude>
-                <exclude>**/TimerRecalculationTest.java</exclude>
-                <exclude>**/CdiProcessApplicationEventSupportTest.java</exclude>
+
                 <!-- TODO and weld-servlet-shaded is resolved with integration-tests-engine-jakarta -->
 
               </excludes>

qa/integration-tests-engine-jakarta/src/test/resources/org/camunda/bpm/integrationtest/beans.xml

@@ -2,4 +2,4 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
        version="4.0" bean-discovery-mode="all">
-</beans>
+</beans>

qa/integration-tests-engine/pom.xml

@@ -554,7 +554,7 @@
                 </goals>
                 <configuration>
                   <sources>
-                    <source>src/test/java-tomcat</source>
+                    <source>src/test/java-tomcat9</source>
                   </sources>
                 </configuration>
               </execution>

qa/integration-tests-engine/src/test/java-tomcat/org/camunda/bpm/integrationtest/util/TestContainer.java

@@ -25,12 +25,20 @@
  */
 public class TestContainer {
 
+  /**
+   * In some scenarios, Tomcat 10 and Weld 5 have issues when the Weld library is embedded into the WAR.
+   * To solve these issues, Weld is added to the Tomcat server libs folder.
+   */
+  public static void addContainerSpecificResourcesEmbedCdiLib(WebArchive webArchive) {
+    addContainerSpecificResources(webArchive);
+    webArchive.addAsLibraries(DeploymentHelper.getWeld());
+  }
+
   public static void addContainerSpecificResources(WebArchive webArchive) {
     webArchive
-      .addAsManifestResource("context.xml")
-      .addAsLibraries(DeploymentHelper.getWeld())
-      .addClass(TestProcessApplication.class)
-      .addAsWebInfResource("web.xml");
+        .addAsManifestResource("context.xml")
+        .addClass(TestProcessApplication.class)
+        .addAsWebInfResource("web.xml");
   }
 
   public static void addContainerSpecificResourcesWithoutWeld(WebArchive webArchive) {
@@ -40,11 +48,19 @@ public static void addContainerSpecificResourcesWithoutWeld(WebArchive webArchiv
       .addAsWebInfResource("web-without-weld.xml", "web.xml");
   }
 
+  /**
+   * In some scenarios, Tomcat 10 and Weld 5 have issues when the Weld library is embedded into the WAR.
+   * To solve these issues, Weld is added to the Tomcat server libs folder.
+   */
+  public static void addContainerSpecificResourcesForNonPaEmbedCdiLib(WebArchive webArchive) {
+    addContainerSpecificResourcesForNonPa(webArchive);
+    webArchive.addAsLibraries(DeploymentHelper.getWeld());
+  }
+
   public static void addContainerSpecificResourcesForNonPa(WebArchive webArchive) {
     webArchive
-      .addAsManifestResource("context.xml")
-      .addAsLibraries(DeploymentHelper.getWeld())
-      .addAsWebInfResource("web.xml");
+        .addAsManifestResource("context.xml")
+        .addAsWebInfResource("web.xml");
   }
 
   public static void addContainerSpecificResourcesForNonPaWithoutWeld(WebArchive webArchive) {

qa/integration-tests-engine/src/test/java-tomcat9/org/camunda/bpm/integrationtest/util/TestConstants.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+ * under one or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information regarding copyright
+ * ownership. Camunda licenses this file to you under the Apache License,
+ * Version 2.0; you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.camunda.bpm.integrationtest.util;
+
+/**
+ * @author Thorben Lindhauer
+ *
+ */
+public class TestConstants {
+
+  public final static String APP_NAME = "";
+  public final static String PROCESS_ENGINE_SERVICE_JNDI_NAME = "java:comp/env/ProcessEngineService";
+  public final static String PROCESS_APPLICATION_SERVICE_JNDI_NAME = "java:comp/env/ProcessApplicationService";
+
+  public static String getAppName() {
+    return APP_NAME;
+  }
+
+  public String getEngineService() {
+    return PROCESS_ENGINE_SERVICE_JNDI_NAME;
+  }
+
+  public String getProcessApplicationService() {
+    return PROCESS_APPLICATION_SERVICE_JNDI_NAME;
+  }
+
+}

qa/integration-tests-engine/src/test/java-tomcat9/org/camunda/bpm/integrationtest/util/TestContainer.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+ * under one or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information regarding copyright
+ * ownership. Camunda licenses this file to you under the Apache License,
+ * Version 2.0; you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.camunda.bpm.integrationtest.util;
+
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+
+/**
+ * Tomcat test container.
+ *
+ * @author Daniel Meyer
+ */
+public class TestContainer {
+
+  /**
+   * In some scenarios, Tomcat 10 and Weld 5 have issues when the Weld library is embedded into the WAR.
+   * To solve these issues, Weld is added to the Tomcat server libs folder.
+   */
+  public static void addContainerSpecificResourcesEmbedCdiLib(WebArchive webArchive) {
+    addContainerSpecificResources(webArchive);
+  }
+
+  public static void addContainerSpecificResources(WebArchive webArchive) {
+    webArchive
+        .addAsManifestResource("context.xml")
+        .addClass(TestProcessApplication.class)
+        .addAsWebInfResource("web.xml")
+        .addAsLibraries(DeploymentHelper.getWeld());
+  }
+
+  public static void addContainerSpecificResourcesWithoutWeld(WebArchive webArchive) {
+    webArchive
+      .addAsManifestResource("context.xml")
+      .addClass(TestProcessApplication.class)
+      .addAsWebInfResource("web-without-weld.xml", "web.xml");
+  }
+
+  /**
+   * In some scenarios, Tomcat 10 and Weld 5 have issues when the Weld library is embedded into the WAR.
+   * To solve these issues, Weld is added to the Tomcat server libs folder.
+   */
+  public static void addContainerSpecificResourcesForNonPaEmbedCdiLib(WebArchive webArchive) {
+    addContainerSpecificResourcesForNonPa(webArchive);
+  }
+
+  public static void addContainerSpecificResourcesForNonPa(WebArchive webArchive) {
+    webArchive
+        .addAsManifestResource("context.xml")
+        .addAsWebInfResource("web.xml")
+        .addAsLibraries(DeploymentHelper.getWeld());
+  }
+
+  public static void addContainerSpecificResourcesForNonPaWithoutWeld(WebArchive webArchive) {
+    webArchive
+      .addAsManifestResource("context.xml")
+      .addAsWebInfResource("web-without-weld.xml", "web.xml");
+  }
+
+  public static void addContainerSpecificProcessEngineConfigurationClass(WebArchive deployment) {
+    // nothing to do
+  }
+
+  public static void addSpinJacksonJsonDataFormat(WebArchive webArchive) {
+    webArchive.addAsLibraries(DeploymentHelper.getSpinJacksonJsonDataFormatForServer("tomcat"));
+  }
+
+  public static void addJodaTimeJacksonModule(WebArchive webArchive) {
+    webArchive.addAsLibraries(DeploymentHelper.getJodaTimeModuleForServer("tomcat"));
+  }
+
+  public static void addCommonLoggingDependency(WebArchive webArchive) {
+    // nothing to do
+  }
+
+}

qa/integration-tests-engine/src/test/java-tomcat9/org/camunda/bpm/integrationtest/util/TestProcessApplication.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH
+ * under one or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information regarding copyright
+ * ownership. Camunda licenses this file to you under the Apache License,
+ * Version 2.0; you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.camunda.bpm.integrationtest.util;
+
+import org.camunda.bpm.application.ProcessApplication;
+import org.camunda.bpm.application.impl.ServletProcessApplication;
+
+/**
+ * @author Daniel Meyer
+ *
+ */
+@ProcessApplication
+// Using fully-qualified class name instead of import statement to allow for automatic Jakarta transformation
+public class TestProcessApplication extends org.camunda.bpm.application.impl.ServletProcessApplication {
+
+}

qa/integration-tests-engine/src/test/java-wildfly26-servlet/org/camunda/bpm/integrationtest/util/TestContainer.java

@@ -26,6 +26,10 @@
  */
 public class TestContainer {
 
+  public static void addContainerSpecificResourcesEmbedCdiLib(WebArchive webArchive) {
+    addContainerSpecificResources(webArchive);
+  }
+
   public static void addContainerSpecificResources(WebArchive archive) {
     addContainerSpecificResourcesWithoutWeld(archive);
   }
@@ -34,6 +38,10 @@ public static void addContainerSpecificResourcesWithoutWeld(WebArchive webArchiv
     webArchive.addClass(TestProcessApplication.class);
   }
 
+  public static void addContainerSpecificResourcesForNonPaEmbedCdiLib(WebArchive webArchive) {
+    addContainerSpecificResourcesForNonPa(webArchive);
+  }
+
   public static void addContainerSpecificResourcesForNonPa(WebArchive webArchive) {
     addContainerSpecificResourcesForNonPaWithoutWeld(webArchive);
   }

qa/integration-tests-engine/src/test/java-wildfly26/org/camunda/bpm/integrationtest/util/TestContainer.java

@@ -25,6 +25,10 @@
  */
 public class TestContainer {
 
+  public static void addContainerSpecificResourcesEmbedCdiLib(WebArchive webArchive) {
+    addContainerSpecificResources(webArchive);
+  }
+
   public static void addContainerSpecificResources(WebArchive webArchive) {
     addContainerSpecificResourcesWithoutWeld(webArchive);
   }
@@ -33,6 +37,10 @@ public static void addContainerSpecificResourcesWithoutWeld(WebArchive webArchiv
     webArchive.addAsLibraries(DeploymentHelper.getEjbClient());
   }
 
+  public static void addContainerSpecificResourcesForNonPaEmbedCdiLib(WebArchive webArchive) {
+    addContainerSpecificResourcesForNonPa(webArchive);
+  }
+
   public static void addContainerSpecificResourcesForNonPa(WebArchive webArchive) {
     addContainerSpecificResourcesForNonPaWithoutWeld(webArchive);
   }
@@ -56,4 +64,4 @@ public static void addJodaTimeJacksonModule(WebArchive webArchive) {
   public static void addCommonLoggingDependency(WebArchive webArchive) {
     webArchive.addAsManifestResource("jboss-deployment-structure-with-commons-logging.xml", "jboss-deployment-structure.xml");
   }
-}
+}

qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/deployment/war/TestWarDeploymentWithoutProcessesXml.java

@@ -43,7 +43,7 @@ public static WebArchive processArchive() {
             .addAsWebInfResource("org/camunda/bpm/integrationtest/beans.xml", "beans.xml")
             .addAsLibraries(DeploymentHelper.getEngineCdi())
             .addClass(AbstractFoxPlatformIntegrationTest.class);
-    
+
     TestContainer.addContainerSpecificResources(deployment);
 
     return deployment;

qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanCaseTaskResolutionTest.java

@@ -60,7 +60,7 @@ public static WebArchive clientDeployment() {
             .addClass(AbstractFoxPlatformIntegrationTest.class)
             .addAsLibraries(DeploymentHelper.getEngineCdi());
 
-    TestContainer.addContainerSpecificResourcesForNonPa(deployment);
+    TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment);
 
     return deployment;
   }

qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanDependentScopedAsyncTest.java

@@ -53,7 +53,7 @@ public static WebArchive clientDeployment() {
             .addClass(DependentScopedBean.class)
             .addAsLibraries(DeploymentHelper.getEngineCdi());
 
-    TestContainer.addContainerSpecificResourcesForNonPa(deployment);
+    TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment);
 
     return deployment;
   }

qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanDependentScopedSyncTest.java

@@ -53,7 +53,7 @@ public static WebArchive clientDeployment() {
             .addClass(DependentScopedBean.class)
             .addAsLibraries(DeploymentHelper.getEngineCdi());
 
-    TestContainer.addContainerSpecificResourcesForNonPa(deployment);
+    TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment);
 
     return deployment;
   }

qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanResolutionTest.java

@@ -60,7 +60,7 @@ public static WebArchive clientDeployment() {
             .addClass(AbstractFoxPlatformIntegrationTest.class)
             .addAsLibraries(DeploymentHelper.getEngineCdi());
 
-    TestContainer.addContainerSpecificResourcesForNonPa(deployment);
+    TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment);
 
     return deployment;
   }

qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiBeanSignallableActivityBehaviorResolutionTest.java

@@ -54,7 +54,7 @@ public static WebArchive clientDeployment() {
             .addClass(AbstractFoxPlatformIntegrationTest.class)
             .addAsLibraries(DeploymentHelper.getEngineCdi());
 
-    TestContainer.addContainerSpecificResourcesForNonPa(deployment);
+    TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment);
 
     return deployment;
   }

qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiCallActivityVersionTagTest.java

@@ -49,7 +49,7 @@ public static WebArchive clientDeployment() {
             .addClass(AbstractFoxPlatformIntegrationTest.class)
             .addAsLibraries(DeploymentHelper.getEngineCdi());
 
-    TestContainer.addContainerSpecificResourcesForNonPa(deployment);
+    TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment);
 
     return deployment;
   }

qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiDelegateBeanResolutionTest.java

@@ -30,7 +30,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-
 /**
  * <p>Deploys two different applications, a process archive and a cleint application.</p>
  *
@@ -61,7 +60,7 @@ public static WebArchive clientDeployment() {
             .addClass(AbstractFoxPlatformIntegrationTest.class)
             .addAsLibraries(DeploymentHelper.getEngineCdi());
 
-     TestContainer.addContainerSpecificResources(webArchive);
+     TestContainer.addContainerSpecificResourcesEmbedCdiLib(webArchive);
 
      return webArchive;
   }

qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/cdi/CdiRetryConfigurationTest.java

@@ -53,7 +53,7 @@ public static WebArchive clientDeployment() {
             .addClass(DependentScopedBean.class)
             .addAsLibraries(DeploymentHelper.getEngineCdi());
 
-    TestContainer.addContainerSpecificResourcesForNonPa(deployment);
+    TestContainer.addContainerSpecificResourcesForNonPaEmbedCdiLib(deployment);
 
     return deployment;
   }

qa/integration-tests-engine/src/test/java/org/camunda/bpm/integrationtest/functional/classloading/jobexecution/ClassloadingByJobPriorityTest.java

@@ -90,4 +90,4 @@ protected static Asset modelAsAsset(BpmnModelInstance modelInstance) {
     return new ByteArrayAsset(bytes);
   }
 
-}
+}