[mule] Remove dependence on backport-util-concurrent. RHBZ#875167
Andy Grimm
arg at fedoraproject.org
Mon Dec 10 20:59:06 UTC 2012
commit fc2b0f38c7ca50090bfac8b76a74bf69b889760e
Author: Andy Grimm <agrimm at gmail.com>
Date: Mon Dec 10 15:58:34 2012 -0500
Remove dependence on backport-util-concurrent. RHBZ#875167
mule-no-backport.patch | 1998 ++++++++++++++++++++++++++++++++++++++++++++++++
mule.spec | 24 +-
2 files changed, 2008 insertions(+), 14 deletions(-)
---
diff --git a/mule-no-backport.patch b/mule-no-backport.patch
new file mode 100644
index 0000000..28d1799
--- /dev/null
+++ b/mule-no-backport.patch
@@ -0,0 +1,1998 @@
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/AbstractExceptionListener.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/AbstractExceptionListener.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/AbstractExceptionListener.java 2008-07-17 01:42:48.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/AbstractExceptionListener.java 2012-12-10 14:28:11.978649476 -0500
+@@ -43,8 +43,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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/api/config/ThreadingProfile.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/api/config/ThreadingProfile.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/api/config/ThreadingProfile.java 2008-07-10 00:19:03.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/api/config/ThreadingProfile.java 2012-12-10 14:28:11.566631929 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/api/context/notification/ServerNotification.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/api/context/notification/ServerNotification.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/api/context/notification/ServerNotification.java 2008-07-07 17:25:01.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/api/context/notification/ServerNotification.java 2012-12-10 14:28:11.513629672 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/api/context/WorkManager.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/api/context/WorkManager.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/api/context/WorkManager.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/api/context/WorkManager.java 2012-12-10 14:28:11.479628224 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/api/FutureMessageResult.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/api/FutureMessageResult.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/api/FutureMessageResult.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/api/FutureMessageResult.java 2012-12-10 14:28:11.414625456 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/api/work/WorkExecutor.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/api/work/WorkExecutor.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/api/work/WorkExecutor.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/api/work/WorkExecutor.java 2012-12-10 14:28:11.776640873 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/component/AbstractComponent.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/component/AbstractComponent.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/component/AbstractComponent.java 2008-07-07 17:25:01.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/component/AbstractComponent.java 2012-12-10 14:28:10.490586101 -0500
+@@ -28,7 +28,7 @@
+ import org.mule.context.notification.OptimisedNotificationHandler;
+ 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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/component/SimpleCallableJavaComponent.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/component/SimpleCallableJavaComponent.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/component/SimpleCallableJavaComponent.java 2008-03-19 23:43:57.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/component/SimpleCallableJavaComponent.java 2012-12-10 14:28:10.483585803 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/config/ChainedThreadingProfile.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/config/ChainedThreadingProfile.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/config/ChainedThreadingProfile.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/config/ChainedThreadingProfile.java 2012-12-10 14:28:11.144613955 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/config/ImmutableThreadingProfile.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/config/ImmutableThreadingProfile.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/config/ImmutableThreadingProfile.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/config/ImmutableThreadingProfile.java 2012-12-10 14:28:11.141613828 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/context/notification/Policy.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/context/notification/Policy.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/context/notification/Policy.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/context/notification/Policy.java 2012-12-10 14:28:10.932604926 -0500
+@@ -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.
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/context/notification/ServerNotificationManager.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/context/notification/ServerNotificationManager.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/context/notification/ServerNotificationManager.java 2008-05-23 08:49:16.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/context/notification/ServerNotificationManager.java 2012-12-10 14:28:10.935605054 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/DefaultMessageCollection.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/DefaultMessageCollection.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/DefaultMessageCollection.java 2008-03-22 15:27:20.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/DefaultMessageCollection.java 2012-12-10 14:28:11.829643131 -0500
+@@ -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.
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/DefaultMuleEventContext.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/DefaultMuleEventContext.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/DefaultMuleEventContext.java 2008-03-19 23:43:57.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/DefaultMuleEventContext.java 2012-12-10 14:28:11.835643387 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/DefaultMuleMessage.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/DefaultMuleMessage.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/DefaultMuleMessage.java 2008-07-10 00:19:03.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/DefaultMuleMessage.java 2012-12-10 14:28:12.016651095 -0500
+@@ -35,7 +35,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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/endpoint/AbstractEndpoint.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/endpoint/AbstractEndpoint.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/endpoint/AbstractEndpoint.java 2008-03-11 20:54:21.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/endpoint/AbstractEndpoint.java 2012-12-10 14:28:11.927647305 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/endpoint/URIBuilder.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/endpoint/URIBuilder.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/endpoint/URIBuilder.java 2008-04-21 22:37:40.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/endpoint/URIBuilder.java 2012-12-10 14:28:11.902646239 -0500
+@@ -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:
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/model/AbstractModel.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/model/AbstractModel.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/model/AbstractModel.java 2008-03-31 17:34:19.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/model/AbstractModel.java 2012-12-10 14:28:11.879645260 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/model/resolvers/AbstractEntryPointResolver.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/model/resolvers/AbstractEntryPointResolver.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/model/resolvers/AbstractEntryPointResolver.java 2008-08-01 09:10:20.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/model/resolvers/AbstractEntryPointResolver.java 2012-12-10 14:28:11.859644408 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/model/resolvers/DefaultEntryPointResolverSet.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/model/resolvers/DefaultEntryPointResolverSet.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/model/resolvers/DefaultEntryPointResolverSet.java 2008-01-25 00:58:36.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/model/resolvers/DefaultEntryPointResolverSet.java 2012-12-10 14:28:11.849643983 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/registry/AbstractRegistry.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/registry/AbstractRegistry.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/registry/AbstractRegistry.java 2008-07-10 00:19:03.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/registry/AbstractRegistry.java 2012-12-10 14:28:11.989649945 -0500
+@@ -47,7 +47,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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/routing/AbstractRouterCollection.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/AbstractRouterCollection.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/routing/AbstractRouterCollection.java 2008-07-10 00:19:03.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/AbstractRouterCollection.java 2012-12-10 14:28:10.952605778 -0500
+@@ -22,7 +22,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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/routing/EventCorrelator.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/EventCorrelator.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/routing/EventCorrelator.java 2008-04-11 09:08:05.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/EventCorrelator.java 2012-12-10 14:28:10.958606034 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/routing/inbound/AbstractEventResequencer.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/inbound/AbstractEventResequencer.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/routing/inbound/AbstractEventResequencer.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/inbound/AbstractEventResequencer.java 2012-12-10 14:28:11.057610251 -0500
+@@ -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,
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/routing/inbound/DefaultInboundRouterCollection.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/inbound/DefaultInboundRouterCollection.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/routing/inbound/DefaultInboundRouterCollection.java 2008-06-19 10:38:08.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/inbound/DefaultInboundRouterCollection.java 2012-12-10 14:28:11.065610591 -0500
+@@ -30,9 +30,9 @@
+ 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.ConcurrentHashMap;
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentMap;
++import java.util.concurrent.CopyOnWriteArrayList;
++import java.util.concurrent.ConcurrentHashMap;
++import java.util.concurrent.ConcurrentMap;
+
+ /**
+ * <code>DefaultInboundRouterCollection</code> is a collection of routers that will be
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/routing/inbound/EventGroup.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/inbound/EventGroup.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/routing/inbound/EventGroup.java 2008-04-08 11:34:34.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/inbound/EventGroup.java 2012-12-10 14:28:11.074610973 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/routing/nested/NestedInvocationHandler.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/nested/NestedInvocationHandler.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/routing/nested/NestedInvocationHandler.java 2008-06-17 07:12:10.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/nested/NestedInvocationHandler.java 2012-12-10 14:28:10.960606119 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/routing/outbound/AbstractOutboundRouter.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/outbound/AbstractOutboundRouter.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/routing/outbound/AbstractOutboundRouter.java 2008-06-26 16:05:55.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/outbound/AbstractOutboundRouter.java 2012-12-10 14:28:11.020608674 -0500
+@@ -32,7 +32,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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/routing/outbound/AbstractRecipientList.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/outbound/AbstractRecipientList.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/routing/outbound/AbstractRecipientList.java 2008-03-22 15:28:25.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/outbound/AbstractRecipientList.java 2012-12-10 14:28:11.022608760 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/routing/response/DefaultResponseRouterCollection.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/response/DefaultResponseRouterCollection.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/routing/response/DefaultResponseRouterCollection.java 2008-07-28 01:08:21.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/routing/response/DefaultResponseRouterCollection.java 2012-12-10 14:28:11.094611826 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/security/MuleSecurityManager.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/security/MuleSecurityManager.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/security/MuleSecurityManager.java 2008-08-06 22:49:29.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/security/MuleSecurityManager.java 2012-12-10 14:28:11.965648924 -0500
+@@ -31,7 +31,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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/service/AbstractService.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/service/AbstractService.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/service/AbstractService.java 2008-07-25 11:49:47.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/service/AbstractService.java 2012-12-10 14:28:11.286620003 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/transaction/AbstractSingleResourceTransaction.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transaction/AbstractSingleResourceTransaction.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/transaction/AbstractSingleResourceTransaction.java 2008-06-26 16:05:55.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transaction/AbstractSingleResourceTransaction.java 2012-12-10 14:28:11.328621793 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/transformer/AbstractTransformer.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transformer/AbstractTransformer.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/transformer/AbstractTransformer.java 2008-03-31 17:34:19.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transformer/AbstractTransformer.java 2012-12-10 14:28:11.210616766 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/transport/AbstractConnector.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/AbstractConnector.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/transport/AbstractConnector.java 2008-07-25 11:21:06.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/AbstractConnector.java 2012-12-10 14:28:10.799599262 -0500
+@@ -78,15 +78,15 @@
+ 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.Semaphore;
+-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.Semaphore;
++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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/transport/AbstractMessageAdapter.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/AbstractMessageAdapter.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/transport/AbstractMessageAdapter.java 2008-05-15 08:12:16.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/AbstractMessageAdapter.java 2012-12-10 14:28:10.819600113 -0500
+@@ -32,10 +32,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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/transport/AbstractMessageReceiver.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/AbstractMessageReceiver.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/transport/AbstractMessageReceiver.java 2008-07-10 00:19:03.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/AbstractMessageReceiver.java 2012-12-10 14:28:10.808599644 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/transport/AbstractPollingMessageReceiver.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/AbstractPollingMessageReceiver.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/transport/AbstractPollingMessageReceiver.java 2008-02-22 14:01:02.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/AbstractPollingMessageReceiver.java 2012-12-10 14:28:10.877602583 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/transport/MessagePropertiesContext.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/MessagePropertiesContext.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/transport/MessagePropertiesContext.java 2008-07-15 13:32:56.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/MessagePropertiesContext.java 2012-12-10 14:28:10.883602839 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/transport/SimpleRetryConnectionStrategy.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/SimpleRetryConnectionStrategy.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/transport/SimpleRetryConnectionStrategy.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/SimpleRetryConnectionStrategy.java 2012-12-10 14:28:10.875602499 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/transport/TransactedPollingMessageReceiver.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/TransactedPollingMessageReceiver.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/transport/TransactedPollingMessageReceiver.java 2008-06-26 16:05:55.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/transport/TransactedPollingMessageReceiver.java 2012-12-10 14:28:10.804599475 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/concurrent/ConcurrentHashSet.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/concurrent/ConcurrentHashSet.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/concurrent/ConcurrentHashSet.java 2007-08-27 16:15:25.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/concurrent/ConcurrentHashSet.java 2012-12-10 14:28:10.659593298 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/concurrent/Latch.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/concurrent/Latch.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/concurrent/Latch.java 2007-08-27 16:15:25.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/concurrent/Latch.java 2012-12-10 14:28:10.666593596 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/concurrent/NamedThreadFactory.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/concurrent/NamedThreadFactory.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/concurrent/NamedThreadFactory.java 2007-08-27 16:15:25.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/concurrent/NamedThreadFactory.java 2012-12-10 14:28:10.671593809 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/concurrent/SynchronizedVariable.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/concurrent/SynchronizedVariable.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/concurrent/SynchronizedVariable.java 2007-08-27 16:15:25.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/concurrent/SynchronizedVariable.java 2012-12-10 14:28:10.669593725 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/concurrent/WaitPolicy.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/concurrent/WaitPolicy.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/concurrent/WaitPolicy.java 2007-10-18 12:25:35.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/concurrent/WaitPolicy.java 2012-12-10 14:28:10.662593426 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/expression/ExpressionEvaluatorManager.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/expression/ExpressionEvaluatorManager.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/expression/ExpressionEvaluatorManager.java 2008-06-19 04:58:48.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/expression/ExpressionEvaluatorManager.java 2012-12-10 14:28:10.585590146 -0500
+@@ -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,
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/expression/FunctionExpressionEvaluator.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/expression/FunctionExpressionEvaluator.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/expression/FunctionExpressionEvaluator.java 2008-03-07 07:27:48.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/expression/FunctionExpressionEvaluator.java 2012-12-10 14:28:10.584590103 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/monitor/ExpiryMonitor.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/monitor/ExpiryMonitor.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/monitor/ExpiryMonitor.java 2008-07-10 00:19:03.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/monitor/ExpiryMonitor.java 2012-12-10 14:28:10.725596109 -0500
+@@ -17,10 +17,9 @@
+ import java.util.Iterator;
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+-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.ConcurrentHashMap;
++import java.util.concurrent.ScheduledThreadPoolExecutor;
++import java.util.concurrent.TimeUnit;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+
+
+@@ -181,7 +180,7 @@
+ {
+ this.nanoseconds = nanoseconds;
+ this.expirable = expirable;
+- created = Utils.nanoTime();
++ created = System.nanoTime();
+ }
+
+ public long getNanoSeconds()
+@@ -196,12 +195,12 @@
+
+ public boolean isExpired()
+ {
+- return (Utils.nanoTime() - nanoseconds) > created;
++ return (System.nanoTime() - nanoseconds) > created;
+ }
+
+ public void reset()
+ {
+- created = Utils.nanoTime();
++ created = System.nanoTime();
+ }
+ }
+ }
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/pool/DefaultLifecycleEnabledObjectPool.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/pool/DefaultLifecycleEnabledObjectPool.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/pool/DefaultLifecycleEnabledObjectPool.java 2008-03-31 17:34:19.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/pool/DefaultLifecycleEnabledObjectPool.java 2012-12-10 14:28:10.530587804 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/PropertiesUtils.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/PropertiesUtils.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/PropertiesUtils.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/PropertiesUtils.java 2012-12-10 14:28:10.737596620 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/store/AbstractMonitoredObjectStore.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/store/AbstractMonitoredObjectStore.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/store/AbstractMonitoredObjectStore.java 2008-06-16 08:02:56.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/store/AbstractMonitoredObjectStore.java 2012-12-10 14:28:10.752597259 -0500
+@@ -21,8 +21,8 @@
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
+-import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.ScheduledThreadPoolExecutor;
+
+ /**
+ * TODO
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/store/InMemoryObjectStore.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/store/InMemoryObjectStore.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/store/InMemoryObjectStore.java 2008-08-01 11:34:54.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/util/store/InMemoryObjectStore.java 2012-12-10 14:28:10.757597472 -0500
+@@ -13,9 +13,8 @@
+
+ import java.util.Map;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentSkipListMap;
+-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.TimeUnit;
+
+ /**
+ * <code>InMemoryObjectStore</code> implements an optionally bounded
+@@ -89,7 +88,7 @@
+ boolean written = false;
+ while (!written)
+ {
+- written = (store.putIfAbsent(new Long(Utils.nanoTime()), obj) == null);
++ written = (store.putIfAbsent(new Long(System.nanoTime()), obj) == null);
+ }
+
+ return true;
+@@ -150,7 +149,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;
+
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/work/MuleWorkManager.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/work/MuleWorkManager.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/work/MuleWorkManager.java 2008-03-31 17:34:19.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/work/MuleWorkManager.java 2012-12-10 14:28:12.004650585 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/work/ScheduleWorkExecutor.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/work/ScheduleWorkExecutor.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/work/ScheduleWorkExecutor.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/work/ScheduleWorkExecutor.java 2012-12-10 14:28:11.999650371 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/work/StartWorkExecutor.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/work/StartWorkExecutor.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/work/StartWorkExecutor.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/work/StartWorkExecutor.java 2012-12-10 14:28:11.995650201 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/work/SyncWorkExecutor.java mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/work/SyncWorkExecutor.java
+--- mule-2.0.2.20080813/core/src/main/java/org/mule/work/SyncWorkExecutor.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/main/java/org/mule/work/SyncWorkExecutor.java 2012-12-10 14:28:11.993650116 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/core/src/test/java/org/mule/api/FutureMessageResultTestCase.java mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/api/FutureMessageResultTestCase.java
+--- mule-2.0.2.20080813/core/src/test/java/org/mule/api/FutureMessageResultTestCase.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/api/FutureMessageResultTestCase.java 2012-12-10 14:28:10.300578009 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/core/src/test/java/org/mule/DefaultExceptionStrategyTestCase.java mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/DefaultExceptionStrategyTestCase.java
+--- mule-2.0.2.20080813/core/src/test/java/org/mule/DefaultExceptionStrategyTestCase.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/DefaultExceptionStrategyTestCase.java 2012-12-10 14:28:10.302578093 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/core/src/test/java/org/mule/management/ServerNotificationsTestCase.java mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/management/ServerNotificationsTestCase.java
+--- mule-2.0.2.20080813/core/src/test/java/org/mule/management/ServerNotificationsTestCase.java 2008-03-05 12:31:34.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/management/ServerNotificationsTestCase.java 2012-12-10 14:28:10.282577242 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/test/java/org/mule/registry/RequestContextTestCase.java mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/registry/RequestContextTestCase.java
+--- mule-2.0.2.20080813/core/src/test/java/org/mule/registry/RequestContextTestCase.java 2008-04-17 07:49:28.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/registry/RequestContextTestCase.java 2012-12-10 14:28:10.411582736 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/core/src/test/java/org/mule/tck/AbstractMuleTestCase.java mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/tck/AbstractMuleTestCase.java
+--- mule-2.0.2.20080813/core/src/test/java/org/mule/tck/AbstractMuleTestCase.java 2008-05-31 15:08:25.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/tck/AbstractMuleTestCase.java 2012-12-10 14:28:10.340579711 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/test/java/org/mule/tck/TestCaseWatchdog.java mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/tck/TestCaseWatchdog.java
+--- mule-2.0.2.20080813/core/src/test/java/org/mule/tck/TestCaseWatchdog.java 2008-02-12 13:51:50.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/tck/TestCaseWatchdog.java 2012-12-10 14:28:10.336579542 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/core/src/test/java/org/mule/tck/TestCaseWatchdogTimeoutHandler.java mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/tck/TestCaseWatchdogTimeoutHandler.java
+--- mule-2.0.2.20080813/core/src/test/java/org/mule/tck/TestCaseWatchdogTimeoutHandler.java 2008-02-12 13:51:50.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/tck/TestCaseWatchdogTimeoutHandler.java 2012-12-10 14:28:10.332579371 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/core/src/test/java/org/mule/tck/testmodels/mule/TestTransaction.java mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/tck/testmodels/mule/TestTransaction.java
+--- mule-2.0.2.20080813/core/src/test/java/org/mule/tck/testmodels/mule/TestTransaction.java 2008-03-21 13:54:46.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/tck/testmodels/mule/TestTransaction.java 2012-12-10 14:28:10.362580649 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/core/src/test/java/org/mule/transaction/TransactionNotificationsTestCase.java mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/transaction/TransactionNotificationsTestCase.java
+--- mule-2.0.2.20080813/core/src/test/java/org/mule/transaction/TransactionNotificationsTestCase.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/transaction/TransactionNotificationsTestCase.java 2012-12-10 14:28:10.289577539 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/core/src/test/java/org/mule/util/concurrent/WaitPolicyTestCase.java mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/util/concurrent/WaitPolicyTestCase.java
+--- mule-2.0.2.20080813/core/src/test/java/org/mule/util/concurrent/WaitPolicyTestCase.java 2007-12-27 02:23:01.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/util/concurrent/WaitPolicyTestCase.java 2012-12-10 14:28:10.037566807 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/core/src/test/java/org/mule/util/ExpiryMonitorTestCase.java mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/util/ExpiryMonitorTestCase.java
+--- mule-2.0.2.20080813/core/src/test/java/org/mule/util/ExpiryMonitorTestCase.java 2008-06-16 08:03:59.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/core/src/test/java/org/mule/util/ExpiryMonitorTestCase.java 2012-12-10 14:28:10.020566083 -0500
+@@ -14,7 +14,7 @@
+ import org.mule.util.monitor.Expirable;
+ import org.mule.util.monitor.ExpiryMonitor;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ public class ExpiryMonitorTestCase extends AbstractMuleTestCase
+ {
+diff -ur mule-2.0.2.20080813/distributions/server/src/main/resources/licenses/backport-util-concurrent.license mule-2.0.2.20080813-nobackport/distributions/server/src/main/resources/licenses/backport-util-concurrent.license
+--- mule-2.0.2.20080813/distributions/server/src/main/resources/licenses/backport-util-concurrent.license 2005-11-08 10:42:10.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/distributions/server/src/main/resources/licenses/backport-util-concurrent.license 2012-12-10 14:28:18.868942921 -0500
+@@ -3,7 +3,7 @@
+ The software has been released to the public domain, as explained at:
+ http://creativecommons.org/licenses/publicdomain, excepting portions
+ of the class
+-edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList,
++java.util.concurrent.CopyOnWriteArrayList,
+ which were adapted from class java.util.ArrayList, written by Sun
+ Microsystems, Inc, which are used with kind permission, and subject
+ to the following:
+diff -ur mule-2.0.2.20080813/examples/loanbroker/common/src/main/java/org/mule/example/loanbroker/DefaultLoanBroker.java mule-2.0.2.20080813-nobackport/examples/loanbroker/common/src/main/java/org/mule/example/loanbroker/DefaultLoanBroker.java
+--- mule-2.0.2.20080813/examples/loanbroker/common/src/main/java/org/mule/example/loanbroker/DefaultLoanBroker.java 2008-02-12 15:04:43.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/examples/loanbroker/common/src/main/java/org/mule/example/loanbroker/DefaultLoanBroker.java 2012-12-10 14:28:12.609676353 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/examples/loanbroker/common-tests/src/main/java/org/mule/example/loanbroker/tests/AbstractAsynchronousLoanBrokerTestCase.java mule-2.0.2.20080813-nobackport/examples/loanbroker/common-tests/src/main/java/org/mule/example/loanbroker/tests/AbstractAsynchronousLoanBrokerTestCase.java
+--- mule-2.0.2.20080813/examples/loanbroker/common-tests/src/main/java/org/mule/example/loanbroker/tests/AbstractAsynchronousLoanBrokerTestCase.java 2008-03-17 11:16:00.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/examples/loanbroker/common-tests/src/main/java/org/mule/example/loanbroker/tests/AbstractAsynchronousLoanBrokerTestCase.java 2012-12-10 14:28:12.453669708 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/modules/acegi/src/test/java/org/mule/module/acegi/SecureHttpPollingFunctionalTestCase.java mule-2.0.2.20080813-nobackport/modules/acegi/src/test/java/org/mule/module/acegi/SecureHttpPollingFunctionalTestCase.java
+--- mule-2.0.2.20080813/modules/acegi/src/test/java/org/mule/module/acegi/SecureHttpPollingFunctionalTestCase.java 2008-08-01 11:34:54.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/modules/acegi/src/test/java/org/mule/module/acegi/SecureHttpPollingFunctionalTestCase.java 2012-12-10 14:28:14.708765752 -0500
+@@ -17,7 +17,7 @@
+ import org.mule.transport.http.HttpConnector;
+ import org.mule.util.concurrent.Latch;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ public class SecureHttpPollingFunctionalTestCase extends FunctionalTestCase
+ {
+diff -ur mule-2.0.2.20080813/modules/client/src/main/java/org/mule/module/client/MuleClient.java mule-2.0.2.20080813-nobackport/modules/client/src/main/java/org/mule/module/client/MuleClient.java
+--- mule-2.0.2.20080813/modules/client/src/main/java/org/mule/module/client/MuleClient.java 2008-05-15 09:44:09.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/modules/client/src/main/java/org/mule/module/client/MuleClient.java 2012-12-10 14:28:14.381751826 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/modules/client/src/main/java/org/mule/module/client/RemoteDispatcher.java mule-2.0.2.20080813-nobackport/modules/client/src/main/java/org/mule/module/client/RemoteDispatcher.java
+--- mule-2.0.2.20080813/modules/client/src/main/java/org/mule/module/client/RemoteDispatcher.java 2008-03-13 06:58:26.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/modules/client/src/main/java/org/mule/module/client/RemoteDispatcher.java 2012-12-10 14:28:14.357750803 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/modules/jca/jca-core/src/main/java/org/mule/module/jca/DelegateWorkManager.java mule-2.0.2.20080813-nobackport/modules/jca/jca-core/src/main/java/org/mule/module/jca/DelegateWorkManager.java
+--- mule-2.0.2.20080813/modules/jca/jca-core/src/main/java/org/mule/module/jca/DelegateWorkManager.java 2008-03-31 17:34:19.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/modules/jca/jca-core/src/main/java/org/mule/module/jca/DelegateWorkManager.java 2012-12-10 14:28:15.293790656 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/modules/management/src/main/java/org/mule/module/management/agent/JmxAgent.java mule-2.0.2.20080813-nobackport/modules/management/src/main/java/org/mule/module/management/agent/JmxAgent.java
+--- mule-2.0.2.20080813/modules/management/src/main/java/org/mule/module/management/agent/JmxAgent.java 2008-04-08 08:49:14.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/modules/management/src/main/java/org/mule/module/management/agent/JmxAgent.java 2012-12-10 14:28:14.578760216 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/modules/management/src/main/java/org/mule/module/management/agent/WrapperManagerAgent.java mule-2.0.2.20080813-nobackport/modules/management/src/main/java/org/mule/module/management/agent/WrapperManagerAgent.java
+--- mule-2.0.2.20080813/modules/management/src/main/java/org/mule/module/management/agent/WrapperManagerAgent.java 2008-03-31 17:34:19.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/modules/management/src/main/java/org/mule/module/management/agent/WrapperManagerAgent.java 2012-12-10 14:28:14.573760003 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/modules/spring-config/src/main/java/org/mule/config/spring/jndi/SpringInitialContextFactory.java mule-2.0.2.20080813-nobackport/modules/spring-config/src/main/java/org/mule/config/spring/jndi/SpringInitialContextFactory.java
+--- mule-2.0.2.20080813/modules/spring-config/src/main/java/org/mule/config/spring/jndi/SpringInitialContextFactory.java 2008-01-08 10:20:25.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/modules/spring-config/src/main/java/org/mule/config/spring/jndi/SpringInitialContextFactory.java 2012-12-10 14:28:14.869772596 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/modules/spring-config/src/main/java/org/mule/config/spring/parsers/delegate/AbstractSerialDelegatingDefinitionParser.java mule-2.0.2.20080813-nobackport/modules/spring-config/src/main/java/org/mule/config/spring/parsers/delegate/AbstractSerialDelegatingDefinitionParser.java
+--- mule-2.0.2.20080813/modules/spring-config/src/main/java/org/mule/config/spring/parsers/delegate/AbstractSerialDelegatingDefinitionParser.java 2008-01-23 16:09:56.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/modules/spring-config/src/main/java/org/mule/config/spring/parsers/delegate/AbstractSerialDelegatingDefinitionParser.java 2012-12-10 14:28:15.005778389 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/modules/spring-config/src/main/java/org/mule/config/spring/parsers/generic/AutoIdUtils.java mule-2.0.2.20080813-nobackport/modules/spring-config/src/main/java/org/mule/config/spring/parsers/generic/AutoIdUtils.java
+--- mule-2.0.2.20080813/modules/spring-config/src/main/java/org/mule/config/spring/parsers/generic/AutoIdUtils.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/modules/spring-config/src/main/java/org/mule/config/spring/parsers/generic/AutoIdUtils.java 2012-12-10 14:28:14.989777707 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/modules/spring-extras/src/main/java/org/mule/module/spring/events/AsynchronousEventListener.java mule-2.0.2.20080813-nobackport/modules/spring-extras/src/main/java/org/mule/module/spring/events/AsynchronousEventListener.java
+--- mule-2.0.2.20080813/modules/spring-extras/src/main/java/org/mule/module/spring/events/AsynchronousEventListener.java 2008-02-12 15:04:43.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/modules/spring-extras/src/main/java/org/mule/module/spring/events/AsynchronousEventListener.java 2012-12-10 14:28:15.403795341 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/modules/spring-extras/src/main/java/org/mule/module/spring/events/MuleEventMulticaster.java mule-2.0.2.20080813-nobackport/modules/spring-extras/src/main/java/org/mule/module/spring/events/MuleEventMulticaster.java
+--- mule-2.0.2.20080813/modules/spring-extras/src/main/java/org/mule/module/spring/events/MuleEventMulticaster.java 2012-12-10 14:29:37.212221504 -0500
++++ mule-2.0.2.20080813-nobackport/modules/spring-extras/src/main/java/org/mule/module/spring/events/MuleEventMulticaster.java 2012-12-10 14:28:15.414795807 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/modules/spring-extras/src/test/java/org/mule/module/spring/events/SpringEventsTestCase.java mule-2.0.2.20080813-nobackport/modules/spring-extras/src/test/java/org/mule/module/spring/events/SpringEventsTestCase.java
+--- mule-2.0.2.20080813/modules/spring-extras/src/test/java/org/mule/module/spring/events/SpringEventsTestCase.java 2008-02-18 15:29:34.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/modules/spring-extras/src/test/java/org/mule/module/spring/events/SpringEventsTestCase.java 2012-12-10 14:28:15.373794064 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/modules/xml/src/main/java/org/mule/module/xml/routing/RoundRobinXmlSplitter.java mule-2.0.2.20080813-nobackport/modules/xml/src/main/java/org/mule/module/xml/routing/RoundRobinXmlSplitter.java
+--- mule-2.0.2.20080813/modules/xml/src/main/java/org/mule/module/xml/routing/RoundRobinXmlSplitter.java 2008-04-11 09:08:05.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/modules/xml/src/main/java/org/mule/module/xml/routing/RoundRobinXmlSplitter.java 2012-12-10 14:28:14.242745905 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/modules/xml/src/main/java/org/mule/module/xml/transformer/AbstractXStreamTransformer.java mule-2.0.2.20080813-nobackport/modules/xml/src/main/java/org/mule/module/xml/transformer/AbstractXStreamTransformer.java
+--- mule-2.0.2.20080813/modules/xml/src/main/java/org/mule/module/xml/transformer/AbstractXStreamTransformer.java 2008-03-06 18:48:23.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/modules/xml/src/main/java/org/mule/module/xml/transformer/AbstractXStreamTransformer.java 2012-12-10 14:28:14.283747651 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/modules/xml/src/main/java/org/mule/module/xml/transformer/XStreamFactory.java mule-2.0.2.20080813-nobackport/modules/xml/src/main/java/org/mule/module/xml/transformer/XStreamFactory.java
+--- mule-2.0.2.20080813/modules/xml/src/main/java/org/mule/module/xml/transformer/XStreamFactory.java 2008-03-06 18:48:23.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/modules/xml/src/main/java/org/mule/module/xml/transformer/XStreamFactory.java 2012-12-10 14:28:14.272747182 -0500
+@@ -88,7 +88,7 @@
+ {
+ String className = aClass.getName();
+ return className.equals("java.util.concurrent.ConcurrentHashMap")
+- || className.equals("edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap");
++ || className.equals("java.util.concurrent.ConcurrentHashMap");
+ }
+ }
+
+diff -ur mule-2.0.2.20080813/modules/xml/src/test/java/org/mule/transformers/xml/ParallelXsltTransformerTestCase.java mule-2.0.2.20080813-nobackport/modules/xml/src/test/java/org/mule/transformers/xml/ParallelXsltTransformerTestCase.java
+--- mule-2.0.2.20080813/modules/xml/src/test/java/org/mule/transformers/xml/ParallelXsltTransformerTestCase.java 2008-03-06 18:48:23.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/modules/xml/src/test/java/org/mule/transformers/xml/ParallelXsltTransformerTestCase.java 2012-12-10 14:28:14.194743860 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/modules/xml/src/test/java/org/mule/transformers/xml/XmlUMOMessageTransformersTestCase.java mule-2.0.2.20080813-nobackport/modules/xml/src/test/java/org/mule/transformers/xml/XmlUMOMessageTransformersTestCase.java
+--- mule-2.0.2.20080813/modules/xml/src/test/java/org/mule/transformers/xml/XmlUMOMessageTransformersTestCase.java 2008-07-15 13:32:56.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/modules/xml/src/test/java/org/mule/transformers/xml/XmlUMOMessageTransformersTestCase.java 2012-12-10 14:28:14.215744755 -0500
+@@ -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";
+ }
+diff -ur mule-2.0.2.20080813/modules/xml/src/test/java/org/mule/transformers/xml/XStreamFactoryTestCase.java mule-2.0.2.20080813-nobackport/modules/xml/src/test/java/org/mule/transformers/xml/XStreamFactoryTestCase.java
+--- mule-2.0.2.20080813/modules/xml/src/test/java/org/mule/transformers/xml/XStreamFactoryTestCase.java 2008-03-06 18:48:23.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/modules/xml/src/test/java/org/mule/transformers/xml/XStreamFactoryTestCase.java 2012-12-10 14:28:14.207744415 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/tests/functional/src/main/java/org/mule/tck/functional/CountdownCallback.java mule-2.0.2.20080813-nobackport/tests/functional/src/main/java/org/mule/tck/functional/CountdownCallback.java
+--- mule-2.0.2.20080813/tests/functional/src/main/java/org/mule/tck/functional/CountdownCallback.java 2008-06-12 05:04:04.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/functional/src/main/java/org/mule/tck/functional/CountdownCallback.java 2012-12-10 14:28:13.060695561 -0500
+@@ -13,8 +13,8 @@
+ import org.mule.api.lifecycle.InitialisationException;
+ import org.mule.config.i18n.MessageFactory;
+
+-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;
+ import junit.framework.AssertionFailedError;
+
+ public class CountdownCallback implements EventCallback
+diff -ur mule-2.0.2.20080813/tests/functional/src/main/java/org/mule/tck/functional/CounterCallback.java mule-2.0.2.20080813-nobackport/tests/functional/src/main/java/org/mule/tck/functional/CounterCallback.java
+--- mule-2.0.2.20080813/tests/functional/src/main/java/org/mule/tck/functional/CounterCallback.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/tests/functional/src/main/java/org/mule/tck/functional/CounterCallback.java 2012-12-10 14:28:13.055695348 -0500
+@@ -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.
+diff -ur mule-2.0.2.20080813/tests/functional/src/main/java/org/mule/tck/functional/FunctionalStreamingTestComponent.java mule-2.0.2.20080813-nobackport/tests/functional/src/main/java/org/mule/tck/functional/FunctionalStreamingTestComponent.java
+--- mule-2.0.2.20080813/tests/functional/src/main/java/org/mule/tck/functional/FunctionalStreamingTestComponent.java 2008-06-12 05:04:04.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/functional/src/main/java/org/mule/tck/functional/FunctionalStreamingTestComponent.java 2012-12-10 14:28:13.062695647 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/tests/functional/src/main/java/org/mule/tck/functional/FunctionalTestComponent.java mule-2.0.2.20080813-nobackport/tests/functional/src/main/java/org/mule/tck/functional/FunctionalTestComponent.java
+--- mule-2.0.2.20080813/tests/functional/src/main/java/org/mule/tck/functional/FunctionalTestComponent.java 2008-06-26 16:05:55.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/functional/src/main/java/org/mule/tck/functional/FunctionalTestComponent.java 2012-12-10 14:28:13.066695817 -0500
+@@ -26,7 +26,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;
+diff -ur mule-2.0.2.20080813/tests/functional/src/main/java/org/mule/tck/testmodels/services/TestComponent.java mule-2.0.2.20080813-nobackport/tests/functional/src/main/java/org/mule/tck/testmodels/services/TestComponent.java
+--- mule-2.0.2.20080813/tests/functional/src/main/java/org/mule/tck/testmodels/services/TestComponent.java 2008-06-12 05:04:04.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/functional/src/main/java/org/mule/tck/testmodels/services/TestComponent.java 2012-12-10 14:28:13.105697479 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/tests/functional/src/main/java/org/mule/tck/testmodels/services/TestReceiver.java mule-2.0.2.20080813-nobackport/tests/functional/src/main/java/org/mule/tck/testmodels/services/TestReceiver.java
+--- mule-2.0.2.20080813/tests/functional/src/main/java/org/mule/tck/testmodels/services/TestReceiver.java 2008-06-12 05:04:04.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/functional/src/main/java/org/mule/tck/testmodels/services/TestReceiver.java 2012-12-10 14:28:13.092696924 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/config/spring/FunctionalTestAdvice.java mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/config/spring/FunctionalTestAdvice.java
+--- mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/config/spring/FunctionalTestAdvice.java 2008-03-14 07:48:22.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/config/spring/FunctionalTestAdvice.java 2012-12-10 14:28:13.488713791 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/routing/outbound/ChainingRouterPropertyPropagationTestCase.java mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/routing/outbound/ChainingRouterPropertyPropagationTestCase.java
+--- mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/routing/outbound/ChainingRouterPropertyPropagationTestCase.java 2008-06-12 05:04:04.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/routing/outbound/ChainingRouterPropertyPropagationTestCase.java 2012-12-10 14:28:13.480713450 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/messaging/meps/InOnlyTestCase.java mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/messaging/meps/InOnlyTestCase.java
+--- mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/messaging/meps/InOnlyTestCase.java 2008-06-02 07:12:59.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/messaging/meps/InOnlyTestCase.java 2012-12-10 14:28:13.858729549 -0500
+@@ -15,7 +15,7 @@
+ import org.mule.api.context.notification.ServerNotification;
+ import org.mule.util.concurrent.Latch;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ // START SNIPPET: full-class
+ public class InOnlyTestCase extends FunctionalTestCase
+diff -ur mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/routing/AsyncReplyTimeoutFailTestCase.java mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/routing/AsyncReplyTimeoutFailTestCase.java
+--- mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/routing/AsyncReplyTimeoutFailTestCase.java 2008-03-30 17:13:10.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/routing/AsyncReplyTimeoutFailTestCase.java 2012-12-10 14:28:13.664721287 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/routing/AsyncReplyTimeoutTestCase.java mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/routing/AsyncReplyTimeoutTestCase.java
+--- mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/routing/AsyncReplyTimeoutTestCase.java 2008-03-30 17:13:10.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/routing/AsyncReplyTimeoutTestCase.java 2012-12-10 14:28:13.646720521 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/routing/InboundAggregationWithTimeoutTestCase.java mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/routing/InboundAggregationWithTimeoutTestCase.java
+--- mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/routing/InboundAggregationWithTimeoutTestCase.java 2008-04-11 09:08:05.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/routing/InboundAggregationWithTimeoutTestCase.java 2012-12-10 14:28:13.636720095 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/routing/MessageChunkingTestCase.java mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/routing/MessageChunkingTestCase.java
+--- mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/routing/MessageChunkingTestCase.java 2008-07-07 17:25:01.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/routing/MessageChunkingTestCase.java 2012-12-10 14:28:13.657720989 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/routing/WireTapTestCase.java mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/routing/WireTapTestCase.java
+--- mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/routing/WireTapTestCase.java 2008-06-02 07:08:00.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/routing/WireTapTestCase.java 2012-12-10 14:28:13.676721798 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/spring/events/async/SpringEventsJmsAsyncExampleTestCase.java mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/spring/events/async/SpringEventsJmsAsyncExampleTestCase.java
+--- mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/spring/events/async/SpringEventsJmsAsyncExampleTestCase.java 2008-03-14 23:12:09.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/spring/events/async/SpringEventsJmsAsyncExampleTestCase.java 2012-12-10 14:28:13.769725759 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/spring/events/SpringEventsJmsExampleTestCase.java mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/spring/events/SpringEventsJmsExampleTestCase.java
+--- mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/spring/events/SpringEventsJmsExampleTestCase.java 2008-02-27 09:55:47.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/spring/events/SpringEventsJmsExampleTestCase.java 2012-12-10 14:28:13.773725930 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/transport/jdbc/AbstractJdbcTransactionalFunctionalTestCase.java mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/transport/jdbc/AbstractJdbcTransactionalFunctionalTestCase.java
+--- mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/integration/transport/jdbc/AbstractJdbcTransactionalFunctionalTestCase.java 2008-03-16 13:44:10.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/integration/transport/jdbc/AbstractJdbcTransactionalFunctionalTestCase.java 2012-12-10 14:28:13.605718774 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/transformers/AutoTransformerTestCase.java mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/transformers/AutoTransformerTestCase.java
+--- mule-2.0.2.20080813/tests/integration/src/test/java/org/mule/test/transformers/AutoTransformerTestCase.java 2008-04-18 18:39:51.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/tests/integration/src/test/java/org/mule/test/transformers/AutoTransformerTestCase.java 2012-12-10 14:28:13.569717241 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/email/src/test/java/org/mule/transport/email/AutoIncrementGreenMailSupport.java mule-2.0.2.20080813-nobackport/transports/email/src/test/java/org/mule/transport/email/AutoIncrementGreenMailSupport.java
+--- mule-2.0.2.20080813/transports/email/src/test/java/org/mule/transport/email/AutoIncrementGreenMailSupport.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/email/src/test/java/org/mule/transport/email/AutoIncrementGreenMailSupport.java 2012-12-10 14:28:17.727894325 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/email/src/test/java/org/mule/transport/email/connectors/AbstractMailConnectorFunctionalTestCase.java mule-2.0.2.20080813-nobackport/transports/email/src/test/java/org/mule/transport/email/connectors/AbstractMailConnectorFunctionalTestCase.java
+--- mule-2.0.2.20080813/transports/email/src/test/java/org/mule/transport/email/connectors/AbstractMailConnectorFunctionalTestCase.java 2008-03-25 23:22:01.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/email/src/test/java/org/mule/transport/email/connectors/AbstractMailConnectorFunctionalTestCase.java 2012-12-10 14:28:17.714893770 -0500
+@@ -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.
+diff -ur mule-2.0.2.20080813/transports/email/src/test/java/org/mule/transport/email/connectors/AbstractReceivingMailConnectorTestCase.java mule-2.0.2.20080813-nobackport/transports/email/src/test/java/org/mule/transport/email/connectors/AbstractReceivingMailConnectorTestCase.java
+--- mule-2.0.2.20080813/transports/email/src/test/java/org/mule/transport/email/connectors/AbstractReceivingMailConnectorTestCase.java 2008-02-22 14:01:02.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/email/src/test/java/org/mule/transport/email/connectors/AbstractReceivingMailConnectorTestCase.java 2012-12-10 14:28:17.716893854 -0500
+@@ -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,
+diff -ur mule-2.0.2.20080813/transports/file/src/main/java/org/mule/transport/file/FileMessageReceiver.java mule-2.0.2.20080813-nobackport/transports/file/src/main/java/org/mule/transport/file/FileMessageReceiver.java
+--- mule-2.0.2.20080813/transports/file/src/main/java/org/mule/transport/file/FileMessageReceiver.java 2008-02-22 14:01:02.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/file/src/main/java/org/mule/transport/file/FileMessageReceiver.java 2012-12-10 14:28:16.217830010 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/transports/file/src/main/java/org/mule/transport/file/SimpleFilenameParser.java mule-2.0.2.20080813-nobackport/transports/file/src/main/java/org/mule/transport/file/SimpleFilenameParser.java
+--- mule-2.0.2.20080813/transports/file/src/main/java/org/mule/transport/file/SimpleFilenameParser.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/file/src/main/java/org/mule/transport/file/SimpleFilenameParser.java 2012-12-10 14:28:16.222830222 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/transports/file/src/test/java/org/mule/transport/file/FileComparatorTestCase.java mule-2.0.2.20080813-nobackport/transports/file/src/test/java/org/mule/transport/file/FileComparatorTestCase.java
+--- mule-2.0.2.20080813/transports/file/src/test/java/org/mule/transport/file/FileComparatorTestCase.java 2008-06-12 05:04:04.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/file/src/test/java/org/mule/transport/file/FileComparatorTestCase.java 2012-12-10 14:28:16.163827709 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/file/src/test/java/org/mule/transport/file/FileReceiverMoveDeleteTestCase.java mule-2.0.2.20080813-nobackport/transports/file/src/test/java/org/mule/transport/file/FileReceiverMoveDeleteTestCase.java
+--- mule-2.0.2.20080813/transports/file/src/test/java/org/mule/transport/file/FileReceiverMoveDeleteTestCase.java 2008-06-12 05:04:04.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/file/src/test/java/org/mule/transport/file/FileReceiverMoveDeleteTestCase.java 2012-12-10 14:28:16.196829117 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/ftp/src/test/java/org/mule/transport/ftp/FtpStreamingTestCase.java mule-2.0.2.20080813-nobackport/transports/ftp/src/test/java/org/mule/transport/ftp/FtpStreamingTestCase.java
+--- mule-2.0.2.20080813/transports/ftp/src/test/java/org/mule/transport/ftp/FtpStreamingTestCase.java 2008-02-26 13:18:22.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/ftp/src/test/java/org/mule/transport/ftp/FtpStreamingTestCase.java 2012-12-10 14:28:15.518800238 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/transports/ftp/src/test/java/org/mule/transport/ftp/issues/MultiStreamMule1696TestCase.java mule-2.0.2.20080813-nobackport/transports/ftp/src/test/java/org/mule/transport/ftp/issues/MultiStreamMule1696TestCase.java
+--- mule-2.0.2.20080813/transports/ftp/src/test/java/org/mule/transport/ftp/issues/MultiStreamMule1696TestCase.java 2008-02-26 13:18:22.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/ftp/src/test/java/org/mule/transport/ftp/issues/MultiStreamMule1696TestCase.java 2012-12-10 14:28:15.514800068 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/ftp/src/test/java/org/mule/transport/ftp/server/FileView.java mule-2.0.2.20080813-nobackport/transports/ftp/src/test/java/org/mule/transport/ftp/server/FileView.java
+--- mule-2.0.2.20080813/transports/ftp/src/test/java/org/mule/transport/ftp/server/FileView.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/ftp/src/test/java/org/mule/transport/ftp/server/FileView.java 2012-12-10 14:28:15.539801131 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/transports/ftp/src/test/java/org/mule/transport/ftp/server/InOutState.java mule-2.0.2.20080813-nobackport/transports/ftp/src/test/java/org/mule/transport/ftp/server/InOutState.java
+--- mule-2.0.2.20080813/transports/ftp/src/test/java/org/mule/transport/ftp/server/InOutState.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/ftp/src/test/java/org/mule/transport/ftp/server/InOutState.java 2012-12-10 14:28:15.533800876 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/http/src/main/java/org/mule/transport/http/HttpMessageReceiver.java mule-2.0.2.20080813-nobackport/transports/http/src/main/java/org/mule/transport/http/HttpMessageReceiver.java
+--- mule-2.0.2.20080813/transports/http/src/main/java/org/mule/transport/http/HttpMessageReceiver.java 2008-06-20 05:40:51.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/http/src/main/java/org/mule/transport/http/HttpMessageReceiver.java 2012-12-10 14:28:16.108825368 -0500
+@@ -49,7 +49,7 @@
+
+ import javax.resource.spi.work.Work;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ import org.apache.commons.httpclient.Cookie;
+ import org.apache.commons.httpclient.Header;
+diff -ur mule-2.0.2.20080813/transports/http/src/test/java/org/mule/transport/http/functional/HttpCookieTestCase.java mule-2.0.2.20080813-nobackport/transports/http/src/test/java/org/mule/transport/http/functional/HttpCookieTestCase.java
+--- mule-2.0.2.20080813/transports/http/src/test/java/org/mule/transport/http/functional/HttpCookieTestCase.java 2008-02-22 13:10:00.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/http/src/test/java/org/mule/transport/http/functional/HttpCookieTestCase.java 2012-12-10 14:28:15.999820725 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/http/src/test/java/org/mule/transport/http/functional/HttpPollingWithTransformersFunctionalTestCase.java mule-2.0.2.20080813-nobackport/transports/http/src/test/java/org/mule/transport/http/functional/HttpPollingWithTransformersFunctionalTestCase.java
+--- mule-2.0.2.20080813/transports/http/src/test/java/org/mule/transport/http/functional/HttpPollingWithTransformersFunctionalTestCase.java 2008-06-10 11:17:12.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/http/src/test/java/org/mule/transport/http/functional/HttpPollingWithTransformersFunctionalTestCase.java 2012-12-10 14:28:15.984820087 -0500
+@@ -17,8 +17,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.AtomicBoolean;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicBoolean;
+
+ public class HttpPollingWithTransformersFunctionalTestCase extends FunctionalTestCase
+ {
+diff -ur mule-2.0.2.20080813/transports/http/src/test/java/org/mule/transport/http/functional/HttpsFunctionalTestCase.java mule-2.0.2.20080813-nobackport/transports/http/src/test/java/org/mule/transport/http/functional/HttpsFunctionalTestCase.java
+--- mule-2.0.2.20080813/transports/http/src/test/java/org/mule/transport/http/functional/HttpsFunctionalTestCase.java 2008-06-12 05:04:04.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/http/src/test/java/org/mule/transport/http/functional/HttpsFunctionalTestCase.java 2012-12-10 14:28:16.012821279 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/http/src/test/java/org/mule/transport/http/functional/PollingEtagTestCase.java mule-2.0.2.20080813-nobackport/transports/http/src/test/java/org/mule/transport/http/functional/PollingEtagTestCase.java
+--- mule-2.0.2.20080813/transports/http/src/test/java/org/mule/transport/http/functional/PollingEtagTestCase.java 2008-06-12 05:04:04.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/http/src/test/java/org/mule/transport/http/functional/PollingEtagTestCase.java 2012-12-10 14:28:15.986820171 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/http/src/test/java/org/mule/transport/http/functional/PollingReceiversRestartTestCase.java mule-2.0.2.20080813-nobackport/transports/http/src/test/java/org/mule/transport/http/functional/PollingReceiversRestartTestCase.java
+--- mule-2.0.2.20080813/transports/http/src/test/java/org/mule/transport/http/functional/PollingReceiversRestartTestCase.java 2008-06-12 05:04:04.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/http/src/test/java/org/mule/transport/http/functional/PollingReceiversRestartTestCase.java 2012-12-10 14:28:16.002820851 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/jetty/src/main/java/org/mule/transport/servlet/jetty/JettyReceiverServlet.java mule-2.0.2.20080813-nobackport/transports/jetty/src/main/java/org/mule/transport/servlet/jetty/JettyReceiverServlet.java
+--- mule-2.0.2.20080813/transports/jetty/src/main/java/org/mule/transport/servlet/jetty/JettyReceiverServlet.java 2008-07-13 16:07:11.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/jetty/src/main/java/org/mule/transport/servlet/jetty/JettyReceiverServlet.java 2012-12-10 14:28:17.948903737 -0500
+@@ -23,8 +23,8 @@
+ import javax.servlet.ServletException;
+ import javax.servlet.http.HttpServletRequest;
+
+-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;
+
+ public class JettyReceiverServlet extends MuleReceiverServlet
+ {
+diff -ur mule-2.0.2.20080813/transports/jetty/src/test/java/org/mule/transport/servlet/jetty/JettyHttpsFunctionalTestCase.java mule-2.0.2.20080813-nobackport/transports/jetty/src/test/java/org/mule/transport/servlet/jetty/JettyHttpsFunctionalTestCase.java
+--- mule-2.0.2.20080813/transports/jetty/src/test/java/org/mule/transport/servlet/jetty/JettyHttpsFunctionalTestCase.java 2008-08-01 11:34:54.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/jetty/src/test/java/org/mule/transport/servlet/jetty/JettyHttpsFunctionalTestCase.java 2012-12-10 14:28:17.913902244 -0500
+@@ -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 JettyHttpsFunctionalTestCase extends HttpFunctionalTestCase
+ {
+diff -ur mule-2.0.2.20080813/transports/jms/src/main/java/org/mule/transport/jms/JmsConnector.java mule-2.0.2.20080813-nobackport/transports/jms/src/main/java/org/mule/transport/jms/JmsConnector.java
+--- mule-2.0.2.20080813/transports/jms/src/main/java/org/mule/transport/jms/JmsConnector.java 2008-07-25 11:49:47.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/jms/src/main/java/org/mule/transport/jms/JmsConnector.java 2012-12-10 14:28:18.162912851 -0500
+@@ -49,7 +49,7 @@
+ import javax.jms.XAConnectionFactory;
+ import javax.naming.NamingException;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
++import java.util.concurrent.atomic.AtomicInteger;
+
+ import org.apache.commons.lang.UnhandledException;
+
+diff -ur mule-2.0.2.20080813/transports/jms/src/main/java/org/mule/transport/jms/JmsMessageDispatcher.java mule-2.0.2.20080813-nobackport/transports/jms/src/main/java/org/mule/transport/jms/JmsMessageDispatcher.java
+--- mule-2.0.2.20080813/transports/jms/src/main/java/org/mule/transport/jms/JmsMessageDispatcher.java 2008-06-10 12:51:33.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/jms/src/main/java/org/mule/transport/jms/JmsMessageDispatcher.java 2012-12-10 14:28:18.198914385 -0500
+@@ -39,7 +39,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;
+
+diff -ur mule-2.0.2.20080813/transports/jms/src/main/java/org/mule/transport/jms/MultiConsumerJmsMessageReceiver.java mule-2.0.2.20080813-nobackport/transports/jms/src/main/java/org/mule/transport/jms/MultiConsumerJmsMessageReceiver.java
+--- mule-2.0.2.20080813/transports/jms/src/main/java/org/mule/transport/jms/MultiConsumerJmsMessageReceiver.java 2008-07-25 11:21:06.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/jms/src/main/java/org/mule/transport/jms/MultiConsumerJmsMessageReceiver.java 2012-12-10 14:28:18.247916470 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/transports/jms/src/main/java/org/mule/transport/jms/XaTransactedJmsMessageReceiver.java mule-2.0.2.20080813-nobackport/transports/jms/src/main/java/org/mule/transport/jms/XaTransactedJmsMessageReceiver.java
+--- mule-2.0.2.20080813/transports/jms/src/main/java/org/mule/transport/jms/XaTransactedJmsMessageReceiver.java 2008-06-26 16:05:55.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/jms/src/main/java/org/mule/transport/jms/XaTransactedJmsMessageReceiver.java 2012-12-10 14:28:18.228915662 -0500
+@@ -37,7 +37,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
+ {
+diff -ur mule-2.0.2.20080813/transports/jms/src/test/java/org/mule/transport/jms/integration/JmsXAAlwaysBeginTestCase.java mule-2.0.2.20080813-nobackport/transports/jms/src/test/java/org/mule/transport/jms/integration/JmsXAAlwaysBeginTestCase.java
+--- mule-2.0.2.20080813/transports/jms/src/test/java/org/mule/transport/jms/integration/JmsXAAlwaysBeginTestCase.java 2008-02-12 13:51:50.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/jms/src/test/java/org/mule/transport/jms/integration/JmsXAAlwaysBeginTestCase.java 2012-12-10 14:28:18.113910763 -0500
+@@ -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;
+
+diff -ur mule-2.0.2.20080813/transports/jms/src/test/java/org/mule/transport/jms/issues/JmsReconnectionFunctionalMule1720TestCase.java mule-2.0.2.20080813-nobackport/transports/jms/src/test/java/org/mule/transport/jms/issues/JmsReconnectionFunctionalMule1720TestCase.java
+--- mule-2.0.2.20080813/transports/jms/src/test/java/org/mule/transport/jms/issues/JmsReconnectionFunctionalMule1720TestCase.java 2008-07-01 16:09:45.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/jms/src/test/java/org/mule/transport/jms/issues/JmsReconnectionFunctionalMule1720TestCase.java 2012-12-10 14:28:18.035907442 -0500
+@@ -19,7 +19,7 @@
+
+ import javax.jms.JMSException;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ public class JmsReconnectionFunctionalMule1720TestCase extends AbstractJmsFunctionalTestCase
+ {
+diff -ur mule-2.0.2.20080813/transports/ssl/src/main/java/org/mule/transport/ssl/SslMessageReceiver.java mule-2.0.2.20080813-nobackport/transports/ssl/src/main/java/org/mule/transport/ssl/SslMessageReceiver.java
+--- mule-2.0.2.20080813/transports/ssl/src/main/java/org/mule/transport/ssl/SslMessageReceiver.java 2008-02-22 14:01:02.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/ssl/src/main/java/org/mule/transport/ssl/SslMessageReceiver.java 2012-12-10 14:28:18.427924138 -0500
+@@ -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
+diff -ur mule-2.0.2.20080813/transports/ssl/src/test/java/org/mule/transport/ssl/SaveCertificateCallback.java mule-2.0.2.20080813-nobackport/transports/ssl/src/test/java/org/mule/transport/ssl/SaveCertificateCallback.java
+--- mule-2.0.2.20080813/transports/ssl/src/test/java/org/mule/transport/ssl/SaveCertificateCallback.java 2008-02-12 15:53:32.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/ssl/src/test/java/org/mule/transport/ssl/SaveCertificateCallback.java 2012-12-10 14:28:18.372921794 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/tcp/src/main/java/org/mule/transport/tcp/protocols/XmlMessageProtocol.java mule-2.0.2.20080813-nobackport/transports/tcp/src/main/java/org/mule/transport/tcp/protocols/XmlMessageProtocol.java
+--- mule-2.0.2.20080813/transports/tcp/src/main/java/org/mule/transport/tcp/protocols/XmlMessageProtocol.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/tcp/src/main/java/org/mule/transport/tcp/protocols/XmlMessageProtocol.java 2012-12-10 14:28:16.829856077 -0500
+@@ -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>
+diff -ur mule-2.0.2.20080813/transports/tcp/src/main/java/org/mule/transport/tcp/TcpMessageReceiver.java mule-2.0.2.20080813-nobackport/transports/tcp/src/main/java/org/mule/transport/tcp/TcpMessageReceiver.java
+--- mule-2.0.2.20080813/transports/tcp/src/main/java/org/mule/transport/tcp/TcpMessageReceiver.java 2008-06-20 05:40:51.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/tcp/src/main/java/org/mule/transport/tcp/TcpMessageReceiver.java 2012-12-10 14:28:16.873857948 -0500
+@@ -44,7 +44,7 @@
+ import javax.resource.spi.work.WorkException;
+ import javax.resource.spi.work.WorkManager;
+
+-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
++import java.util.concurrent.TimeUnit;
+
+ /**
+ * <code>TcpMessageReceiver</code> acts like a TCP server to receive socket
+diff -ur mule-2.0.2.20080813/transports/tcp/src/test/java/org/mule/transport/tcp/integration/AbstractStreamingCapacityTestCase.java mule-2.0.2.20080813-nobackport/transports/tcp/src/test/java/org/mule/transport/tcp/integration/AbstractStreamingCapacityTestCase.java
+--- mule-2.0.2.20080813/transports/tcp/src/test/java/org/mule/transport/tcp/integration/AbstractStreamingCapacityTestCase.java 2008-03-05 08:46:23.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/tcp/src/test/java/org/mule/transport/tcp/integration/AbstractStreamingCapacityTestCase.java 2012-12-10 14:28:16.769853521 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/transports/tcp/src/test/java/org/mule/transport/tcp/integration/StreamingTestCase.java mule-2.0.2.20080813-nobackport/transports/tcp/src/test/java/org/mule/transport/tcp/integration/StreamingTestCase.java
+--- mule-2.0.2.20080813/transports/tcp/src/test/java/org/mule/transport/tcp/integration/StreamingTestCase.java 2008-03-05 08:46:23.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/tcp/src/test/java/org/mule/transport/tcp/integration/StreamingTestCase.java 2012-12-10 14:28:16.790854415 -0500
+@@ -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.
+diff -ur mule-2.0.2.20080813/transports/tcp/src/test/java/org/mule/transport/tcp/issues/KeepSendSocketOpenMule1491TestCase.java mule-2.0.2.20080813-nobackport/transports/tcp/src/test/java/org/mule/transport/tcp/issues/KeepSendSocketOpenMule1491TestCase.java
+--- mule-2.0.2.20080813/transports/tcp/src/test/java/org/mule/transport/tcp/issues/KeepSendSocketOpenMule1491TestCase.java 2008-03-05 08:46:23.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/tcp/src/test/java/org/mule/transport/tcp/issues/KeepSendSocketOpenMule1491TestCase.java 2012-12-10 14:28:16.735852071 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/tcp/src/test/java/org/mule/transport/tcp/issues/LengthProtocolLengthTestCase.java mule-2.0.2.20080813-nobackport/transports/tcp/src/test/java/org/mule/transport/tcp/issues/LengthProtocolLengthTestCase.java
+--- mule-2.0.2.20080813/transports/tcp/src/test/java/org/mule/transport/tcp/issues/LengthProtocolLengthTestCase.java 2008-02-12 15:04:43.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/tcp/src/test/java/org/mule/transport/tcp/issues/LengthProtocolLengthTestCase.java 2012-12-10 14:28:16.726851690 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/tcp/src/test/java/org/mule/transport/tcp/issues/MultiStreamMule1692TestCase.java mule-2.0.2.20080813-nobackport/transports/tcp/src/test/java/org/mule/transport/tcp/issues/MultiStreamMule1692TestCase.java
+--- mule-2.0.2.20080813/transports/tcp/src/test/java/org/mule/transport/tcp/issues/MultiStreamMule1692TestCase.java 2008-03-05 08:46:23.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/tcp/src/test/java/org/mule/transport/tcp/issues/MultiStreamMule1692TestCase.java 2012-12-10 14:28:16.751852753 -0500
+@@ -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;
+diff -ur mule-2.0.2.20080813/transports/udp/src/test/java/org/mule/transport/udp/functional/UdpRoundTripTestCase.java mule-2.0.2.20080813-nobackport/transports/udp/src/test/java/org/mule/transport/udp/functional/UdpRoundTripTestCase.java
+--- mule-2.0.2.20080813/transports/udp/src/test/java/org/mule/transport/udp/functional/UdpRoundTripTestCase.java 2008-01-23 12:53:38.000000000 -0500
++++ mule-2.0.2.20080813-nobackport/transports/udp/src/test/java/org/mule/transport/udp/functional/UdpRoundTripTestCase.java 2012-12-10 14:28:17.282875371 -0500
+@@ -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
+ {
+diff -ur mule-2.0.2.20080813/transports/vm/src/main/java/org/mule/transport/vm/VMMessageReceiver.java mule-2.0.2.20080813-nobackport/transports/vm/src/main/java/org/mule/transport/vm/VMMessageReceiver.java
+--- mule-2.0.2.20080813/transports/vm/src/main/java/org/mule/transport/vm/VMMessageReceiver.java 2008-06-26 16:05:55.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/vm/src/main/java/org/mule/transport/vm/VMMessageReceiver.java 2012-12-10 14:28:16.569845002 -0500
+@@ -26,7 +26,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
+diff -ur mule-2.0.2.20080813/transports/vm/src/test/java/org/mule/issues/MulticastRouterMule2112TestCase.java mule-2.0.2.20080813-nobackport/transports/vm/src/test/java/org/mule/issues/MulticastRouterMule2112TestCase.java
+--- mule-2.0.2.20080813/transports/vm/src/test/java/org/mule/issues/MulticastRouterMule2112TestCase.java 2008-06-12 05:04:04.000000000 -0400
++++ mule-2.0.2.20080813-nobackport/transports/vm/src/test/java/org/mule/issues/MulticastRouterMule2112TestCase.java 2012-12-10 14:28:16.553844319 -0500
+@@ -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
+ {
diff --git a/mule.spec b/mule.spec
index b1a4609..3d5da6e 100644
--- a/mule.spec
+++ b/mule.spec
@@ -6,7 +6,7 @@
Name: mule
Version: 2.0.2.20080813
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Mule Enterprise Service Bus Java libraries
License: CPAL
Group: Development/Libraries
@@ -37,6 +37,8 @@ Patch9: mule-disable-classpath-in-manifest.patch
Patch10: mule-mx4j.patch
# spring 3.1
Patch11: mule-spring31.patch
+# Remove backport-util-concurrent dep
+Patch12: mule-no-backport.patch
BuildArch: noarch
BuildRequires: jpackage-utils
@@ -55,7 +57,6 @@ BuildRequires: apache-commons-jxpath
BuildRequires: apache-commons-lang
BuildRequires: apache-commons-ognl
BuildRequires: apache-commons-pool
-BuildRequires: backport-util-concurrent
BuildRequires: bea-stax-api
BuildRequires: dom4j
BuildRequires: geronimo-ejb
@@ -95,7 +96,6 @@ Requires: apache-commons-collections
Requires: apache-commons-io
Requires: apache-commons-lang
Requires: apache-commons-pool
-Requires: backport-util-concurrent
Requires: java-service-wrapper
Requires: java-uuid-generator
Requires: jboss-connector-1.6-api
@@ -135,7 +135,6 @@ Requires: tomcat-servlet-3.0-api
Summary: MuleClient interface
Requires: apache-commons-io
Requires: apache-commons-lang
-Requires: backport-util-concurrent
Requires: mule = %{version}-%{release}
Requires: mule-module-spring-config = %{version}-%{release}
Requires: slf4j
@@ -180,7 +179,6 @@ Requires: xml-commons-apis
%package module-spring-config
Summary: Mule Builder for use with Spring Namespace based XML config
-Requires: backport-util-concurrent
Requires: mule = %{version}-%{release}
Requires: slf4j
Requires: %{spring}
@@ -199,7 +197,6 @@ Requires: apache-commons-io
Requires: apache-commons-jxpath
Requires: apache-commons-lang
Requires: apache-commons-pool
-Requires: backport-util-concurrent
Requires: dom4j
Requires: jaxen
Requires: mule = %{version}-%{release}
@@ -244,7 +241,6 @@ Summary: Mule transport for HTTP Connectivity
Requires: apache-commons-codec
Requires: apache-commons-io
Requires: apache-commons-lang
-Requires: backport-util-concurrent
Requires: jakarta-commons-httpclient
Requires: jboss-connector-1.6-api
Requires: mule = %{version}-%{release}
@@ -263,7 +259,6 @@ Summary: Mule transport for JMS Connectivity
Requires: apache-commons-collections
Requires: apache-commons-io
Requires: apache-commons-lang
-Requires: backport-util-concurrent
Requires: geronimo-jms
Requires: jboss-connector-1.6-api
Requires: mule = %{version}-%{release}
@@ -310,7 +305,6 @@ Requires: slf4j
%package transport-servlet
Summary: Mule transport for Servlet containers
Requires: apache-commons-io
-Requires: backport-util-concurrent
Requires: jakarta-commons-httpclient
Requires: mule = %{version}-%{release}
Requires: mule-module-spring-config = %{version}-%{release}
@@ -338,7 +332,6 @@ Requires: xpp3
%package transport-ssl
Summary: Mule transport for Socket connectivity using SSL authentication
-Requires: backport-util-concurrent
Requires: mule = %{version}-%{release}
Requires: mule-module-spring-config = %{version}-%{release}
Requires: mule-transport-tcp = %{version}-%{release}
@@ -352,7 +345,6 @@ Requires: %{spring}-beans
Summary: Mule transport for testing, using System.out
Requires: apache-commons-io
Requires: apache-commons-lang
-Requires: backport-util-concurrent
Requires: mule = %{version}-%{release}
Requires: mule-module-spring-config = %{version}-%{release}
@@ -364,7 +356,6 @@ Summary: Mule transport for TCP Connectivity
Requires: apache-commons-io
Requires: apache-commons-lang
Requires: apache-commons-pool
-Requires: backport-util-concurrent
Requires: jboss-connector-1.6-api
Requires: mule = %{version}-%{release}
Requires: mule-module-spring-config = %{version}-%{release}
@@ -377,7 +368,6 @@ Requires: %{spring}-beans
%package transport-udp
Summary: Mule transport for UDP Connectivity
Requires: apache-commons-pool
-Requires: backport-util-concurrent
Requires: jboss-connector-1.6-api
Requires: mule = %{version}-%{release}
Requires: mule-module-spring-config = %{version}-%{release}
@@ -388,7 +378,6 @@ Requires: slf4j
%package transport-vm
Summary: Mule virtual memory transport
-Requires: backport-util-concurrent
Requires: mule = %{version}-%{release}
Requires: mule-module-spring-config = %{version}-%{release}
Requires: slf4j
@@ -419,6 +408,7 @@ This package contains the API documentation for %{name}.
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
# Fix java-service-wrapper link to match arch
if [ \! -d /usr/lib64/java-service-wrapper ]; then
@@ -436,6 +426,9 @@ find modules/management/src/main/java/org/mule/module/management -name "YourKitP
# Tests do not build yet
%pom_disable_module tests
+# Remove all backport-util-concurrent deps
+%pom_remove_dep backport-util-concurrent:backport-util-concurrent core
+
# Disable some modules which don't build yet
%pom_disable_module jboss-transactions modules
%pom_remove_dep com.yourkit:yjp-controller-api-redist modules/management
@@ -608,6 +601,9 @@ cp -rpf target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Mon Dec 10 2012 Andy Grimm <agrimm at gmail.com> - 2.0.2.20080813-7
+- Remove dependence on backport-util-concurrent RHBZ#875167
+
* Sat Aug 11 2012 Andy Grimm <agrimm at gmail.com> - 2.0.2.20080813-6
- Patch for Spring 3.1
More information about the scm-commits
mailing list