Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename (jakarta.)enterprise.concurrent to concurro #81

Merged
merged 2 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions osgi.bundle
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 7 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@
</parent>

<groupId>org.glassfish</groupId>
arjantijms marked this conversation as resolved.
Show resolved Hide resolved
<artifactId>jakarta.enterprise.concurrent</artifactId>
<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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand Down Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
* 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.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.CancellationException;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import org.glassfish.concurro.AbstractManagedExecutorService;
import org.glassfish.concurro.spi.ContextHandle;
import org.glassfish.concurro.spi.ContextSetupProvider;

import static jakarta.enterprise.concurrent.ManagedTask.IDENTITY_NAME;

import jakarta.enterprise.concurrent.AbortedException;
import jakarta.enterprise.concurrent.ContextService;
import jakarta.enterprise.concurrent.ManagedTask;
import jakarta.enterprise.concurrent.ManagedTaskListener;
import org.glassfish.enterprise.concurrent.AbstractManagedExecutorService;
import org.glassfish.enterprise.concurrent.spi.ContextHandle;
import org.glassfish.enterprise.concurrent.spi.ContextSetupProvider;

/**
* Future implementation to be returned by methods in ManagedExecutorSerivceImpl. This class is responsible for saving
Expand Down