tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1608091 - in /tomee/tomee/trunk/container: ./ openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/futu...
Date Sat, 05 Jul 2014 18:09:58 GMT
Author: rmannibucau
Date: Sat Jul  5 18:09:57 2014
New Revision: 1608091

URL: http://svn.apache.org/r1608091
Log:
merging concurrency-utilities-ee module with openejb-core

Added:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedExecutorServiceImplFactory.java
      - copied, changed from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedExecutorServiceImplFactory.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedScheduledExecutorServiceImplFactory.java
      - copied, changed from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedScheduledExecutorServiceImplFactory.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedThreadFactoryImplFactory.java
      - copied, changed from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedThreadFactoryImplFactory.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/factory/
      - copied from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/future/
      - copied from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/future/
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/
      - copied from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/impl/
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/reject/
      - copied from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/reject/
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/
      - copied from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/task/
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ContextServiceTest.java
      - copied, changed from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ContextServiceTest.java
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/CustomInjectionTest.java
      - copied, changed from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/CustomInjectionTest.java
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/InjectionTest.java
      - copied, changed from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/InjectionTest.java
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedExecutorServiceTest.java
      - copied, changed from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedScheduledExecutorServiceImplFactoryTest.java
      - copied, changed from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedScheduledExecutorServiceImplFactoryTest.java
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedScheduledExecutorServiceTest.java
      - copied, changed from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedScheduledExecutorServiceTest.java
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/SecurityPropagationTest.java
      - copied, changed from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/SecurityPropagationTest.java
    tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/TransactionPropagationTest.java
      - copied, changed from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/TransactionPropagationTest.java
Removed:
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/future/
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/impl/
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/reject/
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/task/
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ContextServiceTest.java
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/CustomInjectionTest.java
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/InjectionTest.java
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedScheduledExecutorServiceImplFactoryTest.java
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedScheduledExecutorServiceTest.java
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/SecurityPropagationTest.java
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/TransactionPropagationTest.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/factory/ManagedExecutorServiceImplFactory.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/factory/ManagedScheduledExecutorServiceImplFactory.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/factory/ManagedThreadFactoryImplFactory.java
Modified:
    tomee/tomee/trunk/container/openejb-core/pom.xml
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/future/CUFuture.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/future/CUScheduleFuture.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ContextServiceImpl.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedScheduledExecutorServiceImpl.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedThreadFactoryImpl.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/reject/CURejectHandler.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUCallable.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CURunnable.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUTask.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/ManagedTaskListenerTask.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerCallable.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerRunnable.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerTask.java
    tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
    tomee/tomee/trunk/container/pom.xml

Modified: tomee/tomee/trunk/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/pom.xml?rev=1608091&r1=1608090&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/pom.xml Sat Jul  5 18:09:57 2014
@@ -45,6 +45,7 @@
       javax.ejb,
       javax.ejb.embeddable,
       javax.ejb.spi,
+      javax.enterprise.concurrent,
       javax.enterprise.context,
       javax.enterprise.context.spi,
       javax.enterprise.deploy.model;resolution:=optional,
@@ -416,6 +417,11 @@
       <groupId>org.apache.openejb</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
+    <dependency> <!-- TODO: remove it when javaee-api 7 will be done -->
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-concurrent_1.0_spec</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
     <!-- required for endorsed dir support -->
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>

