package rename and final changes

update copyright

rename packages again

Use central ContextServiceDefinitionServlet

Author: KyleAure

tck/pom.xml

@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2021 Oracle and/or its affiliates. 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
+ /*
+ * 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
+ */
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -22,7 +27,7 @@
 
     <groupId>jakarta.enterprise.concurrent</groupId>
     <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>3.0.0-RC1</version>
     <packaging>jar</packaging>
 
     <name>Jakarta Concurrency TCK</name>
@@ -46,9 +51,15 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
 
-        <jakarta.concurrent.version>2.0.0</jakarta.concurrent.version>
+        <jakarta.concurrent.version.ga>3.0.0</jakarta.concurrent.version.ga>
+        <jakarta.concurrent.version.dev>3.0.0-SNAPSHOT</jakarta.concurrent.version.dev>
+        
+        <!-- TODO update to 6.0.0 -->
         <jakarta.servlet.version>5.0.0</jakarta.servlet.version>
+        
+        <!-- TODO update to 5.0.0 -->
         <jakarta.ejb.version>4.0.0</jakarta.ejb.version>
+        
         <jakarta.annotation.version>2.0.0</jakarta.annotation.version>
 
         <testng.version>6.14.3</testng.version>
@@ -58,7 +69,7 @@
         <dependency>
             <groupId>jakarta.enterprise.concurrent</groupId>
             <artifactId>jakarta.enterprise.concurrent-api</artifactId>
-            <version>${jakarta.concurrent.version}</version>
+            <version>${jakarta.concurrent.version.dev}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

tck/src/main/java/ee/jakarta/tck/concurrent/api/AbortedException/AbortedExceptionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 Oracle and/or its affiliates. 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
@@ -14,23 +14,23 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.enterprise.concurrent.api.AbortedException;
+package ee.jakarta.tck.concurrent.api.AbortedException;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.testng.annotations.Test;
 
+import ee.jakarta.tck.concurrent.framework.ArquillianTests;
+import ee.jakarta.tck.concurrent.framework.TestLogger;
 import jakarta.enterprise.concurrent.AbortedException;
