From 4931d634e1e9a8a0e577fecdb3a2a40de9ac0e11 Mon Sep 17 00:00:00 2001
From: Jonathan Gallimore <jon@jrg.me.uk>
Date: Wed, 25 Jan 2023 17:10:28 +0000
Subject: [PATCH] Add testng to classpath, and add user/groups needed for the
 TCK

---
 tck/concurrency-standalone/pom.xml            |  4 +-
 .../src/test/conf/tomcat-users.xml            | 64 +++++++++++++++++++
 .../src/test/resources/arquillian.xml         |  4 ++
 3 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 tck/concurrency-standalone/src/test/conf/tomcat-users.xml

diff --git a/tck/concurrency-standalone/pom.xml b/tck/concurrency-standalone/pom.xml
index 7d8648b14d7..bbc2be17c70 100644
--- a/tck/concurrency-standalone/pom.xml
+++ b/tck/concurrency-standalone/pom.xml
@@ -50,7 +50,7 @@
          Use suite.xml to test the full profile
          Use suite-web.xml to test the web profile
      -->
-    <suiteXmlFile>suite.xml</suiteXmlFile>
+    <suiteXmlFile>dev.xml</suiteXmlFile>
 
     <!-- Pointer to logging.properties file that has the java.util.logging configuration -->
     <logging.config>logging.properties</logging.config>
@@ -232,4 +232,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/tck/concurrency-standalone/src/test/conf/tomcat-users.xml b/tck/concurrency-standalone/src/test/conf/tomcat-users.xml
new file mode 100644
index 00000000000..a1fd82bde32
--- /dev/null
+++ b/tck/concurrency-standalone/src/test/conf/tomcat-users.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); 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.
+-->
+<tomcat-users xmlns="http://tomcat.apache.org/xml"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd"
+              version="1.0">
+<!--
+  By default, no user is included in the "manager-gui" role required
+  to operate the "/manager/html" web application.  If you wish to use this app,
+  you must define such a user - the username and password are arbitrary.
+
+  Built-in Tomcat manager roles:
+    - manager-gui    - allows access to the HTML GUI and the status pages
+    - manager-script - allows access to the HTTP API and the status pages
+    - manager-jmx    - allows access to the JMX proxy and the status pages
+    - manager-status - allows access to the status pages only
+
+  The users below are wrapped in a comment and are therefore ignored. If you
+  wish to configure one or more of these users for use with the manager web
+  application, do not forget to remove the <!.. ..> that surrounds them. You
+  will also need to set the passwords to something appropriate.
+-->
+<!--
+  <user username="admin" password="<must-be-changed>" roles="manager-gui"/>
+  <user username="robot" password="<must-be-changed>" roles="manager-script"/>
+-->
+<!--
+  The sample user and role entries below are intended for use with the
+  examples web application. They are wrapped in a comment and thus are ignored
+  when reading this file. If you wish to configure these users for use with the
+  examples web application, do not forget to remove the <!.. ..> that surrounds
+  them. You will also need to set the passwords to something appropriate.
+-->
+<!--
+  <role rolename="tomcat"/>
+  <role rolename="role1"/>
+  <user username="tomcat" password="<must-be-changed>" roles="tomcat"/>
+  <user username="both" password="<must-be-changed>" roles="tomcat,role1"/>
+  <user username="role1" password="<must-be-changed>" roles="role1"/>
+-->
+  <!-- Activate those lines to get access to TomEE GUI if added (tomee-webaccess) -->
+  <!--
+  <role rolename="tomee-admin" />
+  <user username="tomee" password="tomee" roles="tomee-admin,manager-gui" />
+  -->
+    <role rolename="Manager" />
+    <user username="javajoe" password="javajoe" roles="Manager" />
+</tomcat-users>
+
diff --git a/tck/concurrency-standalone/src/test/resources/arquillian.xml b/tck/concurrency-standalone/src/test/resources/arquillian.xml
index ab5c26e15a7..d21cb29d9d5 100644
--- a/tck/concurrency-standalone/src/test/resources/arquillian.xml
+++ b/tck/concurrency-standalone/src/test/resources/arquillian.xml
@@ -33,8 +33,12 @@
             <property name="additionalLibs">
                 mvn:org.apache.derby:derby:10.16.1.1
                 mvn:org.apache.derby:derbytools:10.16.1.1
+                mvn:org.testng:testng:6.14.3
             </property>
             <property name="dir">target/tomee</property>
+            <property name="properties">
+                openejb.environment.default=true
+            </property>
         </configuration>
     </container>
     <container qualifier="tomee-plus">