TCK classes must not have jakarta package

Signed-off-by: Nathan Rauh <nathan.rauh@us.ibm.com>
jakartaee · Jan 6, 2022 · 3a61441 · 3a61441
1 parent 0a08b34
commit 3a61441
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 50 deletions.
diff --git a/...rrent/signature/SignatureTestServlet.java → ...rrent/signature/SignatureTestServlet.java b/...rrent/signature/SignatureTestServlet.java → ...rrent/signature/SignatureTestServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.signature;
+package ee.jakarta.tck.concurrent.signature;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;

diff --git a/...gate/ContextServiceDefinitionServlet.java → ...gate/ContextServiceDefinitionServlet.java b/...gate/ContextServiceDefinitionServlet.java → ...gate/ContextServiceDefinitionServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spec.ContextService.contextPropagate;
+package ee.jakarta.tck.concurrent.spec.ContextService.contextPropagate;
 
 import static jakarta.enterprise.concurrent.ContextServiceDefinition.ALL_REMAINING;
 import static jakarta.enterprise.concurrent.ContextServiceDefinition.APPLICATION;
@@ -22,11 +22,12 @@
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
+import ee.jakarta.tck.concurrent.spec.context.IntContext;
+import ee.jakarta.tck.concurrent.spec.context.StringContext;
+
 import jakarta.annotation.Resource;
 import jakarta.enterprise.concurrent.ContextService;
 import jakarta.enterprise.concurrent.ContextServiceDefinition;
-import jakarta.enterprise.concurrent.spec.context.IntContext;
-import jakarta.enterprise.concurrent.spec.context.StringContext;
 import jakarta.servlet.ServletConfig;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;

diff --git a/...ExecutorService/asynchronous/AppBean.java → ...ExecutorService/asynchronous/AppBean.java b/...ExecutorService/asynchronous/AppBean.java → ...ExecutorService/asynchronous/AppBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,7 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spec.ManagedExecutorService.asynchronous;
+package ee.jakarta.tck.concurrent.spec.ManagedExecutorService.asynchronous;
+
+import ee.jakarta.tck.concurrent.spec.context.IntContext;
+import ee.jakarta.tck.concurrent.spec.context.StringContext;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CompletableFuture;
@@ -26,8 +29,6 @@
 import java.util.concurrent.TimeoutException;
 
 import jakarta.enterprise.concurrent.Asynchronous;
-import jakarta.enterprise.concurrent.spec.context.IntContext;
-import jakarta.enterprise.concurrent.spec.context.StringContext;
 import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped

diff --git a/...def/ManagedExecutorDefinitionServlet.java → ...def/ManagedExecutorDefinitionServlet.java b/...def/ManagedExecutorDefinitionServlet.java → ...def/ManagedExecutorDefinitionServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,12 +13,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spec.ManagedExecutorService.resourcedef;
+package ee.jakarta.tck.concurrent.spec.ManagedExecutorService.resourcedef;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
+import ee.jakarta.tck.concurrent.spec.ManagedExecutorService.asynchronous.AppBean;
+import ee.jakarta.tck.concurrent.spec.context.IntContext;
+import ee.jakarta.tck.concurrent.spec.context.StringContext;
+
 import java.io.IOException;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Callable;
@@ -36,9 +40,6 @@
 import jakarta.annotation.Resource;
 import jakarta.enterprise.concurrent.ManagedExecutorService;
 import jakarta.enterprise.concurrent.ManagedExecutorDefinition;
-import jakarta.enterprise.concurrent.spec.ManagedExecutorService.asynchronous.AppBean;
-import jakarta.enterprise.concurrent.spec.context.IntContext;
-import jakarta.enterprise.concurrent.spec.context.StringContext;
 import jakarta.inject.Inject;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;

diff --git a/...ExecutorService/asynchronous/ReqBean.java → ...ExecutorService/asynchronous/ReqBean.java b/...ExecutorService/asynchronous/ReqBean.java → ...ExecutorService/asynchronous/ReqBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,7 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spec.ManagedScheduledExecutorService.asynchronous;
+package ee.jakarta.tck.concurrent.spec.ManagedScheduledExecutorService.asynchronous;
+
+import ee.jakarta.tck.concurrent.spec.context.IntContext;
+import ee.jakarta.tck.concurrent.spec.context.StringContext;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -24,8 +27,6 @@
 
 import jakarta.enterprise.concurrent.Asynchronous;
 import jakarta.enterprise.concurrent.ContextService;
-import jakarta.enterprise.concurrent.spec.context.IntContext;
-import jakarta.enterprise.concurrent.spec.context.StringContext;
 import jakarta.enterprise.context.RequestScoped;
 
 import javax.naming.InitialContext;

diff --git a/...edScheduledExecutorDefinitionServlet.java → ...edScheduledExecutorDefinitionServlet.java b/...edScheduledExecutorDefinitionServlet.java → ...edScheduledExecutorDefinitionServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,12 +13,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spec.ManagedScheduledExecutorService.resourcedef;
+package ee.jakarta.tck.concurrent.spec.ManagedScheduledExecutorService.resourcedef;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
+import ee.jakarta.tck.concurrent.spec.ManagedScheduledExecutorService.asynchronous.ReqBean;
+import ee.jakarta.tck.concurrent.spec.context.IntContext;
+import ee.jakarta.tck.concurrent.spec.context.StringContext;
+
 import java.io.IOException;
 import java.time.DayOfWeek;
 import java.time.ZoneId;
@@ -46,9 +50,6 @@
 import jakarta.enterprise.concurrent.CronTrigger;
 import jakarta.enterprise.concurrent.LastExecution;
 import jakarta.enterprise.concurrent.ManagedScheduledExecutorDefinition;
