Skip to content

Commit

Permalink
Get some changes from 4931d63
Browse files Browse the repository at this point in the history
  • Loading branch information
rzo1 committed Nov 21, 2023
1 parent a052f31 commit 1e2b2d4
Show file tree
Hide file tree
Showing 4 changed files with 217 additions and 6 deletions.
29 changes: 29 additions & 0 deletions tck/concurrency-standalone/dev.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<!--
/*
* Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* 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
*/
-->
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >

<!--
This suite file is for testing Jakarta Concurrency against the Jakarta Full Profile.
-->
<suite name="jakarta-concurrency" verbose="2" configfailurepolicy="continue">
<test name="jakarta-concurrency.tck">
<classes>
<class name="ee.jakarta.tck.concurrent.spec.ContextService.contextPropagate.ContextPropagationTests" />
</classes>
</test>
</suite>
26 changes: 20 additions & 6 deletions tck/concurrency-standalone/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,6 @@
<targetDirectory>${project.basedir}/target</targetDirectory>
</properties>

<repositories>
<!-- TODO add private repo if your implementation is not public -->
<!-- TODO add staging repo if you want to use SNAPSHOT versions of the
API and TCK -->
</repositories>

<!-- tag::testClientDep[] -->
<!-- The Arquillian test framework -->
<dependencyManagement>
Expand Down Expand Up @@ -122,12 +116,32 @@
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet.version}</version>
</dependency>
<!-- TestNG -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng.version}</version>
</dependency>
<!-- Signature Test Plugin -->
<dependency>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${sigtest.version}</version>
</dependency>
<!-- To ensure its available for the TomEE lib directory -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.16.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<version>10.16.1.1</version>
<scope>provided</scope>
</dependency>

</dependencies>
<!-- end::testClientDep[] -->

Expand Down
64 changes: 64 additions & 0 deletions tck/concurrency-standalone/src/test/conf/tomcat-users.xml
Original file line number Diff line number Diff line change
@@ -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>

104 changes: 104 additions & 0 deletions tck/concurrency-standalone/src/test/resources/arquillian.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
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.
-->
<arquillian xmlns="http://jboss.org/schema/arquillian"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
<container qualifier="tomee-microprofile" default="true">
<configuration>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
<property name="classifier">microprofile</property>
<property name="debug">true</property>
<property name="conf">src/test/conf</property>
<property name="cleanOnStartUp">false</property>
<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">
<configuration>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
<property name="classifier">microprofile</property>
<property name="debug">false</property>
<property name="conf">src/test/conf</property>
<property name="cleanOnStartUp">false</property>
<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-plume">
<configuration>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
<property name="classifier">microprofile</property>
<property name="debug">false</property>
<property name="conf">src/test/conf</property>
<property name="cleanOnStartUp">false</property>
<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-webprofile">
<configuration>
<property name="httpPort">-1</property>
<property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
<property name="classifier">webprofile</property>
<property name="debug">false</property>
<property name="conf">src/test/conf</property>
<property name="cleanOnStartUp">false</property>
<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>
</arquillian>

0 comments on commit 1e2b2d4

Please sign in to comment.