eclipse-ee4j · arjantijms · Mar 4, 2024 · Mar 4, 2024 · Mar 4, 2024
diff --git a/osgi.bundle b/osgi.bundle
@@ -15,7 +15,7 @@
 #
 
 -exportcontents: \
-                        org.glassfish.enterprise.concurrent; \
-                        org.glassfish.enterprise.concurrent.internal; \
-                        org.glassfish.enterprise.concurrent.spi; \
-                        org.glassfish.enterprise.concurrent.virtualthreads; version=3.1
+                        org.glassfish.concurro; \
+                        org.glassfish.concurro.internal; \
+                        org.glassfish.concurro.spi; \
+                        org.glassfish.concurro.virtualthreads; version=3.1
diff --git a/pom.xml b/pom.xml
@@ -27,13 +27,15 @@
         <version>1.0.9</version>
     </parent>
 
-    <groupId>org.glassfish</groupId>
-    <artifactId>jakarta.enterprise.concurrent</artifactId>
+    <groupId>org.glassfish.concurro</groupId>
+    <artifactId>concurro</artifactId>
     <version>3.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>org.glassfish.jakarta.enterprise.concurrent</name>
-    <description>Compatible Implementation of Jakarta Concurrency</description>
+    <name>Concurro</name>
+    <description>
+        Eclipse compatible implementation of Jakarta Concurrency.
+    </description>
     <url>https://projects.eclipse.org/projects/ee4j.glassfish</url>
     <organization>
         <name>Oracle Corporation</name>
@@ -262,15 +264,15 @@
                     <groups>
                         <group>
                             <title>Concurro ${project.version}</title>
-                            <packages>org.glassfish.enterprise.concurrent</packages>
+                            <packages>org.glassfish.concurro</packages>
                         </group>
                     </groups>
                     <bottom><![CDATA[
 Comments to: <a href="mailto:glassfish-dev@eclipse.org">glassfish-dev@eclipse.org</a>.<br>
 Copyright &#169; 2021, 2024 Eclipse Foundation. All rights reserved.<br>
 Use is subject to <a href="http://www.eclipse.org/legal/epl-2.0" target="_top">license terms</a>.]]>
                     </bottom>
-                    <excludePackageNames>org.glassfish.enterprise.concurrent.management</excludePackageNames>
+                    <excludePackageNames>org.glassfish.concurro.management</excludePackageNames>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/...rrent/AbstractManagedExecutorService.java → ...curro/AbstractManagedExecutorService.java b/...rrent/AbstractManagedExecutorService.java → ...curro/AbstractManagedExecutorService.java
@@ -15,7 +15,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package org.glassfish.enterprise.concurrent;
+package org.glassfish.concurro;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -34,11 +34,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
-
-import org.glassfish.enterprise.concurrent.internal.ManagedCompletableFuture;
-import org.glassfish.enterprise.concurrent.internal.ManagedFutureTask;
-import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;
-
+import org.glassfish.concurro.internal.ManagedCompletableFuture;
+import org.glassfish.concurro.internal.ManagedFutureTask;
+import org.glassfish.concurro.spi.ContextSetupProvider;
 import jakarta.enterprise.concurrent.ContextService;
 import jakarta.enterprise.concurrent.ManagedExecutorService;
 

diff --git a/...bstractManagedExecutorServiceAdapter.java → ...bstractManagedExecutorServiceAdapter.java b/...bstractManagedExecutorServiceAdapter.java → ...bstractManagedExecutorServiceAdapter.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.enterprise.concurrent;
+package org.glassfish.concurro;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;

