[pkg-eucalyptus-commits] r318 - in mule/trunk/debian: . patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Aug 7 10:51:11 UTC 2014
Author: ebourg-guest
Date: 2014-08-07 10:51:11 +0000 (Thu, 07 Aug 2014)
New Revision: 318
Added:
mule/trunk/debian/patches/drop-backport-util-concurrent.diff
Modified:
mule/trunk/debian/changelog
mule/trunk/debian/control
mule/trunk/debian/patches/series
mule/trunk/debian/rules
Log:
Removed the dependency on backport-util-concurrent
Modified: mule/trunk/debian/changelog
===================================================================
--- mule/trunk/debian/changelog 2014-08-07 09:38:55 UTC (rev 317)
+++ mule/trunk/debian/changelog 2014-08-07 10:51:11 UTC (rev 318)
@@ -1,5 +1,7 @@
mule (2.0.1-7) UNRELEASED; urgency=medium
+ * Team upload.
+ * Removed the dependency on backport-util-concurrent
* debian/control:
- Removed the JRE dependency on libmule-java-2.0
- Removed the non existent build dependency on libjetty6-java
Modified: mule/trunk/debian/control
===================================================================
--- mule/trunk/debian/control 2014-08-07 09:38:55 UTC (rev 317)
+++ mule/trunk/debian/control 2014-08-07 10:51:11 UTC (rev 318)
@@ -13,7 +13,6 @@
libaxis-java,
libaopalliance-java,
libantlr-java,
- libbackport-util-concurrent-java,
bsh,
libproxool-java,
libcommons-attributes-java,
Added: mule/trunk/debian/patches/drop-backport-util-concurrent.diff
===================================================================
--- mule/trunk/debian/patches/drop-backport-util-concurrent.diff (rev 0)
+++ mule/trunk/debian/patches/drop-backport-util-concurrent.diff 2014-08-07 10:51:11 UTC (rev 318)
@@ -0,0 +1,1799 @@
+Description: Remove the dependency on backport-util-concurrent
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/core/src/main/java/org/mule/AbstractExceptionListener.java
++++ b/core/src/main/java/org/mule/AbstractExceptionListener.java
+@@ -41,8 +41,8 @@
+ import java.util.Iterator;
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/DefaultMessageCollection.java
++++ b/core/src/main/java/org/mule/DefaultMessageCollection.java
+@@ -19,7 +19,7 @@
+ import java.util.Iterator;
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.CopyOnWriteArrayList;
+
+ /**
+ * A {@link org.mule.api.MuleMessage} type that manages a collection of MuleMessage Objects.
+--- a/core/src/main/java/org/mule/DefaultMuleEventContext.java
++++ b/core/src/main/java/org/mule/DefaultMuleEventContext.java
+@@ -30,7 +30,7 @@
+
+ import java.io.OutputStream;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.Callable;
++import java.util.concurrent.Callable;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/DefaultMuleMessage.java
++++ b/core/src/main/java/org/mule/DefaultMuleMessage.java
+@@ -33,7 +33,7 @@
+
+ import javax.activation.DataHandler;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.CopyOnWriteArrayList;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/api/FutureMessageResult.java
++++ b/core/src/main/java/org/mule/api/FutureMessageResult.java
+@@ -16,13 +16,13 @@
+
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.Callable;
+-import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException;
+-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
+-import edu.emory.mathcs.backport.java.util.concurrent.Executors;
+-import edu.emory.mathcs.backport.java.util.concurrent.FutureTask;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeoutException;
++import java.util.concurrent.Callable;
++import java.util.concurrent.ExecutionException;
++import java.util.concurrent.Executor;
++import java.util.concurrent.Executors;
++import java.util.concurrent.FutureTask;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeoutException;
+
+ /**
+ * <code>FutureMessageResult</code> is an MuleMessage result of a remote invocation
+--- a/core/src/main/java/org/mule/api/config/ThreadingProfile.java
++++ b/core/src/main/java/org/mule/api/config/ThreadingProfile.java
+@@ -15,9 +15,9 @@
+
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionHandler;
+-import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
+-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
++import java.util.concurrent.RejectedExecutionHandler;
++import java.util.concurrent.ThreadFactory;
++import java.util.concurrent.ThreadPoolExecutor;
+
+ import org.apache.commons.collections.map.CaseInsensitiveMap;
+
+--- a/core/src/main/java/org/mule/api/context/WorkManager.java
++++ b/core/src/main/java/org/mule/api/context/WorkManager.java
+@@ -13,7 +13,7 @@
+ import org.mule.api.lifecycle.Disposable;
+ import org.mule.api.lifecycle.Startable;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
++import java.util.concurrent.Executor;
+
+ /**
+ * <code>WorkManager</code> extends the standard JCA WorkManager with lifecycle
+--- a/core/src/main/java/org/mule/api/context/notification/ServerNotification.java
++++ b/core/src/main/java/org/mule/api/context/notification/ServerNotification.java
+@@ -17,7 +17,7 @@
+ import java.util.EventObject;
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * <code>ServerNotification</code> is an event triggered by something happening
+--- a/core/src/main/java/org/mule/api/work/WorkExecutor.java
++++ b/core/src/main/java/org/mule/api/work/WorkExecutor.java
+@@ -31,7 +31,7 @@
+
+ import javax.resource.spi.work.WorkException;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
++import java.util.concurrent.Executor;
+
+ /**
+ * <code>WorkExecutor</code> TODO
+--- a/core/src/main/java/org/mule/component/AbstractComponent.java
++++ b/core/src/main/java/org/mule/component/AbstractComponent.java
+@@ -25,7 +25,7 @@
+ import org.mule.config.i18n.MessageFactory;
+ import org.mule.management.stats.ComponentStatistics;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/component/SimpleCallableJavaComponent.java
++++ b/core/src/main/java/org/mule/component/SimpleCallableJavaComponent.java
+@@ -29,7 +29,7 @@
+ import org.mule.object.SingletonObjectFactory;
+ import org.mule.transformer.TransformerTemplate;
+
+-import edu.emory.mathcs.backport.java.util.Collections;
++import java.util.Collections;
+
+ /**
+ * Simple {@link JavaComponent} implementation to be used when
+--- a/core/src/main/java/org/mule/config/ChainedThreadingProfile.java
++++ b/core/src/main/java/org/mule/config/ChainedThreadingProfile.java
+@@ -13,9 +13,9 @@
+ import org.mule.api.config.ThreadingProfile;
+ import org.mule.api.context.WorkManager;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionHandler;
+-import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
+-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
++import java.util.concurrent.RejectedExecutionHandler;
++import java.util.concurrent.ThreadFactory;
++import java.util.concurrent.ThreadPoolExecutor;
+
+ /**
+ * This was written (perhaps too far in advance) with an eye to how we will manage default values
+--- a/core/src/main/java/org/mule/config/ImmutableThreadingProfile.java
++++ b/core/src/main/java/org/mule/config/ImmutableThreadingProfile.java
+@@ -17,13 +17,13 @@
+ import org.mule.util.concurrent.WaitPolicy;
+ import org.mule.work.MuleWorkManager;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue;
+-import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingDeque;
+-import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionHandler;
+-import edu.emory.mathcs.backport.java.util.concurrent.SynchronousQueue;
+-import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
+-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.BlockingQueue;
++import java.util.concurrent.LinkedBlockingDeque;
++import java.util.concurrent.RejectedExecutionHandler;
++import java.util.concurrent.SynchronousQueue;
++import java.util.concurrent.ThreadFactory;
++import java.util.concurrent.ThreadPoolExecutor;
++import java.util.concurrent.TimeUnit;
+
+
+ public class ImmutableThreadingProfile implements ThreadingProfile
+--- a/core/src/main/java/org/mule/context/notification/Policy.java
++++ b/core/src/main/java/org/mule/context/notification/Policy.java
+@@ -20,8 +20,8 @@
+ import java.util.Map;
+ import java.util.Set;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentMap;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentMap;
+
+ /**
+ * For a particular configuration, this describes what events should be delivered where.
+--- a/core/src/main/java/org/mule/context/notification/ServerNotificationManager.java
++++ b/core/src/main/java/org/mule/context/notification/ServerNotificationManager.java
+@@ -27,9 +27,9 @@
+ import javax.resource.spi.work.WorkException;
+ import javax.resource.spi.work.WorkListener;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.BlockingDeque;
+-import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingDeque;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.BlockingDeque;
++import java.util.concurrent.LinkedBlockingDeque;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/endpoint/AbstractEndpoint.java
++++ b/core/src/main/java/org/mule/endpoint/AbstractEndpoint.java
+@@ -29,7 +29,7 @@
+ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
+
+-import edu.emory.mathcs.backport.java.util.Collections;
++import java.util.Collections;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+
+--- a/core/src/main/java/org/mule/endpoint/URIBuilder.java
++++ b/core/src/main/java/org/mule/endpoint/URIBuilder.java
+@@ -22,7 +22,7 @@
+ import java.util.StringTokenizer;
+ import java.util.TreeMap;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicReference;
++import java.util.concurrent.atomic.AtomicReference;
+
+ /**
+ * This has the following logic:
+--- a/core/src/main/java/org/mule/model/AbstractModel.java
++++ b/core/src/main/java/org/mule/model/AbstractModel.java
+@@ -29,7 +29,7 @@
+ import java.util.Collection;
+ import java.util.Iterator;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/model/resolvers/AbstractEntryPointResolver.java
++++ b/core/src/main/java/org/mule/model/resolvers/AbstractEntryPointResolver.java
+@@ -21,7 +21,7 @@
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/model/resolvers/DefaultEntryPointResolverSet.java
++++ b/core/src/main/java/org/mule/model/resolvers/DefaultEntryPointResolverSet.java
+@@ -20,7 +20,7 @@
+ import java.util.List;
+ import java.util.Set;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.CopyOnWriteArrayList;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/registry/AbstractRegistry.java
++++ b/core/src/main/java/org/mule/registry/AbstractRegistry.java
+@@ -46,7 +46,7 @@
+ import java.util.List;
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/routing/AbstractRouterCollection.java
++++ b/core/src/main/java/org/mule/routing/AbstractRouterCollection.java
+@@ -23,7 +23,7 @@
+ import java.util.Iterator;
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.CopyOnWriteArrayList;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/routing/EventCorrelator.java
++++ b/core/src/main/java/org/mule/routing/EventCorrelator.java
+@@ -30,10 +30,10 @@
+ import javax.resource.spi.work.Work;
+ import javax.resource.spi.work.WorkException;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentMap;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentMap;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ import org.apache.commons.collections.buffer.BoundedFifoBuffer;
+ import org.apache.commons.logging.Log;
+--- a/core/src/main/java/org/mule/routing/inbound/AbstractEventResequencer.java
++++ b/core/src/main/java/org/mule/routing/inbound/AbstractEventResequencer.java
+@@ -16,8 +16,8 @@
+ import java.util.Arrays;
+ import java.util.Comparator;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentMap;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentMap;
+
+ /**
+ * <code>AbstractEventResequencer</code> is used to receive a set of events,
+--- a/core/src/main/java/org/mule/routing/inbound/DefaultInboundRouterCollection.java
++++ b/core/src/main/java/org/mule/routing/inbound/DefaultInboundRouterCollection.java
+@@ -30,7 +30,7 @@
+ import java.util.Iterator;
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.CopyOnWriteArrayList;
+
+ /**
+ * <code>DefaultInboundRouterCollection</code> is a collection of routers that will be
+--- a/core/src/main/java/org/mule/routing/inbound/EventGroup.java
++++ b/core/src/main/java/org/mule/routing/inbound/EventGroup.java
+@@ -20,8 +20,6 @@
+ import java.util.Iterator;
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.helpers.Utils;
+-
+ import org.apache.commons.collections.IteratorUtils;
+
+ /**
+@@ -52,7 +50,7 @@
+ public EventGroup(Object groupId, int expectedSize)
+ {
+ super();
+- this.created = Utils.nanoTime();
++ this.created = System.nanoTime();
+ this.events = new ArrayList(expectedSize > 0 ? expectedSize : 10);
+ this.expectedSize = expectedSize;
+ this.groupId = groupId;
+--- a/core/src/main/java/org/mule/routing/inbound/IdempotentInMemoryMessageIdStore.java
++++ b/core/src/main/java/org/mule/routing/inbound/IdempotentInMemoryMessageIdStore.java
+@@ -16,10 +16,9 @@
+
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentSkipListMap;
+-import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.helpers.Utils;
++import java.util.concurrent.ConcurrentSkipListMap;
++import java.util.concurrent.ScheduledThreadPoolExecutor;
++import java.util.concurrent.TimeUnit;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+@@ -112,7 +111,7 @@
+ boolean written = false;
+ while (!written)
+ {
+- written = (store.putIfAbsent(new Long(Utils.nanoTime()), id) == null);
++ written = (store.putIfAbsent(new Long(System.nanoTime()), id) == null);
+ }
+
+ return true;
+@@ -143,7 +142,7 @@
+ // expire further if entry TTLs are enabled
+ if (entryTTL > 0 && currentSize != 0)
+ {
+- final long now = Utils.nanoTime();
++ final long now = System.nanoTime();
+ int expiredEntries = 0;
+ Map.Entry oldestEntry;
+
+--- a/core/src/main/java/org/mule/routing/nested/NestedInvocationHandler.java
++++ b/core/src/main/java/org/mule/routing/nested/NestedInvocationHandler.java
+@@ -22,7 +22,7 @@
+ import java.lang.reflect.Method;
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/routing/outbound/AbstractOutboundRouter.java
++++ b/core/src/main/java/org/mule/routing/outbound/AbstractOutboundRouter.java
+@@ -29,7 +29,7 @@
+ import java.util.Iterator;
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.CopyOnWriteArrayList;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/routing/outbound/AbstractRecipientList.java
++++ b/core/src/main/java/org/mule/routing/outbound/AbstractRecipientList.java
+@@ -25,8 +25,8 @@
+ import java.util.Iterator;
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentMap;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentMap;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/routing/response/DefaultResponseRouterCollection.java
++++ b/core/src/main/java/org/mule/routing/response/DefaultResponseRouterCollection.java
+@@ -27,7 +27,7 @@
+ import java.util.Iterator;
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.CopyOnWriteArrayList;
+
+ /**
+ * <code>DefaultResponseRouterCollection</code> is a router that can be used to control how
+--- a/core/src/main/java/org/mule/security/MuleSecurityManager.java
++++ b/core/src/main/java/org/mule/security/MuleSecurityManager.java
+@@ -29,7 +29,7 @@
+ import java.util.List;
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/service/AbstractService.java
++++ b/core/src/main/java/org/mule/service/AbstractService.java
+@@ -53,7 +53,7 @@
+ import java.util.Iterator;
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/transaction/AbstractSingleResourceTransaction.java
++++ b/core/src/main/java/org/mule/transaction/AbstractSingleResourceTransaction.java
+@@ -13,7 +13,7 @@
+ import org.mule.api.transaction.TransactionException;
+ import org.mule.config.i18n.CoreMessages;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ /**
+ * This abstract class can be used as a base class for transactions that can enlist
+--- a/core/src/main/java/org/mule/transformer/AbstractTransformer.java
++++ b/core/src/main/java/org/mule/transformer/AbstractTransformer.java
+@@ -29,7 +29,7 @@
+
+ import javax.xml.transform.stream.StreamSource;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.CopyOnWriteArrayList;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/transport/AbstractConnector.java
++++ b/core/src/main/java/org/mule/transport/AbstractConnector.java
+@@ -78,14 +78,14 @@
+ import javax.resource.spi.work.WorkEvent;
+ import javax.resource.spi.work.WorkListener;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentMap;
+-import edu.emory.mathcs.backport.java.util.concurrent.ScheduledExecutorService;
+-import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor;
+-import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicReference;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentMap;
++import java.util.concurrent.ScheduledExecutorService;
++import java.util.concurrent.ScheduledThreadPoolExecutor;
++import java.util.concurrent.ThreadFactory;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicReference;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/transport/AbstractMessageAdapter.java
++++ b/core/src/main/java/org/mule/transport/AbstractMessageAdapter.java
+@@ -34,10 +34,10 @@
+
+ import javax.activation.DataHandler;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentMap;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicReference;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentMap;
++import java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicReference;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/transport/AbstractMessageReceiver.java
++++ b/core/src/main/java/org/mule/transport/AbstractMessageReceiver.java
+@@ -45,7 +45,7 @@
+
+ import java.io.OutputStream;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/transport/AbstractPollingMessageReceiver.java
++++ b/core/src/main/java/org/mule/transport/AbstractPollingMessageReceiver.java
+@@ -22,11 +22,11 @@
+ import java.util.LinkedList;
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.Future;
+-import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionException;
+-import edu.emory.mathcs.backport.java.util.concurrent.ScheduledExecutorService;
+-import edu.emory.mathcs.backport.java.util.concurrent.ScheduledFuture;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.Future;
++import java.util.concurrent.RejectedExecutionException;
++import java.util.concurrent.ScheduledExecutorService;
++import java.util.concurrent.ScheduledFuture;
++import java.util.concurrent.TimeUnit;
+
+ /**
+ * <code>AbstractPollingMessageReceiver</code> implements a base class for polling
+--- a/core/src/main/java/org/mule/transport/MessagePropertiesContext.java
++++ b/core/src/main/java/org/mule/transport/MessagePropertiesContext.java
+@@ -22,7 +22,7 @@
+ import java.util.TreeMap;
+ import java.util.TreeSet;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /** TODO */
+ public class MessagePropertiesContext implements Serializable
+--- a/core/src/main/java/org/mule/transport/SimpleRetryConnectionStrategy.java
++++ b/core/src/main/java/org/mule/transport/SimpleRetryConnectionStrategy.java
+@@ -15,7 +15,7 @@
+ import org.mule.config.i18n.CoreMessages;
+ import org.mule.util.ObjectUtils;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ /**
+ * A simple connection retry strategy where the a connection will be attempted X
+--- a/core/src/main/java/org/mule/transport/TransactedPollingMessageReceiver.java
++++ b/core/src/main/java/org/mule/transport/TransactedPollingMessageReceiver.java
+@@ -24,8 +24,8 @@
+
+ import javax.resource.spi.work.Work;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ /**
+ * The TransactedPollingMessageReceiver is an abstract receiver that handles polling
+--- a/core/src/main/java/org/mule/util/PropertiesUtils.java
++++ b/core/src/main/java/org/mule/util/PropertiesUtils.java
+@@ -21,7 +21,7 @@
+ import java.util.Map;
+ import java.util.Properties;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.CopyOnWriteArrayList;
+
+ /**
+ * <code>PropertiesHelper</code> is a utility class for manipulating and filtering
+--- a/core/src/main/java/org/mule/util/concurrent/ConcurrentHashSet.java
++++ b/core/src/main/java/org/mule/util/concurrent/ConcurrentHashSet.java
+@@ -23,7 +23,7 @@
+ import java.util.Iterator;
+ import java.util.Set;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ public class ConcurrentHashSet/* <E> */extends AbstractSet/* <E> */implements Set/* <E> */, Serializable
+ {
+--- a/core/src/main/java/org/mule/util/concurrent/DaemonThreadFactory.java
++++ b/core/src/main/java/org/mule/util/concurrent/DaemonThreadFactory.java
+@@ -10,7 +10,7 @@
+
+ package org.mule.util.concurrent;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
++import java.util.concurrent.ThreadFactory;
+
+ public class DaemonThreadFactory extends NamedThreadFactory implements ThreadFactory
+ {
+--- a/core/src/main/java/org/mule/util/concurrent/Latch.java
++++ b/core/src/main/java/org/mule/util/concurrent/Latch.java
+@@ -10,7 +10,7 @@
+
+ package org.mule.util.concurrent;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
++import java.util.concurrent.CountDownLatch;
+
+ // @ThreadSafe
+ public class Latch extends CountDownLatch
+--- a/core/src/main/java/org/mule/util/concurrent/NamedThreadFactory.java
++++ b/core/src/main/java/org/mule/util/concurrent/NamedThreadFactory.java
+@@ -12,8 +12,8 @@
+
+ import org.mule.util.StringUtils;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
++import java.util.concurrent.ThreadFactory;
++import java.util.concurrent.atomic.AtomicLong;
+
+ public class NamedThreadFactory implements ThreadFactory
+ {
+--- a/core/src/main/java/org/mule/util/concurrent/SynchronizedVariable.java
++++ b/core/src/main/java/org/mule/util/concurrent/SynchronizedVariable.java
+@@ -10,7 +10,7 @@
+
+ package org.mule.util.concurrent;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
++import java.util.concurrent.Executor;
+
+ // @ThreadSafe
+ public abstract class SynchronizedVariable implements Executor
+--- a/core/src/main/java/org/mule/util/concurrent/WaitPolicy.java
++++ b/core/src/main/java/org/mule/util/concurrent/WaitPolicy.java
+@@ -10,10 +10,10 @@
+
+ package org.mule.util.concurrent;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionException;
+-import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionHandler;
+-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.RejectedExecutionException;
++import java.util.concurrent.RejectedExecutionHandler;
++import java.util.concurrent.ThreadPoolExecutor;
++import java.util.concurrent.TimeUnit;
+
+ /**
+ * A handler for unexecutable tasks that waits until the task can be submitted for
+--- a/core/src/main/java/org/mule/util/expression/ExpressionEvaluatorManager.java
++++ b/core/src/main/java/org/mule/util/expression/ExpressionEvaluatorManager.java
+@@ -15,8 +15,8 @@
+
+ import java.util.Iterator;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentMap;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentMap;
+
+ /**
+ * Provides universal access for evaluating expressions embedded in Mule configurations, such as Xml, Java,
+--- a/core/src/main/java/org/mule/util/expression/FunctionExpressionEvaluator.java
++++ b/core/src/main/java/org/mule/util/expression/FunctionExpressionEvaluator.java
+@@ -19,7 +19,7 @@
+ import java.sql.Timestamp;
+ import java.util.Date;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
++import java.util.concurrent.atomic.AtomicLong;
+
+ /**
+ * This property extractor doesn't actually extract a property from the message, instead it allows for certain functions
+--- a/core/src/main/java/org/mule/util/monitor/ExpiryMonitor.java
++++ b/core/src/main/java/org/mule/util/monitor/ExpiryMonitor.java
+@@ -17,7 +17,7 @@
+ import java.util.Timer;
+ import java.util.TimerTask;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/util/pool/DefaultLifecycleEnabledObjectPool.java
++++ b/core/src/main/java/org/mule/util/pool/DefaultLifecycleEnabledObjectPool.java
+@@ -24,7 +24,7 @@
+ import java.util.LinkedList;
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/work/MuleWorkManager.java
++++ b/core/src/main/java/org/mule/work/MuleWorkManager.java
+@@ -42,9 +42,9 @@
+ import javax.resource.spi.work.WorkException;
+ import javax.resource.spi.work.WorkListener;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
+-import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.Executor;
++import java.util.concurrent.ExecutorService;
++import java.util.concurrent.TimeUnit;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/main/java/org/mule/work/ScheduleWorkExecutor.java
++++ b/core/src/main/java/org/mule/work/ScheduleWorkExecutor.java
+@@ -31,7 +31,7 @@
+
+ import javax.resource.spi.work.WorkException;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
++import java.util.concurrent.Executor;
+
+ public class ScheduleWorkExecutor implements WorkExecutor
+ {
+--- a/core/src/main/java/org/mule/work/StartWorkExecutor.java
++++ b/core/src/main/java/org/mule/work/StartWorkExecutor.java
+@@ -32,7 +32,7 @@
+
+ import javax.resource.spi.work.WorkException;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
++import java.util.concurrent.Executor;
+
+ public class StartWorkExecutor implements WorkExecutor
+ {
+--- a/core/src/main/java/org/mule/work/SyncWorkExecutor.java
++++ b/core/src/main/java/org/mule/work/SyncWorkExecutor.java
+@@ -31,7 +31,7 @@
+
+ import javax.resource.spi.work.WorkException;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
++import java.util.concurrent.Executor;
+
+ public class SyncWorkExecutor implements WorkExecutor
+ {
+--- a/core/src/test/java/org/mule/DefaultExceptionStrategyTestCase.java
++++ b/core/src/test/java/org/mule/DefaultExceptionStrategyTestCase.java
+@@ -15,9 +15,9 @@
+ import org.mule.context.notification.ExceptionNotification;
+ import org.mule.tck.AbstractMuleTestCase;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ public class DefaultExceptionStrategyTestCase extends AbstractMuleTestCase
+ {
+--- a/core/src/test/java/org/mule/api/FutureMessageResultTestCase.java
++++ b/core/src/test/java/org/mule/api/FutureMessageResultTestCase.java
+@@ -14,12 +14,12 @@
+ import org.mule.api.transformer.TransformerException;
+ import org.mule.tck.AbstractMuleTestCase;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.Callable;
+-import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException;
+-import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
+-import edu.emory.mathcs.backport.java.util.concurrent.Executors;
+-import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionException;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeoutException;
++import java.util.concurrent.Callable;
++import java.util.concurrent.ExecutionException;
++import java.util.concurrent.ExecutorService;
++import java.util.concurrent.Executors;
++import java.util.concurrent.RejectedExecutionException;
++import java.util.concurrent.TimeoutException;
+
+ public class FutureMessageResultTestCase extends AbstractMuleTestCase
+ {
+--- a/core/src/test/java/org/mule/management/ServerNotificationsTestCase.java
++++ b/core/src/test/java/org/mule/management/ServerNotificationsTestCase.java
+@@ -22,10 +22,10 @@
+ import org.mule.tck.AbstractMuleTestCase;
+ import org.mule.tck.testmodels.fruit.Apple;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ public class ServerNotificationsTestCase extends AbstractMuleTestCase
+ implements ModelNotificationListener, MuleContextNotificationListener
+--- a/core/src/test/java/org/mule/registry/RequestContextTestCase.java
++++ b/core/src/test/java/org/mule/registry/RequestContextTestCase.java
+@@ -28,7 +28,7 @@
+
+ import java.io.OutputStream;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ public class RequestContextTestCase extends AbstractMuleTestCase
+ {
+--- a/core/src/test/java/org/mule/tck/AbstractMuleTestCase.java
++++ b/core/src/test/java/org/mule/tck/AbstractMuleTestCase.java
+@@ -56,7 +56,7 @@
+ import junit.framework.TestCase;
+ import junit.framework.TestResult;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ import org.apache.commons.collections.IteratorUtils;
+ import org.apache.commons.collections.Predicate;
+--- a/core/src/test/java/org/mule/tck/TestCaseWatchdog.java
++++ b/core/src/test/java/org/mule/tck/TestCaseWatchdog.java
+@@ -10,8 +10,8 @@
+
+ package org.mule.tck;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/core/src/test/java/org/mule/tck/TestCaseWatchdogTimeoutHandler.java
++++ b/core/src/test/java/org/mule/tck/TestCaseWatchdogTimeoutHandler.java
+@@ -10,7 +10,7 @@
+
+ package org.mule.tck;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ public interface TestCaseWatchdogTimeoutHandler
+ {
+--- a/core/src/test/java/org/mule/tck/testmodels/mule/TestTransaction.java
++++ b/core/src/test/java/org/mule/tck/testmodels/mule/TestTransaction.java
+@@ -12,7 +12,7 @@
+ import org.mule.api.transaction.TransactionException;
+ import org.mule.transaction.AbstractSingleResourceTransaction;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ /**
+ * A test transaction that does nothing on commit or rollback. The transaction does retain a status so that
+--- a/core/src/test/java/org/mule/transaction/TransactionNotificationsTestCase.java
++++ b/core/src/test/java/org/mule/transaction/TransactionNotificationsTestCase.java
+@@ -17,8 +17,8 @@
+ import org.mule.context.notification.TransactionNotification;
+ import org.mule.tck.AbstractMuleTestCase;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ public class TransactionNotificationsTestCase extends AbstractMuleTestCase
+ {
+--- a/core/src/test/java/org/mule/util/concurrent/WaitPolicyTestCase.java
++++ b/core/src/test/java/org/mule/util/concurrent/WaitPolicyTestCase.java
+@@ -20,12 +20,12 @@
+ import java.util.List;
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
+-import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionException;
+-import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+-import edu.emory.mathcs.backport.java.util.concurrent.locks.ReentrantLock;
++import java.util.concurrent.LinkedBlockingQueue;
++import java.util.concurrent.RejectedExecutionException;
++import java.util.concurrent.ThreadPoolExecutor;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.locks.ReentrantLock;
+
+ public class WaitPolicyTestCase extends AbstractMuleTestCase
+ {
+--- a/examples/loanbroker/common-tests/src/main/java/org/mule/example/loanbroker/tests/AbstractAsynchronousLoanBrokerTestCase.java
++++ b/examples/loanbroker/common-tests/src/main/java/org/mule/example/loanbroker/tests/AbstractAsynchronousLoanBrokerTestCase.java
+@@ -22,7 +22,7 @@
+
+ import java.beans.ExceptionListener;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
++import java.util.concurrent.CountDownLatch;
+
+ import org.apache.commons.lang.time.StopWatch;
+
+--- a/examples/loanbroker/common/src/main/java/org/mule/example/loanbroker/DefaultLoanBroker.java
++++ b/examples/loanbroker/common/src/main/java/org/mule/example/loanbroker/DefaultLoanBroker.java
+@@ -16,7 +16,7 @@
+ import org.mule.example.loanbroker.messages.LoanBrokerQuoteRequest;
+ import org.mule.example.loanbroker.messages.LoanQuote;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+
+--- a/modules/client/src/main/java/org/mule/module/client/MuleClient.java
++++ b/modules/client/src/main/java/org/mule/module/client/MuleClient.java
+@@ -58,9 +58,9 @@
+ import java.util.List;
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.Callable;
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentMap;
++import java.util.concurrent.Callable;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentMap;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/modules/client/src/main/java/org/mule/module/client/RemoteDispatcher.java
++++ b/modules/client/src/main/java/org/mule/module/client/RemoteDispatcher.java
+@@ -48,8 +48,8 @@
+ import java.io.InputStream;
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.Callable;
+-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
++import java.util.concurrent.Callable;
++import java.util.concurrent.Executor;
+
+ import org.apache.commons.lang.SerializationUtils;
+ import org.apache.commons.logging.Log;
+--- a/modules/jca/jca-core/src/main/java/org/mule/module/jca/DelegateWorkManager.java
++++ b/modules/jca/jca-core/src/main/java/org/mule/module/jca/DelegateWorkManager.java
+@@ -17,7 +17,7 @@
+ import javax.resource.spi.work.WorkException;
+ import javax.resource.spi.work.WorkListener;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionException;
++import java.util.concurrent.RejectedExecutionException;
+
+ /**
+ * <code>DelegateWorkManager</code> is a wrapper around a WorkManager provided by a
+--- a/modules/management/src/main/java/org/mule/module/management/agent/JmxAgent.java
++++ b/modules/management/src/main/java/org/mule/module/management/agent/JmxAgent.java
+@@ -67,7 +67,7 @@
+ import javax.management.remote.JMXServiceURL;
+ import javax.management.remote.rmi.RMIConnectorServer;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/modules/management/src/main/java/org/mule/module/management/agent/WrapperManagerAgent.java
++++ b/modules/management/src/main/java/org/mule/module/management/agent/WrapperManagerAgent.java
+@@ -28,7 +28,7 @@
+ import javax.management.MalformedObjectNameException;
+ import javax.management.ObjectName;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicReference;
++import java.util.concurrent.atomic.AtomicReference;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/modules/management/src/main/java/org/mule/module/management/mbean/YourKitProfilerService.java
++++ b/modules/management/src/main/java/org/mule/module/management/mbean/YourKitProfilerService.java
+@@ -14,7 +14,7 @@
+
+ import com.yourkit.api.Controller;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/modules/persistence/src/main/java/org/mule/persistence/manager/QueuePersistenceManager.java
++++ b/modules/persistence/src/main/java/org/mule/persistence/manager/QueuePersistenceManager.java
+@@ -15,7 +15,7 @@
+ import org.mule.umo.lifecycle.InitialisationException;
+ import org.mule.umo.lifecycle.RecoverableException;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentLinkedQueue;
++import java.util.concurrent.ConcurrentLinkedQueue;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/modules/spring-config/src/main/java/org/mule/config/spring/jndi/SpringInitialContextFactory.java
++++ b/modules/spring-config/src/main/java/org/mule/config/spring/jndi/SpringInitialContextFactory.java
+@@ -18,7 +18,7 @@
+ import javax.naming.NamingException;
+ import javax.naming.spi.InitialContextFactory;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/modules/spring-config/src/main/java/org/mule/config/spring/parsers/delegate/AbstractSerialDelegatingDefinitionParser.java
++++ b/modules/spring-config/src/main/java/org/mule/config/spring/parsers/delegate/AbstractSerialDelegatingDefinitionParser.java
+@@ -22,7 +22,7 @@
+ import java.util.Iterator;
+ import java.util.Set;
+
+-import edu.emory.mathcs.backport.java.util.Arrays;
++import java.util.Arrays;
+
+ import org.springframework.beans.factory.support.AbstractBeanDefinition;
+ import org.springframework.beans.factory.xml.ParserContext;
+--- a/modules/spring-config/src/main/java/org/mule/config/spring/parsers/generic/AutoIdUtils.java
++++ b/modules/spring-config/src/main/java/org/mule/config/spring/parsers/generic/AutoIdUtils.java
+@@ -13,7 +13,7 @@
+ import org.mule.config.spring.parsers.AbstractMuleBeanDefinitionParser;
+ import org.mule.util.StringUtils;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ import org.w3c.dom.Element;
+
+--- a/modules/spring-extras/src/main/java/org/mule/module/spring/events/AsynchronousEventListener.java
++++ b/modules/spring-extras/src/main/java/org/mule/module/spring/events/AsynchronousEventListener.java
+@@ -10,8 +10,8 @@
+
+ package org.mule.module.spring.events;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
+-import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionException;
++import java.util.concurrent.ExecutorService;
++import java.util.concurrent.RejectedExecutionException;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/modules/spring-extras/src/main/java/org/mule/module/spring/events/MuleEventMulticaster.java
++++ b/modules/spring-extras/src/main/java/org/mule/module/spring/events/MuleEventMulticaster.java
+@@ -56,8 +56,8 @@
+ import java.util.Map;
+ import java.util.Set;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet;
+-import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
++import java.util.concurrent.CopyOnWriteArraySet;
++import java.util.concurrent.ExecutorService;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/modules/spring-extras/src/test/java/org/mule/module/spring/events/SpringEventsTestCase.java
++++ b/modules/spring-extras/src/test/java/org/mule/module/spring/events/SpringEventsTestCase.java
+@@ -21,10 +21,10 @@
+ import org.mule.util.ExceptionUtils;
+ import org.mule.util.concurrent.Latch;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.Executors;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.Executors;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ import org.springframework.context.ApplicationContext;
+ import org.springframework.context.ApplicationEvent;
+--- a/modules/xml/src/main/java/org/mule/module/xml/routing/RoundRobinXmlSplitter.java
++++ b/modules/xml/src/main/java/org/mule/module/xml/routing/RoundRobinXmlSplitter.java
+@@ -23,7 +23,7 @@
+ import java.util.List;
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ import org.dom4j.Document;
+
+--- a/modules/xml/src/main/java/org/mule/module/xml/transformer/AbstractXStreamTransformer.java
++++ b/modules/xml/src/main/java/org/mule/module/xml/transformer/AbstractXStreamTransformer.java
+@@ -21,7 +21,7 @@
+ import java.util.List;
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicReference;
++import java.util.concurrent.atomic.AtomicReference;
+
+ /**
+ * <code>AbstractXStreamTransformer</code> is a base class for all XStream based
+--- a/modules/xml/src/test/java/org/mule/transformers/xml/ParallelXsltTransformerTestCase.java
++++ b/modules/xml/src/test/java/org/mule/transformers/xml/ParallelXsltTransformerTestCase.java
+@@ -19,7 +19,7 @@
+ import java.util.Collection;
+ import java.util.Iterator;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentLinkedQueue;
++import java.util.concurrent.ConcurrentLinkedQueue;
+
+ import org.custommonkey.xmlunit.XMLAssert;
+
+--- a/modules/xml/src/test/java/org/mule/transformers/xml/XStreamFactoryTestCase.java
++++ b/modules/xml/src/test/java/org/mule/transformers/xml/XStreamFactoryTestCase.java
+@@ -18,7 +18,7 @@
+
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ public class XStreamFactoryTestCase extends AbstractMuleTestCase
+ {
+--- a/tests/functional/src/main/java/org/mule/tck/functional/CountdownCallback.java
++++ b/tests/functional/src/main/java/org/mule/tck/functional/CountdownCallback.java
+@@ -15,8 +15,8 @@
+
+ import junit.framework.AssertionFailedError;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ public class CountdownCallback implements EventCallback
+ {
+--- a/tests/functional/src/main/java/org/mule/tck/functional/CounterCallback.java
++++ b/tests/functional/src/main/java/org/mule/tck/functional/CounterCallback.java
+@@ -11,7 +11,7 @@
+
+ import org.mule.api.MuleEventContext;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ /**
+ * A test callback that counts the number of messages received.
+--- a/tests/functional/src/main/java/org/mule/tck/functional/FunctionalStreamingTestComponent.java
++++ b/tests/functional/src/main/java/org/mule/tck/functional/FunctionalStreamingTestComponent.java
+@@ -18,7 +18,7 @@
+ import java.io.IOException;
+ import java.io.InputStream;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/tests/functional/src/main/java/org/mule/tck/functional/FunctionalTestComponent.java
++++ b/tests/functional/src/main/java/org/mule/tck/functional/FunctionalTestComponent.java
+@@ -25,7 +25,7 @@
+
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.CopyOnWriteArrayList;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/tests/functional/src/main/java/org/mule/tck/functional/FunctionalTestComponent2.java
++++ b/tests/functional/src/main/java/org/mule/tck/functional/FunctionalTestComponent2.java
+@@ -25,7 +25,7 @@
+
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.CopyOnWriteArrayList;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/tests/functional/src/main/java/org/mule/tck/testmodels/services/TestComponent.java
++++ b/tests/functional/src/main/java/org/mule/tck/testmodels/services/TestComponent.java
+@@ -10,7 +10,7 @@
+
+ package org.mule.tck.testmodels.services;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/tests/functional/src/main/java/org/mule/tck/testmodels/services/TestReceiver.java
++++ b/tests/functional/src/main/java/org/mule/tck/testmodels/services/TestReceiver.java
+@@ -13,7 +13,7 @@
+ import org.mule.RequestContext;
+ import org.mule.util.StringMessageUtils;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/tests/integration/src/test/java/org/mule/config/spring/FunctionalTestAdvice.java
++++ b/tests/integration/src/test/java/org/mule/config/spring/FunctionalTestAdvice.java
+@@ -16,7 +16,7 @@
+ import java.lang.reflect.Method;
+
+ import org.springframework.aop.MethodBeforeAdvice;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ public class FunctionalTestAdvice implements MethodBeforeAdvice
+ {
+--- a/tests/integration/src/test/java/org/mule/routing/outbound/ChainingRouterPropertyPropagationTestCase.java
++++ b/tests/integration/src/test/java/org/mule/routing/outbound/ChainingRouterPropertyPropagationTestCase.java
+@@ -18,7 +18,7 @@
+ import org.mule.tck.functional.EventCallback;
+ import org.mule.tck.functional.FunctionalTestComponent;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ public class ChainingRouterPropertyPropagationTestCase extends FunctionalTestCase
+ {
+--- a/tests/integration/src/test/java/org/mule/test/integration/routing/AsyncReplyTimeoutFailTestCase.java
++++ b/tests/integration/src/test/java/org/mule/test/integration/routing/AsyncReplyTimeoutFailTestCase.java
+@@ -18,8 +18,8 @@
+ import org.mule.module.client.MuleClient;
+ import org.mule.tck.FunctionalTestCase;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ public class AsyncReplyTimeoutFailTestCase extends FunctionalTestCase
+ {
+--- a/tests/integration/src/test/java/org/mule/test/integration/routing/AsyncReplyTimeoutTestCase.java
++++ b/tests/integration/src/test/java/org/mule/test/integration/routing/AsyncReplyTimeoutTestCase.java
+@@ -18,8 +18,8 @@
+ import org.mule.module.client.MuleClient;
+ import org.mule.tck.FunctionalTestCase;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ public class AsyncReplyTimeoutTestCase extends FunctionalTestCase
+ {
+--- a/tests/integration/src/test/java/org/mule/test/integration/routing/InboundAggregationWithTimeoutTestCase.java
++++ b/tests/integration/src/test/java/org/mule/test/integration/routing/InboundAggregationWithTimeoutTestCase.java
+@@ -16,8 +16,8 @@
+ import org.mule.module.client.MuleClient;
+ import org.mule.tck.FunctionalTestCase;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ public class InboundAggregationWithTimeoutTestCase extends FunctionalTestCase
+ {
+--- a/tests/integration/src/test/java/org/mule/test/integration/routing/MessageChunkingTestCase.java
++++ b/tests/integration/src/test/java/org/mule/test/integration/routing/MessageChunkingTestCase.java
+@@ -20,8 +20,8 @@
+ import org.mule.tck.functional.FunctionalTestNotificationListener;
+ import org.mule.util.concurrent.Latch;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ import org.apache.commons.lang.SerializationUtils;
+
+--- a/tests/integration/src/test/java/org/mule/test/integration/routing/WireTapTestCase.java
++++ b/tests/integration/src/test/java/org/mule/test/integration/routing/WireTapTestCase.java
+@@ -17,7 +17,7 @@
+ import org.mule.tck.functional.FunctionalTestNotificationListener;
+ import org.mule.util.concurrent.Latch;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ public class WireTapTestCase extends FunctionalTestCase
+ {
+--- a/tests/integration/src/test/java/org/mule/test/integration/spring/events/SpringEventsJmsExampleTestCase.java
++++ b/tests/integration/src/test/java/org/mule/test/integration/spring/events/SpringEventsJmsExampleTestCase.java
+@@ -16,7 +16,7 @@
+ import org.mule.tck.FunctionalTestCase;
+ import org.mule.tck.functional.EventCallback;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ /**
+ * <code>SpringEventsJmsExampleTestCase</code> is a testcase used to test the
+--- a/tests/integration/src/test/java/org/mule/test/integration/spring/events/async/SpringEventsJmsAsyncExampleTestCase.java
++++ b/tests/integration/src/test/java/org/mule/test/integration/spring/events/async/SpringEventsJmsAsyncExampleTestCase.java
+@@ -18,7 +18,7 @@
+ import org.mule.test.integration.spring.events.Order;
+ import org.mule.test.integration.spring.events.OrderManagerBean;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ /**
+ * <code>SpringEventsJmsExampleTestCase</code> is a testcase used to test the
+--- a/tests/integration/src/test/java/org/mule/test/integration/transport/jdbc/AbstractJdbcTransactionalFunctionalTestCase.java
++++ b/tests/integration/src/test/java/org/mule/test/integration/transport/jdbc/AbstractJdbcTransactionalFunctionalTestCase.java
+@@ -33,7 +33,7 @@
+ import org.mule.tck.functional.EventCallback;
+ import org.mule.transaction.MuleTransactionConfig;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ public abstract class AbstractJdbcTransactionalFunctionalTestCase extends AbstractJdbcFunctionalTestCase implements TransactionNotificationListener
+ {
+--- a/tests/integration/src/test/java/org/mule/test/transformers/AutoTransformerTestCase.java
++++ b/tests/integration/src/test/java/org/mule/test/transformers/AutoTransformerTestCase.java
+@@ -17,7 +17,7 @@
+ import org.mule.module.client.MuleClient;
+ import org.mule.util.concurrent.Latch;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ public class AutoTransformerTestCase extends FunctionalTestCase
+ {
+--- a/transports/email/src/test/java/org/mule/transport/email/AutoIncrementGreenMailSupport.java
++++ b/transports/email/src/test/java/org/mule/transport/email/AutoIncrementGreenMailSupport.java
+@@ -10,7 +10,7 @@
+
+ package org.mule.transport.email;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ public class AutoIncrementGreenMailSupport extends AbstractGreenMailSupport
+ {
+--- a/transports/email/src/test/java/org/mule/transport/email/connectors/AbstractMailConnectorFunctionalTestCase.java
++++ b/transports/email/src/test/java/org/mule/transport/email/connectors/AbstractMailConnectorFunctionalTestCase.java
+@@ -19,7 +19,7 @@
+ import javax.mail.Message;
+ import javax.mail.internet.MimeMessage;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ /**
+ * Start a (greenmail) mail server with a known message, for use in subclasses.
+--- a/transports/email/src/test/java/org/mule/transport/email/connectors/AbstractReceivingMailConnectorTestCase.java
++++ b/transports/email/src/test/java/org/mule/transport/email/connectors/AbstractReceivingMailConnectorTestCase.java
+@@ -24,8 +24,8 @@
+ import java.util.HashMap;
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ /**
+ * Given an endpoint ({@link #getTestEndpointURI()}) this waits for up to 10 seconds,
+--- a/transports/file/src/main/java/org/mule/transport/file/FileMessageReceiver.java
++++ b/transports/file/src/main/java/org/mule/transport/file/FileMessageReceiver.java
+@@ -35,7 +35,7 @@
+ import java.nio.channels.FileLock;
+ import java.util.Comparator;
+
+-import edu.emory.mathcs.backport.java.util.Arrays;
++import java.util.Arrays;
+
+ import org.apache.commons.collections.comparators.ReverseComparator;
+
+--- a/transports/file/src/main/java/org/mule/transport/file/SimpleFilenameParser.java
++++ b/transports/file/src/main/java/org/mule/transport/file/SimpleFilenameParser.java
+@@ -15,7 +15,7 @@
+ import org.mule.util.TemplateParser;
+ import org.mule.util.UUID;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
++import java.util.concurrent.atomic.AtomicLong;
+
+ /**
+ * <code>SimpleFilenameParser</code> understands a limited set of tokens, namely
+--- a/transports/file/src/test/java/org/mule/transport/file/FileComparatorTestCase.java
++++ b/transports/file/src/test/java/org/mule/transport/file/FileComparatorTestCase.java
+@@ -17,8 +17,8 @@
+
+ import java.io.File;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ public class FileComparatorTestCase extends FunctionalTestCase
+ {
+--- a/transports/file/src/test/java/org/mule/transport/file/FileReceiverMoveDeleteTestCase.java
++++ b/transports/file/src/test/java/org/mule/transport/file/FileReceiverMoveDeleteTestCase.java
+@@ -28,7 +28,7 @@
+
+ import java.io.File;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ public class FileReceiverMoveDeleteTestCase extends AbstractFileMoveDeleteTestCase
+ {
+--- a/transports/ftp/src/test/java/org/mule/transport/ftp/FtpStreamingTestCase.java
++++ b/transports/ftp/src/test/java/org/mule/transport/ftp/FtpStreamingTestCase.java
+@@ -18,10 +18,10 @@
+
+ import java.util.HashMap;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicReference;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicReference;
+
+ /**
+ * We don't have an integrated ftp server (yet), and synchronous return doesn't work
+--- a/transports/ftp/src/test/java/org/mule/transport/ftp/issues/MultiStreamMule1696TestCase.java
++++ b/transports/ftp/src/test/java/org/mule/transport/ftp/issues/MultiStreamMule1696TestCase.java
+@@ -19,9 +19,9 @@
+
+ import java.util.HashMap;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicReference;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicReference;
+
+ public class MultiStreamMule1696TestCase extends AbstractFtpServerTestCase
+ {
+--- a/transports/ftp/src/test/java/org/mule/transport/ftp/server/FileView.java
++++ b/transports/ftp/src/test/java/org/mule/transport/ftp/server/FileView.java
+@@ -10,7 +10,7 @@
+
+ package org.mule.transport.ftp.server;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
++import java.util.concurrent.CountDownLatch;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.apache.ftpserver.ftplet.FileObject;
+--- a/transports/ftp/src/test/java/org/mule/transport/ftp/server/InOutState.java
++++ b/transports/ftp/src/test/java/org/mule/transport/ftp/server/InOutState.java
+@@ -13,8 +13,8 @@
+ import java.util.Collection;
+ import java.util.HashSet;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ public class InOutState implements ServerState
+ {
+--- a/transports/http/src/test/java/org/mule/transport/http/functional/HttpCookieTestCase.java
++++ b/transports/http/src/test/java/org/mule/transport/http/functional/HttpCookieTestCase.java
+@@ -20,8 +20,8 @@
+ import java.net.ServerSocket;
+ import java.net.Socket;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ public class HttpCookieTestCase extends FunctionalTestCase
+ {
+--- a/transports/http/src/test/java/org/mule/transport/http/functional/HttpsFunctionalTestCase.java
++++ b/transports/http/src/test/java/org/mule/transport/http/functional/HttpsFunctionalTestCase.java
+@@ -22,7 +22,7 @@
+ import java.util.HashMap;
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ public class HttpsFunctionalTestCase extends HttpFunctionalTestCase
+ {
+--- a/transports/http/src/test/java/org/mule/transport/http/functional/PollingEtagTestCase.java
++++ b/transports/http/src/test/java/org/mule/transport/http/functional/PollingEtagTestCase.java
+@@ -13,7 +13,7 @@
+ import org.mule.tck.functional.CounterCallback;
+ import org.mule.tck.functional.FunctionalTestComponent;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ public class PollingEtagTestCase extends FunctionalTestCase
+ {
+--- a/transports/http/src/test/java/org/mule/transport/http/functional/PollingReceiversRestartTestCase.java
++++ b/transports/http/src/test/java/org/mule/transport/http/functional/PollingReceiversRestartTestCase.java
+@@ -13,7 +13,7 @@
+ import org.mule.tck.functional.CounterCallback;
+ import org.mule.tck.functional.FunctionalTestComponent;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ public class PollingReceiversRestartTestCase extends FunctionalTestCase
+ {
+--- a/transports/jms/src/main/java/org/mule/transport/jms/JmsMessageDispatcher.java
++++ b/transports/jms/src/main/java/org/mule/transport/jms/JmsMessageDispatcher.java
+@@ -37,7 +37,7 @@
+ import javax.jms.TemporaryQueue;
+ import javax.jms.TemporaryTopic;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ import org.apache.commons.lang.BooleanUtils;
+
+--- a/transports/jms/src/main/java/org/mule/transport/jms/MultiConsumerJmsMessageReceiver.java
++++ b/transports/jms/src/main/java/org/mule/transport/jms/MultiConsumerJmsMessageReceiver.java
+@@ -37,8 +37,8 @@
+ import javax.jms.Topic;
+ import javax.resource.spi.work.WorkException;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.BlockingDeque;
+-import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingDeque;
++import java.util.concurrent.BlockingDeque;
++import java.util.concurrent.LinkedBlockingDeque;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+
+--- a/transports/jms/src/main/java/org/mule/transport/jms/XaTransactedJmsMessageReceiver.java
++++ b/transports/jms/src/main/java/org/mule/transport/jms/XaTransactedJmsMessageReceiver.java
+@@ -34,7 +34,7 @@
+ import javax.jms.MessageConsumer;
+ import javax.jms.Session;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ public class XaTransactedJmsMessageReceiver extends TransactedPollingMessageReceiver
+ {
+--- a/transports/jms/src/test/java/org/mule/transport/jms/integration/JmsXAAlwaysBeginTestCase.java
++++ b/transports/jms/src/test/java/org/mule/transport/jms/integration/JmsXAAlwaysBeginTestCase.java
+@@ -17,7 +17,7 @@
+ import javax.transaction.xa.XAResource;
+ import javax.transaction.xa.Xid;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.CopyOnWriteArrayList;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+
+--- a/transports/quartz/src/test/java/org/mule/transport/quartz/QuartzDispatchJobTestCase.java
++++ b/transports/quartz/src/test/java/org/mule/transport/quartz/QuartzDispatchJobTestCase.java
+@@ -15,8 +15,8 @@
+ import org.mule.tck.functional.FunctionalTestComponent2;
+ import org.mule.tck.functional.CountdownCallback;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ public class QuartzDispatchJobTestCase extends FunctionalTestCase
+ {
+--- a/transports/quartz/src/test/java/org/mule/transport/quartz/QuartzFunctionalLegacyTestCase.java
++++ b/transports/quartz/src/test/java/org/mule/transport/quartz/QuartzFunctionalLegacyTestCase.java
+@@ -14,8 +14,8 @@
+ import org.mule.tck.functional.FunctionalTestComponent2;
+ import org.mule.tck.functional.CountdownCallback;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ public class QuartzFunctionalLegacyTestCase extends FunctionalTestCase
+ {
+--- a/transports/quartz/src/test/java/org/mule/transport/quartz/QuartzFunctionalTestCase.java
++++ b/transports/quartz/src/test/java/org/mule/transport/quartz/QuartzFunctionalTestCase.java
+@@ -14,8 +14,8 @@
+ import org.mule.tck.functional.FunctionalTestComponent2;
+ import org.mule.tck.functional.CountdownCallback;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ public class QuartzFunctionalTestCase extends FunctionalTestCase
+ {
+--- a/transports/quartz/src/test/java/org/mule/transport/quartz/QuartzReceiveAndDispatchJobTestCase.java
++++ b/transports/quartz/src/test/java/org/mule/transport/quartz/QuartzReceiveAndDispatchJobTestCase.java
+@@ -15,8 +15,8 @@
+ import org.mule.tck.functional.FunctionalTestComponent2;
+ import org.mule.tck.functional.CountdownCallback;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+ public class QuartzReceiveAndDispatchJobTestCase extends FunctionalTestCase
+ {
+--- a/transports/ssl/src/main/java/org/mule/transport/ssl/SslMessageReceiver.java
++++ b/transports/ssl/src/main/java/org/mule/transport/ssl/SslMessageReceiver.java
+@@ -28,8 +28,8 @@
+ import javax.net.ssl.SSLSocket;
+ import javax.resource.spi.work.Work;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
+
+
+ public class SslMessageReceiver extends TcpMessageReceiver implements HandshakeCompletedListener
+--- a/transports/ssl/src/test/java/org/mule/transport/ssl/SaveCertificateCallback.java
++++ b/transports/ssl/src/test/java/org/mule/transport/ssl/SaveCertificateCallback.java
+@@ -13,8 +13,8 @@
+ import org.mule.tck.functional.EventCallback;
+ import org.mule.api.MuleEventContext;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicReference;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicReference;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ public class SaveCertificateCallback implements EventCallback
+ {
+--- a/transports/tcp/src/main/java/org/mule/transport/tcp/protocols/XmlMessageProtocol.java
++++ b/transports/tcp/src/main/java/org/mule/transport/tcp/protocols/XmlMessageProtocol.java
+@@ -14,7 +14,7 @@
+ import java.io.InputStream;
+ import java.io.PushbackInputStream;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentHashMap;
+
+ /**
+ * <p>
+--- a/transports/tcp/src/test/java/org/mule/transport/tcp/integration/AbstractStreamingCapacityTestCase.java
++++ b/transports/tcp/src/test/java/org/mule/transport/tcp/integration/AbstractStreamingCapacityTestCase.java
+@@ -18,9 +18,9 @@
+ import org.mule.tck.functional.FunctionalStreamingTestComponent;
+ import org.mule.transport.DefaultMessageAdapter;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicReference;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicReference;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/transports/tcp/src/test/java/org/mule/transport/tcp/integration/StreamingTestCase.java
++++ b/transports/tcp/src/test/java/org/mule/transport/tcp/integration/StreamingTestCase.java
+@@ -18,10 +18,10 @@
+
+ import java.util.HashMap;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicReference;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicReference;
+
+ /**
+ * This test is more about testing the streaming model than the TCP provider, really.
+--- a/transports/tcp/src/test/java/org/mule/transport/tcp/issues/KeepSendSocketOpenMule1491TestCase.java
++++ b/transports/tcp/src/test/java/org/mule/transport/tcp/issues/KeepSendSocketOpenMule1491TestCase.java
+@@ -23,8 +23,8 @@
+ import java.util.HashMap;
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ public class KeepSendSocketOpenMule1491TestCase extends FunctionalTestCase
+ {
+--- a/transports/tcp/src/test/java/org/mule/transport/tcp/issues/LengthProtocolLengthTestCase.java
++++ b/transports/tcp/src/test/java/org/mule/transport/tcp/issues/LengthProtocolLengthTestCase.java
+@@ -14,7 +14,7 @@
+ import org.mule.module.client.MuleClient;
+ import org.mule.tck.FunctionalTestCase;
+
+-import edu.emory.mathcs.backport.java.util.Arrays;
++import java.util.Arrays;
+
+ public class LengthProtocolLengthTestCase extends FunctionalTestCase
+ {
+--- a/transports/tcp/src/test/java/org/mule/transport/tcp/issues/MultiStreamMule1692TestCase.java
++++ b/transports/tcp/src/test/java/org/mule/transport/tcp/issues/MultiStreamMule1692TestCase.java
+@@ -18,9 +18,9 @@
+
+ import java.util.HashMap;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicReference;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicReference;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+--- a/transports/udp/src/test/java/org/mule/transport/udp/functional/UdpRoundTripTestCase.java
++++ b/transports/udp/src/test/java/org/mule/transport/udp/functional/UdpRoundTripTestCase.java
+@@ -21,7 +21,7 @@
+ import java.net.DatagramSocket;
+ import java.net.InetAddress;
+
+-import edu.emory.mathcs.backport.java.util.Arrays;
++import java.util.Arrays;
+
+ public class UdpRoundTripTestCase extends FunctionalTestCase
+ {
+--- a/transports/vm/src/main/java/org/mule/transport/vm/VMMessageReceiver.java
++++ b/transports/vm/src/main/java/org/mule/transport/vm/VMMessageReceiver.java
+@@ -25,7 +25,7 @@
+ import java.util.LinkedList;
+ import java.util.List;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.RejectedExecutionException;
++import java.util.concurrent.RejectedExecutionException;
+
+ /**
+ * <code>VMMessageReceiver</code> is a listener for events from a Mule service which then simply passes
+--- a/transports/vm/src/test/java/org/mule/issues/MulticastRouterMule2112TestCase.java
++++ b/transports/vm/src/test/java/org/mule/issues/MulticastRouterMule2112TestCase.java
+@@ -17,7 +17,7 @@
+ import org.mule.tck.functional.EventCallback;
+ import org.mule.tck.functional.FunctionalTestComponent;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ public class MulticastRouterMule2112TestCase extends FunctionalTestCase
+ {
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -57,11 +57,6 @@
+ </dependency>
+
+ <dependency>
+- <groupId>backport-util-concurrent</groupId>
+- <artifactId>backport-util-concurrent</artifactId>
+- <version>3.1</version>
+- </dependency>
+- <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+--- a/modules/scripting/pom.xml
++++ b/modules/scripting/pom.xml
+@@ -178,12 +178,6 @@
+ </exclusion>
+ </exclusions>
+ </dependency>
+- <!-- Annoying: we need to override retrotranslated dependencies -->
+- <dependency>
+- <groupId>backport-util-concurrent</groupId>
+- <artifactId>backport-util-concurrent</artifactId>
+- <version>3.1</version>
+- </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.mule.tests</groupId>
+--- a/modules/xml/src/test/java/org/mule/transformers/xml/XmlUMOMessageTransformersTestCase.java
++++ b/modules/xml/src/test/java/org/mule/transformers/xml/XmlUMOMessageTransformersTestCase.java
+@@ -124,10 +124,10 @@
+ + " <string>object</string>\n"
+ + " <string>string</string>\n"
+ + " </keySet>\n"
+- + " <applicationProperties class=\"edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap\"/>\n"
++ + " <applicationProperties class=\"java.util.concurrent.ConcurrentHashMap\"/>\n"
+ + " <defaultScope reference=\"../scopedMap/entry[3]/org.mule.api.transport.PropertyScope\"/>\n"
+ + " <fallbackToRegistry>false</fallbackToRegistry>\n" + " </properties>\n"
+- + " <attachments class=\"edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap\"/>\n"
++ + " <attachments class=\"java.util.concurrent.ConcurrentHashMap\"/>\n"
+ + " <encoding>UTF-8</encoding>\n" + " <id>3be5fe5a-87f8-11dc-a153-0b6db396665f</id>\n"
+ + " </adapter>\n" + " </org.mule.DefaultMuleMessage>\n";
+ }
Modified: mule/trunk/debian/patches/series
===================================================================
--- mule/trunk/debian/patches/series 2014-08-07 09:38:55 UTC (rev 317)
+++ mule/trunk/debian/patches/series 2014-08-07 10:51:11 UTC (rev 318)
@@ -2,3 +2,4 @@
03_remove_spring_jms.diff
add_stub_handlers.diff
remove_yourkit_support.diff
+drop-backport-util-concurrent.diff
Modified: mule/trunk/debian/rules
===================================================================
--- mule/trunk/debian/rules 2014-08-07 09:38:55 UTC (rev 317)
+++ mule/trunk/debian/rules 2014-08-07 10:51:11 UTC (rev 318)
@@ -19,7 +19,7 @@
echo "'lib$(DEB_SOURCE_PACKAGE)-java-$(DEB_UPSTREAM_VERSION_SHORT)'"
#
-DEB_JARS := groovy quartz /usr/share/java/geronimo-jms_1.1_spec.jar jaxrpc commons-net2 axis aopalliance backport-util-concurrent commons-beanutils commons-cli commons-collections3 commons-httpclient commons-io commons-jxpath commons-logging commons-lang commons-pool dom4j geronimo-j2ee-connector-1.5-spec jaxen.jar jug-asl log4j-1.2 geronimo-ejb-3.0-spec geronimo-jta-1.0.1b-spec jboss-transaction maven-artifact-manager mx4j ognl servlet-2.3 spring3-beans spring3-core spring3-web spring3-context spring3-jdbc spring3-transaction-3.x xstream mx4j-tools mx4j-remote wrapper
+DEB_JARS := groovy quartz /usr/share/java/geronimo-jms_1.1_spec.jar jaxrpc commons-net2 axis aopalliance commons-beanutils commons-cli commons-collections3 commons-httpclient commons-io commons-jxpath commons-logging commons-lang commons-pool dom4j geronimo-j2ee-connector-1.5-spec jaxen.jar jug-asl log4j-1.2 geronimo-ejb-3.0-spec geronimo-jta-1.0.1b-spec jboss-transaction maven-artifact-manager mx4j ognl servlet-2.3 spring3-beans spring3-core spring3-web spring3-context spring3-jdbc spring3-transaction-3.x xstream mx4j-tools mx4j-remote wrapper
binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java-$(DEB_UPSTREAM_VERSION_SHORT)::
for n in core \
More information about the pkg-eucalyptus-commits
mailing list