-import jakarta.enterprise.concurrent.tck.framework.ArquillianTests;
-import jakarta.enterprise.concurrent.tck.framework.TestLogger;
 
 public class AbortedExceptionTests extends ArquillianTests {
 
 	private static final TestLogger log = TestLogger.get(AbortedExceptionTests.class);
 
 	//TODO deploy as EJB and JSP artifacts
-	@Deployment(name="AbortedException")
+	@Deployment(name="AbortedExceptionTests")
 	public static WebArchive createDeployment() {
 		return ShrinkWrap.create(WebArchive.class)
 				.addPackages(true, getFrameworkPackage(), AbortedExceptionTests.class.getPackage());

tck/src/main/java/ee/jakarta/tck/concurrent/api/ContextService/ContextServiceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 Oracle and/or its affiliates. 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
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.enterprise.concurrent.api.ContextService;
+package ee.jakarta.tck.concurrent.api.ContextService;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -24,17 +24,17 @@
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.testng.annotations.Test;
 
+import ee.jakarta.tck.concurrent.framework.ArquillianTests;
+import ee.jakarta.tck.concurrent.framework.TestLogger;
+import ee.jakarta.tck.concurrent.framework.TestUtil;
 import jakarta.enterprise.concurrent.ManagedTaskListener;
-import jakarta.enterprise.concurrent.tck.framework.ArquillianTests;
-import jakarta.enterprise.concurrent.tck.framework.TestLogger;
-import jakarta.enterprise.concurrent.tck.framework.TestUtil;
 
 public class ContextServiceTests extends ArquillianTests {
 
 	private static final TestLogger log = TestLogger.get(ContextServiceTests.class);
 
 	//TODO deploy as EJB and JSP artifacts
-	@Deployment(name="ContextService")
+	@Deployment(name="ContextServiceTests")
 	public static WebArchive createDeployment() {
 		return ShrinkWrap.create(WebArchive.class)
 				.addPackages(true, getFrameworkPackage(), ContextServiceTests.class.getPackage());

tck/src/main/java/ee/jakarta/tck/concurrent/api/ContextService/TestRunnableWork.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 Oracle and/or its affiliates. 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
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.enterprise.concurrent.api.ContextService;
+package ee.jakarta.tck.concurrent.api.ContextService;
 
 public class TestRunnableWork implements Runnable, TestWorkInterface {
 

tck/src/main/java/ee/jakarta/tck/concurrent/api/ContextService/TestRunnableWorkNoDefaultConstructor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 Oracle and/or its affiliates. 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
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.enterprise.concurrent.api.ContextService;
+package ee.jakarta.tck.concurrent.api.ContextService;
 
 public class TestRunnableWorkNoDefaultConstructor implements Runnable, TestWorkInterface {
 

tck/src/main/java/ee/jakarta/tck/concurrent/api/ContextService/TestWorkInterface.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 Oracle and/or its affiliates. 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
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.enterprise.concurrent.api.ContextService;
+package ee.jakarta.tck.concurrent.api.ContextService;
 
 public interface TestWorkInterface {
 	public String doSomeWork();

tck/src/main/java/ee/jakarta/tck/concurrent/api/LastExecution/LastExecutionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 Oracle and/or its affiliates. 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
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.enterprise.concurrent.api.LastExecution;
+package ee.jakarta.tck.concurrent.api.LastExecution;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,24 +26,24 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import ee.jakarta.tck.concurrent.common.fixed.counter.CounterCallableTask;
+import ee.jakarta.tck.concurrent.common.fixed.counter.CounterRunnableTask;
+import ee.jakarta.tck.concurrent.common.fixed.counter.StaticCounter;
+import ee.jakarta.tck.concurrent.framework.ArquillianTests;
+import ee.jakarta.tck.concurrent.framework.TestConstants;
+import ee.jakarta.tck.concurrent.framework.TestUtil;
 import jakarta.enterprise.concurrent.ManagedExecutors;
 import jakarta.enterprise.concurrent.ManagedTask;
-import jakarta.enterprise.concurrent.common.counter.CounterCallableTask;
-import jakarta.enterprise.concurrent.common.counter.CounterRunnableTask;
-import jakarta.enterprise.concurrent.common.counter.StaticCounter;
-import jakarta.enterprise.concurrent.tck.framework.ArquillianTests;
-import jakarta.enterprise.concurrent.tck.framework.TestConstants;
-import jakarta.enterprise.concurrent.tck.framework.TestUtil;
 
 public class LastExecutionTests extends ArquillianTests {
 
 	public static final String IDENTITY_NAME_TEST_ID = "lastExecutionGetIdentityNameTest";
 
 	//TODO deploy as EJB and JSP artifacts
-	@Deployment(name="LastExecution")
+	@Deployment(name="LastExecutionTests")
 	public static WebArchive createDeployment() {
 		return ShrinkWrap.create(WebArchive.class)
-				.addPackages(true, getFrameworkPackage(), getCommonCounterPackage() ,LastExecutionTests.class.getPackage());
+				.addPackages(true, getFrameworkPackage(), getCommonFixedCounterPackage() ,LastExecutionTests.class.getPackage());
 	}
 
 	@BeforeMethod

tck/src/main/java/ee/jakarta/tck/concurrent/api/LastExecution/LogicDrivenTrigger.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 Oracle and/or its affiliates. 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
@@ -14,15 +14,15 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.enterprise.concurrent.api.LastExecution;
+package ee.jakarta.tck.concurrent.api.LastExecution;
 
 import java.lang.reflect.Method;
 import java.util.Date;
 
+import ee.jakarta.tck.concurrent.framework.TestConstants;
+import ee.jakarta.tck.concurrent.framework.TestLogger;
 import jakarta.enterprise.concurrent.LastExecution;
 import jakarta.enterprise.concurrent.Trigger;
-import jakarta.enterprise.concurrent.tck.framework.TestConstants;
-import jakarta.enterprise.concurrent.tck.framework.TestLogger;
 
 /**
  * A trigger that driven by test logic. This trigger is used for test the logic

tck/src/main/java/ee/jakarta/tck/concurrent/api/ManageableThread/ManageableThreadTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 Oracle and/or its affiliates. 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
@@ -14,24 +14,24 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.enterprise.concurrent.api.ManageableThread;
+package ee.jakarta.tck.concurrent.api.ManageableThread;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.testng.annotations.Test;
 
+import ee.jakarta.tck.concurrent.framework.ArquillianTests;
+import ee.jakarta.tck.concurrent.framework.TestLogger;
+import ee.jakarta.tck.concurrent.framework.TestUtil;
 import jakarta.enterprise.concurrent.ManageableThread;
-import jakarta.enterprise.concurrent.tck.framework.ArquillianTests;
-import jakarta.enterprise.concurrent.tck.framework.TestLogger;
-import jakarta.enterprise.concurrent.tck.framework.TestUtil;
 
 public class ManageableThreadTests extends ArquillianTests {
 
 	private static final TestLogger log = TestLogger.get(ManageableThreadTests.class);
 
 	//TODO deploy as EJB and JSP artifacts
-	@Deployment(name="ManageableThread")
+	@Deployment(name="ManageableThreadTests")
 	public static WebArchive createDeployment() {
 		return ShrinkWrap.create(WebArchive.class)
 				.addPackages(true, getFrameworkPackage(), ManageableThreadTests.class.getPackage());

tck/src/main/java/ee/jakarta/tck/concurrent/api/ManageableThread/TestRunnableWork.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 Oracle and/or its affiliates. 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
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.enterprise.concurrent.api.ManageableThread;
+package ee.jakarta.tck.concurrent.api.ManageableThread;
 
 public class TestRunnableWork implements Runnable {