diff --git a/...ise/concurrent/AbstractManagedThread.java → ...sfish/concurro/AbstractManagedThread.java b/...ise/concurrent/AbstractManagedThread.java → ...sfish/concurro/AbstractManagedThread.java
@@ -14,13 +14,13 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.enterprise.concurrent;
+package org.glassfish.concurro;
 
 import jakarta.enterprise.concurrent.ManageableThread;
 
 /**
  * Abstract base class for threads to be returned by 
- * {@link ManagedThreadFactoryImpl#createThread(java.lang.Runnable, org.glassfish.enterprise.concurrent.spi.ContextHandle) }
+ * {@link ManagedThreadFactoryImpl#createThread(java.lang.Runnable, org.glassfish.concurro.spi.ContextHandle) }
  * @author alai
  */
 public abstract class AbstractManagedThread extends Thread implements ManageableThread {

diff --git a/...bstractPlatformThreadExecutorService.java → ...bstractPlatformThreadExecutorService.java b/...bstractPlatformThreadExecutorService.java → ...bstractPlatformThreadExecutorService.java
@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package org.glassfish.enterprise.concurrent;
+package org.glassfish.concurro;
 
-import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;
+import org.glassfish.concurro.spi.ContextSetupProvider;
 
 /**
  * Abstract base class for {@code ManagedExecutorService}s, which are based on platform threads.

diff --git a/...e/concurrent/AsynchronousInterceptor.java → ...ish/concurro/AsynchronousInterceptor.java b/...e/concurrent/AsynchronousInterceptor.java → ...ish/concurro/AsynchronousInterceptor.java
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package org.glassfish.enterprise.concurrent;
+package org.glassfish.concurro;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -23,9 +23,7 @@
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-
-import org.glassfish.enterprise.concurrent.internal.ManagedCompletableFuture;
-
+import org.glassfish.concurro.internal.ManagedCompletableFuture;
 import jakarta.annotation.Priority;
 import jakarta.enterprise.concurrent.Asynchronous;
 import jakarta.enterprise.concurrent.ManagedExecutorService;

diff --git a/...rprise/concurrent/ContextServiceImpl.java → ...lassfish/concurro/ContextServiceImpl.java b/...rprise/concurrent/ContextServiceImpl.java → ...lassfish/concurro/ContextServiceImpl.java
@@ -16,7 +16,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.enterprise.concurrent;
+package org.glassfish.concurro;
 
 import java.io.Serializable;
 import java.lang.reflect.InvocationHandler;
@@ -36,12 +36,11 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
-
+import org.glassfish.concurro.internal.ContextProxyInvocationHandler;
+import org.glassfish.concurro.internal.ManagedCompletableFuture;
+import org.glassfish.concurro.spi.ContextSetupProvider;
+import org.glassfish.concurro.spi.TransactionSetupProvider;
 import jakarta.enterprise.concurrent.ManagedExecutorService;
-import org.glassfish.enterprise.concurrent.internal.ContextProxyInvocationHandler;
-import org.glassfish.enterprise.concurrent.internal.ManagedCompletableFuture;
-import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;
-import org.glassfish.enterprise.concurrent.spi.TransactionSetupProvider;
 
 /**
  * Implementation of ContextService interface

diff --git a/...rrent/ForkJoinManagedExecutorService.java → ...curro/ForkJoinManagedExecutorService.java b/...rrent/ForkJoinManagedExecutorService.java → ...curro/ForkJoinManagedExecutorService.java
@@ -14,7 +14,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package org.glassfish.enterprise.concurrent;
+package org.glassfish.concurro;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
@@ -31,9 +31,9 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicLong;
-import org.glassfish.enterprise.concurrent.ManagedThreadFactoryImpl.WorkerThread;
-import org.glassfish.enterprise.concurrent.internal.ManagedFutureTask;
-import org.glassfish.enterprise.concurrent.internal.MultiManagedTaskListener;
+import org.glassfish.concurro.ManagedThreadFactoryImpl.WorkerThread;
+import org.glassfish.concurro.internal.ManagedFutureTask;
+import org.glassfish.concurro.internal.MultiManagedTaskListener;
 
 /**
  * Implementation of ManagedExecutorService interface. See

diff --git a/...ent/ManagedExecutorCompletionService.java → ...rro/ManagedExecutorCompletionService.java b/...ent/ManagedExecutorCompletionService.java → ...rro/ManagedExecutorCompletionService.java
@@ -15,16 +15,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package org.glassfish.enterprise.concurrent;
+package org.glassfish.concurro;
 
 import jakarta.enterprise.concurrent.ManagedTaskListener;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-import org.glassfish.enterprise.concurrent.internal.ManagedFutureTask;
-import org.glassfish.enterprise.concurrent.internal.TaskDoneCallback;
+import org.glassfish.concurro.internal.ManagedFutureTask;
+import org.glassfish.concurro.internal.TaskDoneCallback;
 
 /**
  *

diff --git a/...urrent/ManagedExecutorServiceAdapter.java → ...ncurro/ManagedExecutorServiceAdapter.java b/...urrent/ManagedExecutorServiceAdapter.java → ...ncurro/ManagedExecutorServiceAdapter.java
@@ -16,7 +16,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.enterprise.concurrent;
+package org.glassfish.concurro;
 
 import jakarta.enterprise.concurrent.ContextService;
 import jakarta.enterprise.concurrent.ManagedExecutorService;

diff --git a/...oncurrent/ManagedExecutorServiceImpl.java → .../concurro/ManagedExecutorServiceImpl.java b/...oncurrent/ManagedExecutorServiceImpl.java → .../concurro/ManagedExecutorServiceImpl.java
@@ -15,7 +15,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package org.glassfish.enterprise.concurrent;
+package org.glassfish.concurro;
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
@@ -24,9 +24,9 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.TimeUnit;
+import org.glassfish.concurro.internal.ManagedFutureTask;
+import org.glassfish.concurro.internal.ManagedThreadPoolExecutor;
 import jakarta.enterprise.concurrent.ManagedExecutorService;
-import org.glassfish.enterprise.concurrent.internal.ManagedFutureTask;
-import org.glassfish.enterprise.concurrent.internal.ManagedThreadPoolExecutor;
 
 /**
  * Implementation of ManagedExecutorService interface with Platform threads. See

diff --git a/...nagedScheduledExecutorServiceAdapter.java → ...nagedScheduledExecutorServiceAdapter.java b/...nagedScheduledExecutorServiceAdapter.java → ...nagedScheduledExecutorServiceAdapter.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.enterprise.concurrent;
+package org.glassfish.concurro;
 
 import jakarta.enterprise.concurrent.ContextService;
 import java.util.Collection;
@@ -30,9 +30,8 @@
 import java.util.concurrent.TimeoutException;
 import jakarta.enterprise.concurrent.ManagedScheduledExecutorService;
 import jakarta.enterprise.concurrent.Trigger;
-import org.glassfish.enterprise.concurrent.internal.ManagedCompletableFuture;
-
 import java.util.function.Supplier;
+import org.glassfish.concurro.internal.ManagedCompletableFuture;
 
 /**
  * The ManagedScheduledExecutorService instance to be handed to the

diff --git a/.../ManagedScheduledExecutorServiceImpl.java → .../ManagedScheduledExecutorServiceImpl.java b/.../ManagedScheduledExecutorServiceImpl.java → .../ManagedScheduledExecutorServiceImpl.java
@@ -16,14 +16,14 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.enterprise.concurrent;
+package org.glassfish.concurro;
 
 import java.util.concurrent.*;
+import org.glassfish.concurro.internal.ManagedFutureTask;
+import org.glassfish.concurro.internal.ManagedScheduledThreadPoolExecutor;
 import jakarta.enterprise.concurrent.ManagedExecutorService;
 import jakarta.enterprise.concurrent.ManagedScheduledExecutorService;
 import jakarta.enterprise.concurrent.Trigger;
-import org.glassfish.enterprise.concurrent.internal.ManagedFutureTask;
-import org.glassfish.enterprise.concurrent.internal.ManagedScheduledThreadPoolExecutor;
 
 /**
  * Implementation of ManagedScheduledExecutorService interface

diff --git a/.../concurrent/ManagedThreadFactoryImpl.java → ...sh/concurro/ManagedThreadFactoryImpl.java b/.../concurrent/ManagedThreadFactoryImpl.java → ...sh/concurro/ManagedThreadFactoryImpl.java
@@ -16,7 +16,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.enterprise.concurrent;
+package org.glassfish.concurro;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,13 +27,13 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.glassfish.concurro.internal.ManagedFutureTask;
+import org.glassfish.concurro.internal.ThreadExpiredException;
+import org.glassfish.concurro.spi.ContextHandle;
+import org.glassfish.concurro.spi.ContextSetupProvider;
 import jakarta.enterprise.concurrent.ManagedThreadFactory;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinWorkerThread;
-import org.glassfish.enterprise.concurrent.internal.ManagedFutureTask;
-import org.glassfish.enterprise.concurrent.internal.ThreadExpiredException;
-import org.glassfish.enterprise.concurrent.spi.ContextHandle;
-import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;
 
 /**
  * Implementation of ManagedThreadFactory interface.
@@ -282,9 +282,9 @@ public void run() {
                 }
                 super.run();
             } catch (ThreadExpiredException ex) {
-                Logger.getLogger("org.glassfish.enterprise.concurrent").log(Level.INFO, ex.toString());
+                Logger.getLogger("org.glassfish.concurro").log(Level.INFO, ex.toString());
             } catch (Throwable t) {
-                Logger.getLogger("org.glassfish.enterprise.concurrent").log(Level.SEVERE, name, t);
+                Logger.getLogger("org.glassfish.concurro").log(Level.SEVERE, name, t);
             }
         }
 
@@ -331,9 +331,9 @@ public void run() {
                 }
                 super.run();
             } catch (ThreadExpiredException ex) {
-                Logger.getLogger("org.glassfish.enterprise.concurrent").log(Level.INFO, ex.toString());
+                Logger.getLogger("org.glassfish.concurro").log(Level.INFO, ex.toString());
             } catch (Throwable t) {
-                Logger.getLogger("org.glassfish.enterprise.concurrent").log(Level.SEVERE, name, t);
+                Logger.getLogger("org.glassfish.concurro").log(Level.SEVERE, name, t);
             } finally {
                 if (handle != null) {
                     contextSetupProvider.reset(handle);

diff --git a/...oncurrent/cdi/ConcurrentCDIExtension.java → .../concurro/cdi/ConcurrentCDIExtension.java b/...oncurrent/cdi/ConcurrentCDIExtension.java → .../concurro/cdi/ConcurrentCDIExtension.java
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package org.glassfish.enterprise.concurrent.cdi;
+package org.glassfish.concurro.cdi;
 
 import jakarta.enterprise.concurrent.Asynchronous;
 import jakarta.enterprise.event.Observes;
@@ -30,7 +30,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.logging.Logger;
-import org.glassfish.enterprise.concurrent.AsynchronousInterceptor;
+import org.glassfish.concurro.AsynchronousInterceptor;
 
 /**
  * CDI Extension for Jakarta Concurrent implementation backported from Payara.

diff --git a/...ternal/ContextProxyInvocationHandler.java → ...ternal/ContextProxyInvocationHandler.java b/...ternal/ContextProxyInvocationHandler.java → ...ternal/ContextProxyInvocationHandler.java
@@ -14,21 +14,21 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.enterprise.concurrent.internal;
+package org.glassfish.concurro.internal;
 
 import java.io.Serializable;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
+import org.glassfish.concurro.ContextServiceImpl;
+import org.glassfish.concurro.spi.ContextHandle;
+import org.glassfish.concurro.spi.ContextSetupProvider;
+import org.glassfish.concurro.spi.TransactionHandle;
+import org.glassfish.concurro.spi.TransactionSetupProvider;
 import jakarta.enterprise.concurrent.ContextService;
 import jakarta.enterprise.concurrent.ManagedTask;
 import java.lang.reflect.InvocationTargetException;
-import org.glassfish.enterprise.concurrent.ContextServiceImpl;
-import org.glassfish.enterprise.concurrent.spi.ContextHandle;
-import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;
-import org.glassfish.enterprise.concurrent.spi.TransactionHandle;
-import org.glassfish.enterprise.concurrent.spi.TransactionSetupProvider;
 
 /**
  * InvocationHandler used by ContextServiceImpl

diff --git a/...nt/internal/ManagedCompletableFuture.java → ...ro/internal/ManagedCompletableFuture.java b/...nt/internal/ManagedCompletableFuture.java → ...ro/internal/ManagedCompletableFuture.java
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package org.glassfish.enterprise.concurrent.internal;
+package org.glassfish.concurro.internal;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;