-import jakarta.enterprise.concurrent.spec.ManagedScheduledExecutorService.asynchronous.ReqBean;
-import jakarta.enterprise.concurrent.spec.context.IntContext;
-import jakarta.enterprise.concurrent.spec.context.StringContext;
 import jakarta.inject.Inject;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;

diff --git a/...anagedThreadFactoryDefinitionServlet.java → ...anagedThreadFactoryDefinitionServlet.java b/...anagedThreadFactoryDefinitionServlet.java → ...anagedThreadFactoryDefinitionServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,12 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spec.ManagedThreadFactory.resourcedef;
+package ee.jakarta.tck.concurrent.spec.ManagedThreadFactory.resourcedef;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
+import ee.jakarta.tck.concurrent.spec.context.IntContext;
+import ee.jakarta.tck.concurrent.spec.context.StringContext;
+
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Optional;
@@ -35,8 +38,6 @@
 import jakarta.enterprise.concurrent.ContextService;
 import jakarta.enterprise.concurrent.ManagedThreadFactory;
 import jakarta.enterprise.concurrent.ManagedThreadFactoryDefinition;
-import jakarta.enterprise.concurrent.spec.context.IntContext;
-import jakarta.enterprise.concurrent.spec.context.StringContext;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;

diff --git a/...e/concurrent/spec/context/IntContext.java → ...k/concurrent/spec/context/IntContext.java b/...e/concurrent/spec/context/IntContext.java → ...k/concurrent/spec/context/IntContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spec.context;
+package ee.jakarta.tck.concurrent.spec.context;
 
 /**
  * A mock context type that consists of an int value.

diff --git a/...oncurrent/spec/context/StringContext.java → ...oncurrent/spec/context/StringContext.java b/...oncurrent/spec/context/StringContext.java → ...oncurrent/spec/context/StringContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spec.context;
+package ee.jakarta.tck.concurrent.spec.context;
 
 /**
  * A mock context type that consists of String value.

diff --git a/...rrent/spi/context/IntContextProvider.java → ...rrent/spi/context/IntContextProvider.java b/...rrent/spi/context/IntContextProvider.java → ...rrent/spi/context/IntContextProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,9 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spi.context;
+package ee.jakarta.tck.concurrent.spi.context;
+
+import ee.jakarta.tck.concurrent.spec.context.IntContext;
 
-import jakarta.enterprise.concurrent.spec.context.IntContext;
 import jakarta.enterprise.concurrent.spi.ThreadContextProvider;
 import jakarta.enterprise.concurrent.spi.ThreadContextSnapshot;
 

diff --git a/...rrent/spi/context/IntContextRestorer.java → ...rrent/spi/context/IntContextRestorer.java b/...rrent/spi/context/IntContextRestorer.java → ...rrent/spi/context/IntContextRestorer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,9 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spi.context;
+package ee.jakarta.tck.concurrent.spi.context;
+
+import ee.jakarta.tck.concurrent.spec.context.IntContext;
 
-import jakarta.enterprise.concurrent.spec.context.IntContext;
 import jakarta.enterprise.concurrent.spi.ThreadContextRestorer;
 
 /**

diff --git a/...rrent/spi/context/IntContextSnapshot.java → ...rrent/spi/context/IntContextSnapshot.java b/...rrent/spi/context/IntContextSnapshot.java → ...rrent/spi/context/IntContextSnapshot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,9 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spi.context;
+package ee.jakarta.tck.concurrent.spi.context;
+
+import ee.jakarta.tck.concurrent.spec.context.IntContext;
 
-import jakarta.enterprise.concurrent.spec.context.IntContext;
 import jakarta.enterprise.concurrent.spi.ThreadContextRestorer;
 import jakarta.enterprise.concurrent.spi.ThreadContextSnapshot;
 

diff --git a/...nt/spi/context/StringContextProvider.java → ...nt/spi/context/StringContextProvider.java b/...nt/spi/context/StringContextProvider.java → ...nt/spi/context/StringContextProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,9 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spi.context;
+package ee.jakarta.tck.concurrent.spi.context;
+
+import ee.jakarta.tck.concurrent.spec.context.StringContext;
 
-import jakarta.enterprise.concurrent.spec.context.StringContext;
 import jakarta.enterprise.concurrent.spi.ThreadContextProvider;
 import jakarta.enterprise.concurrent.spi.ThreadContextSnapshot;
 

diff --git a/...nt/spi/context/StringContextRestorer.java → ...nt/spi/context/StringContextRestorer.java b/...nt/spi/context/StringContextRestorer.java → ...nt/spi/context/StringContextRestorer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,9 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spi.context;
+package ee.jakarta.tck.concurrent.spi.context;
+
+import ee.jakarta.tck.concurrent.spec.context.StringContext;
 
-import jakarta.enterprise.concurrent.spec.context.StringContext;
 import jakarta.enterprise.concurrent.spi.ThreadContextRestorer;
 
 /**

diff --git a/...nt/spi/context/StringContextSnapshot.java → ...nt/spi/context/StringContextSnapshot.java b/...nt/spi/context/StringContextSnapshot.java → ...nt/spi/context/StringContextSnapshot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021,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
@@ -13,9 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.enterprise.concurrent.spi.context;
+package ee.jakarta.tck.concurrent.spi.context;
+
+import ee.jakarta.tck.concurrent.spec.context.StringContext;
 
-import jakarta.enterprise.concurrent.spec.context.StringContext;
 import jakarta.enterprise.concurrent.spi.ThreadContextRestorer;
 import jakarta.enterprise.concurrent.spi.ThreadContextSnapshot;