Copied: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedExecutorServiceImplFactory.java
(from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedExecutorServiceImplFactory.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedExecutorServiceImplFactory.java?p2=tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedExecutorServiceImplFactory.java&p1=tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedExecutorServiceImplFactory.java&r1=1608075&r2=1608091&rev=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedExecutorServiceImplFactory.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedExecutorServiceImplFactory.java
Sat Jul  5 18:09:57 2014
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.factory;
+package org.apache.openejb.resource.thread;
 
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedExecutorServiceImpl;
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedThreadFactoryImpl;
-import org.apache.openejb.concurrencyutilities.ee.reject.CURejectHandler;
+import org.apache.openejb.threads.impl.ManagedExecutorServiceImpl;
+import org.apache.openejb.threads.impl.ManagedThreadFactoryImpl;
+import org.apache.openejb.threads.reject.CURejectHandler;
 import org.apache.openejb.util.Duration;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;

Copied: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedScheduledExecutorServiceImplFactory.java
(from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedScheduledExecutorServiceImplFactory.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedScheduledExecutorServiceImplFactory.java?p2=tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedScheduledExecutorServiceImplFactory.java&p1=tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedScheduledExecutorServiceImplFactory.java&r1=1608075&r2=1608091&rev=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedScheduledExecutorServiceImplFactory.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedScheduledExecutorServiceImplFactory.java
Sat Jul  5 18:09:57 2014
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.factory;
+package org.apache.openejb.resource.thread;
 
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedScheduledExecutorServiceImpl;
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedThreadFactoryImpl;
-import org.apache.openejb.concurrencyutilities.ee.reject.CURejectHandler;
+import org.apache.openejb.threads.impl.ManagedScheduledExecutorServiceImpl;
+import org.apache.openejb.threads.impl.ManagedThreadFactoryImpl;
+import org.apache.openejb.threads.reject.CURejectHandler;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
 

Copied: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedThreadFactoryImplFactory.java
(from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedThreadFactoryImplFactory.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedThreadFactoryImplFactory.java?p2=tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedThreadFactoryImplFactory.java&p1=tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedThreadFactoryImplFactory.java&r1=1608075&r2=1608091&rev=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/factory/ManagedThreadFactoryImplFactory.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedThreadFactoryImplFactory.java
Sat Jul  5 18:09:57 2014
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.openejb.concurrencyutilities.ee.factory;
+package org.apache.openejb.resource.thread;
 
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedThreadFactoryImpl;
+import org.apache.openejb.threads.impl.ManagedThreadFactoryImpl;
 
 import javax.enterprise.concurrent.ManagedThreadFactory;
 

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/future/CUFuture.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/future/CUFuture.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/future/CUFuture.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/future/CUFuture.java
Sat Jul  5 18:09:57 2014
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.future;
+package org.apache.openejb.threads.future;
 
-import org.apache.openejb.concurrencyutilities.ee.task.ManagedTaskListenerTask;
+import org.apache.openejb.threads.task.ManagedTaskListenerTask;
 
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/future/CUScheduleFuture.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/future/CUScheduleFuture.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/future/CUScheduleFuture.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/future/CUScheduleFuture.java
Sat Jul  5 18:09:57 2014
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.future;
+package org.apache.openejb.threads.future;
 
-import org.apache.openejb.concurrencyutilities.ee.task.ManagedTaskListenerTask;
+import org.apache.openejb.threads.task.ManagedTaskListenerTask;
 
 import java.util.concurrent.Delayed;
 import java.util.concurrent.ScheduledFuture;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ContextServiceImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ContextServiceImpl.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ContextServiceImpl.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ContextServiceImpl.java
Sat Jul  5 18:09:57 2014
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.impl;
+package org.apache.openejb.threads.impl;
 
 import org.apache.openejb.OpenEJB;
-import org.apache.openejb.concurrencyutilities.ee.task.CUTask;
+import org.apache.openejb.threads.task.CUTask;
 
 import javax.enterprise.concurrent.ContextService;
 import javax.enterprise.concurrent.ManagedTask;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedExecutorServiceImpl.java
Sat Jul  5 18:09:57 2014
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.impl;
+package org.apache.openejb.threads.impl;
 
 import org.apache.openejb.api.DestroyableResource;
-import org.apache.openejb.concurrencyutilities.ee.future.CUFuture;
-import org.apache.openejb.concurrencyutilities.ee.task.CUCallable;
-import org.apache.openejb.concurrencyutilities.ee.task.CURunnable;
+import org.apache.openejb.threads.future.CUFuture;
+import org.apache.openejb.threads.task.CUCallable;
+import org.apache.openejb.threads.task.CURunnable;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
 

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedScheduledExecutorServiceImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedScheduledExecutorServiceImpl.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedScheduledExecutorServiceImpl.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedScheduledExecutorServiceImpl.java
Sat Jul  5 18:09:57 2014
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.impl;
+package org.apache.openejb.threads.impl;
 
-import org.apache.openejb.concurrencyutilities.ee.future.CUScheduleFuture;
-import org.apache.openejb.concurrencyutilities.ee.task.CUCallable;
-import org.apache.openejb.concurrencyutilities.ee.task.CURunnable;
-import org.apache.openejb.concurrencyutilities.ee.task.TriggerCallable;
-import org.apache.openejb.concurrencyutilities.ee.task.TriggerRunnable;
-import org.apache.openejb.concurrencyutilities.ee.task.TriggerTask;
+import org.apache.openejb.threads.future.CUScheduleFuture;
+import org.apache.openejb.threads.task.CUCallable;
+import org.apache.openejb.threads.task.CURunnable;
+import org.apache.openejb.threads.task.TriggerCallable;
+import org.apache.openejb.threads.task.TriggerRunnable;
+import org.apache.openejb.threads.task.TriggerTask;
 
 import javax.enterprise.concurrent.ManagedScheduledExecutorService;
 import javax.enterprise.concurrent.ManagedTask;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedThreadFactoryImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedThreadFactoryImpl.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedThreadFactoryImpl.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/ManagedThreadFactoryImpl.java
Sat Jul  5 18:09:57 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.impl;
+package org.apache.openejb.threads.impl;
 
 import javax.enterprise.concurrent.ManageableThread;
 import javax.enterprise.concurrent.ManagedThreadFactory;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/reject/CURejectHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/reject/CURejectHandler.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/reject/CURejectHandler.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/reject/CURejectHandler.java
Sat Jul  5 18:09:57 2014
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.reject;
+package org.apache.openejb.threads.reject;
 
-import org.apache.openejb.concurrencyutilities.ee.task.ManagedTaskListenerTask;
+import org.apache.openejb.threads.task.ManagedTaskListenerTask;
 
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.RejectedExecutionHandler;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUCallable.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUCallable.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUCallable.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUCallable.java
Sat Jul  5 18:09:57 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.task;
+package org.apache.openejb.threads.task;
 
 import java.util.concurrent.Callable;
 

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CURunnable.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CURunnable.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CURunnable.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CURunnable.java
Sat Jul  5 18:09:57 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.task;
+package org.apache.openejb.threads.task;
 
 import java.util.concurrent.Callable;
 

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUTask.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUTask.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUTask.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/CUTask.java
Sat Jul  5 18:09:57 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.task;
+package org.apache.openejb.threads.task;
 
 import org.apache.openejb.OpenEJBRuntimeException;
 import org.apache.openejb.core.ThreadContext;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/ManagedTaskListenerTask.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/ManagedTaskListenerTask.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/ManagedTaskListenerTask.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/ManagedTaskListenerTask.java
Sat Jul  5 18:09:57 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.task;
+package org.apache.openejb.threads.task;
 
 import javax.enterprise.concurrent.ManagedExecutorService;
 import javax.enterprise.concurrent.ManagedTask;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerCallable.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerCallable.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerCallable.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerCallable.java
Sat Jul  5 18:09:57 2014
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.task;
+package org.apache.openejb.threads.task;
 
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedScheduledExecutorServiceImpl;
+import org.apache.openejb.threads.impl.ManagedScheduledExecutorServiceImpl;
 
 import javax.enterprise.concurrent.Trigger;
 import java.util.Date;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerRunnable.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerRunnable.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerRunnable.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerRunnable.java
Sat Jul  5 18:09:57 2014
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.task;
+package org.apache.openejb.threads.task;
 
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedScheduledExecutorServiceImpl;
+import org.apache.openejb.threads.impl.ManagedScheduledExecutorServiceImpl;
 
 import javax.enterprise.concurrent.Trigger;
 import java.util.Date;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerTask.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerTask.java?rev=1608091&r1=1608075&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerTask.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/threads/task/TriggerTask.java
Sat Jul  5 18:09:57 2014
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.ee.task;
+package org.apache.openejb.threads.task;
 
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedScheduledExecutorServiceImpl;
+import org.apache.openejb.threads.impl.ManagedScheduledExecutorServiceImpl;
 
 import javax.enterprise.concurrent.LastExecution;
 import javax.enterprise.concurrent.SkippedException;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?rev=1608091&r1=1608090&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
Sat Jul  5 18:09:57 2014
@@ -1115,31 +1115,31 @@
                    service="Resource"
                    types="ManagedExecutorService, javax.enterprise.concurrent.ManagedExecutorService"
                    factory-name="create"
-                   class-name="org.apache.openejb.concurrencyutilities.ee.factory.ManagedExecutorServiceImplFactory">
+                   class-name="org.apache.openejb.resource.thread.ManagedExecutorServiceImplFactory">
     Core = 5
     Max = 25
     KeepAlive = 5 s
     Queue = 15
-    ThreadFactory = org.apache.openejb.concurrencyutilities.ee.impl.ManagedThreadFactoryImpl
+    ThreadFactory = org.apache.openejb.threads.impl.ManagedThreadFactoryImpl
   </ServiceProvider>
   <ServiceProvider id="Default Scheduled Executor Service"
                    service="Resource"
                    types="ManagedScheduledExecutorService, javax.enterprise.concurrent.ManagedScheduledExecutorService"
                    factory-name="create"
-                   class-name="org.apache.openejb.concurrencyutilities.ee.factory.ManagedScheduledExecutorServiceImplFactory">
+                   class-name="org.apache.openejb.resource.thread.ManagedScheduledExecutorServiceImplFactory">
     Core = 5
-    ThreadFactory = org.apache.openejb.concurrencyutilities.ee.impl.ManagedThreadFactoryImpl
+    ThreadFactory = org.apache.openejb.threads.impl.ManagedThreadFactoryImpl
   </ServiceProvider>
   <ServiceProvider id="Default Managed Thread Factory"
                    service="Resource"
                    types="ManagedThreadFactory, javax.enterprise.concurrent.ManagedThreadFactory"
                    factory-name="create"
-                   class-name="org.apache.openejb.concurrencyutilities.ee.factory.ManagedThreadFactoryImplFactory">
+                   class-name="org.apache.openejb.resource.thread.ManagedThreadFactoryImplFactory">
     Prefix = openejb-managed-thread-
   </ServiceProvider>
   <ServiceProvider id="Default Context Service"
                    service="Resource"
                    types="ContextService, javax.enterprise.concurrent.ContextService"
-                   class-name="org.apache.openejb.concurrencyutilities.ee.impl.ContextServiceImpl"
/>
+                   class-name="org.apache.openejb.threads.impl.ContextServiceImpl" />
 
 </ServiceJar>

Copied: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ContextServiceTest.java
(from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ContextServiceTest.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ContextServiceTest.java?p2=tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ContextServiceTest.java&p1=tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ContextServiceTest.java&r1=1608075&r2=1608091&rev=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ContextServiceTest.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ContextServiceTest.java
Sat Jul  5 18:09:57 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.test;
+package org.apache.openejb.threads;
 
 import org.apache.openejb.core.ThreadContext;
 import org.apache.openejb.jee.EnterpriseBean;

Copied: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/CustomInjectionTest.java
(from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/CustomInjectionTest.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/CustomInjectionTest.java?p2=tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/CustomInjectionTest.java&p1=tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/CustomInjectionTest.java&r1=1608075&r2=1608091&rev=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/CustomInjectionTest.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/CustomInjectionTest.java
Sat Jul  5 18:09:57 2014
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.test;
+package org.apache.openejb.threads;
 
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedExecutorServiceImpl;
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedScheduledExecutorServiceImpl;
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedThreadFactoryImpl;
+import org.apache.openejb.threads.impl.ManagedExecutorServiceImpl;
+import org.apache.openejb.threads.impl.ManagedScheduledExecutorServiceImpl;
+import org.apache.openejb.threads.impl.ManagedThreadFactoryImpl;
 import org.apache.openejb.jee.EnterpriseBean;
 import org.apache.openejb.jee.SingletonBean;
 import org.apache.openejb.junit.ApplicationComposer;

Copied: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/InjectionTest.java
(from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/InjectionTest.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/InjectionTest.java?p2=tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/InjectionTest.java&p1=tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/InjectionTest.java&r1=1608075&r2=1608091&rev=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/InjectionTest.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/InjectionTest.java
Sat Jul  5 18:09:57 2014
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.test;
+package org.apache.openejb.threads;
 
-import org.apache.openejb.concurrencyutilities.ee.impl.ContextServiceImpl;
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedExecutorServiceImpl;
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedScheduledExecutorServiceImpl;
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedThreadFactoryImpl;
+import org.apache.openejb.threads.impl.ContextServiceImpl;
+import org.apache.openejb.threads.impl.ManagedExecutorServiceImpl;
+import org.apache.openejb.threads.impl.ManagedScheduledExecutorServiceImpl;
+import org.apache.openejb.threads.impl.ManagedThreadFactoryImpl;
 import org.apache.openejb.core.ThreadContext;
 import org.apache.openejb.jee.EnterpriseBean;
 import org.apache.openejb.jee.SingletonBean;

Copied: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedExecutorServiceTest.java
(from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedExecutorServiceTest.java?p2=tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedExecutorServiceTest.java&p1=tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java&r1=1608075&r2=1608091&rev=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedExecutorServiceTest.java
Sat Jul  5 18:09:57 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.test;
+package org.apache.openejb.threads;
 
 import org.apache.openejb.core.ThreadContext;
 import org.apache.openejb.junit.ApplicationComposer;

Copied: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedScheduledExecutorServiceImplFactoryTest.java
(from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedScheduledExecutorServiceImplFactoryTest.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedScheduledExecutorServiceImplFactoryTest.java?p2=tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedScheduledExecutorServiceImplFactoryTest.java&p1=tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedScheduledExecutorServiceImplFactoryTest.java&r1=1608075&r2=1608091&rev=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedScheduledExecutorServiceImplFactoryTest.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedScheduledExecutorServiceImplFactoryTest.java
Sat Jul  5 18:09:57 2014
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.openejb.concurrencyutilities.test;
+package org.apache.openejb.threads;
 
-import org.apache.openejb.concurrencyutilities.ee.factory.ManagedScheduledExecutorServiceImplFactory;
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedScheduledExecutorServiceImpl;
-import org.apache.openejb.concurrencyutilities.ee.impl.ManagedThreadFactoryImpl;
+import org.apache.openejb.resource.thread.ManagedScheduledExecutorServiceImplFactory;
+import org.apache.openejb.threads.impl.ManagedScheduledExecutorServiceImpl;
+import org.apache.openejb.threads.impl.ManagedThreadFactoryImpl;
 import org.junit.Assert;
 import org.junit.Test;
 

Copied: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedScheduledExecutorServiceTest.java
(from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedScheduledExecutorServiceTest.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedScheduledExecutorServiceTest.java?p2=tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedScheduledExecutorServiceTest.java&p1=tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedScheduledExecutorServiceTest.java&r1=1608075&r2=1608091&rev=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedScheduledExecutorServiceTest.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/ManagedScheduledExecutorServiceTest.java
Sat Jul  5 18:09:57 2014
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.test;
+package org.apache.openejb.threads;
 
-import org.apache.openejb.concurrencyutilities.ee.factory.ManagedScheduledExecutorServiceImplFactory;
+import org.apache.openejb.resource.thread.ManagedScheduledExecutorServiceImplFactory;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.ri.sp.PseudoSecurityService;
 import org.apache.openejb.spi.SecurityService;

Copied: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/SecurityPropagationTest.java
(from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/SecurityPropagationTest.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/SecurityPropagationTest.java?p2=tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/SecurityPropagationTest.java&p1=tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/SecurityPropagationTest.java&r1=1608075&r2=1608091&rev=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/SecurityPropagationTest.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/SecurityPropagationTest.java
Sat Jul  5 18:09:57 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.test;
+package org.apache.openejb.threads;
 
 import org.apache.openejb.jee.EnterpriseBean;
 import org.apache.openejb.jee.StatelessBean;

Copied: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/TransactionPropagationTest.java
(from r1608075, tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/TransactionPropagationTest.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/TransactionPropagationTest.java?p2=tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/TransactionPropagationTest.java&p1=tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/TransactionPropagationTest.java&r1=1608075&r2=1608091&rev=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/TransactionPropagationTest.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/threads/TransactionPropagationTest.java
Sat Jul  5 18:09:57 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.openejb.concurrencyutilities.test;
+package org.apache.openejb.threads;
 
 import org.apache.openejb.OpenEJB;
 import org.apache.openejb.junit.ApplicationComposer;

Modified: tomee/tomee/trunk/container/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/pom.xml?rev=1608091&r1=1608090&r2=1608091&view=diff
==============================================================================
--- tomee/tomee/trunk/container/pom.xml (original)
+++ tomee/tomee/trunk/container/pom.xml Sat Jul  5 18:09:57 2014
@@ -38,6 +38,5 @@
     <module>openejb-jee-accessors</module>
     <module>openejb-junit</module>
     <module>openejb-jpa-integration</module>
-    <module>openejb-concurrency-utilities-ee</module>
   </modules>
 </project>



Mime
View raw message