diff --git a/build.sh b/build.sh index 1635fec..605ad99 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/bin/sh export CLASSPATH=$( build-classpath httpcomponents/httpcore \ - backport-util-concurrent commons-logging \ + commons-logging \ wsdl4j javamail geronimo-jta jaxen servlet \ commons-fileupload commons-httpclient commons-cli \ geronimo-jms httpcomponents/httpcore-nio ) diff --git a/src/org/apache/axis2/context/ConfigurationContext.java b/src/org/apache/axis2/context/ConfigurationContext.java index 5ef488b..88e5135 100644 --- a/src/org/apache/axis2/context/ConfigurationContext.java +++ b/src/org/apache/axis2/context/ConfigurationContext.java @@ -20,7 +20,7 @@ package org.apache.axis2.context; -import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentHashMap; import org.apache.axiom.om.util.UUIDGenerator; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; diff --git a/src/org/apache/axis2/deployment/AxisConfigBuilder.java b/src/org/apache/axis2/deployment/AxisConfigBuilder.java index eec8bd8..2958b23 100644 --- a/src/org/apache/axis2/deployment/AxisConfigBuilder.java +++ b/src/org/apache/axis2/deployment/AxisConfigBuilder.java @@ -20,7 +20,7 @@ package org.apache.axis2.deployment; -import edu.emory.mathcs.backport.java.util.Collections; +import java.util.Collections; import org.apache.axiom.attachments.lifecycle.LifecycleManager; import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMElement; diff --git a/src/org/apache/axis2/description/AxisDescription.java b/src/org/apache/axis2/description/AxisDescription.java index e8d6092..ebffe06 100644 --- a/src/org/apache/axis2/description/AxisDescription.java +++ b/src/org/apache/axis2/description/AxisDescription.java @@ -19,7 +19,7 @@ package org.apache.axis2.description; -import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentHashMap; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; diff --git a/src/org/apache/axis2/engine/Phase.java b/src/org/apache/axis2/engine/Phase.java index d04fc49..6e90b40 100644 --- a/src/org/apache/axis2/engine/Phase.java +++ b/src/org/apache/axis2/engine/Phase.java @@ -20,7 +20,7 @@ package org.apache.axis2.engine; -import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CopyOnWriteArrayList; import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; import org.apache.axis2.description.HandlerDescription; diff --git a/src/org/apache/axis2/rpc/receivers/ejb/EJBUtil.java b/src/org/apache/axis2/rpc/receivers/ejb/EJBUtil.java index 33aad2c..b0cba3d 100644 --- a/src/org/apache/axis2/rpc/receivers/ejb/EJBUtil.java +++ b/src/org/apache/axis2/rpc/receivers/ejb/EJBUtil.java @@ -19,11 +19,11 @@ package org.apache.axis2.rpc.receivers.ejb; -import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch; -import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService; -import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue; -import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor; -import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; import org.apache.axis2.description.AxisService; diff --git a/src/org/apache/axis2/transport/http/AxisServlet.java b/src/org/apache/axis2/transport/http/AxisServlet.java index 775ac6f..7c67bee 100644 --- a/src/org/apache/axis2/transport/http/AxisServlet.java +++ b/src/org/apache/axis2/transport/http/AxisServlet.java @@ -20,7 +20,7 @@ package org.apache.axis2.transport.http; -import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch; +import java.util.concurrent.CountDownLatch; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.impl.builder.StAXBuilder; import org.apache.axiom.soap.SOAP12Constants; diff --git a/src/org/apache/axis2/transport/http/server/AxisHttpService.java b/src/org/apache/axis2/transport/http/server/AxisHttpService.java index 7bbc7bc..ad1bfd8 100644 --- a/src/org/apache/axis2/transport/http/server/AxisHttpService.java +++ b/src/org/apache/axis2/transport/http/server/AxisHttpService.java @@ -19,7 +19,7 @@ package org.apache.axis2.transport.http.server; -import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch; +import java.util.concurrent.CountDownLatch; import org.apache.axiom.soap.SOAP11Constants; import org.apache.axiom.soap.SOAP12Constants; import org.apache.axis2.AxisFault; diff --git a/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java b/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java index 32c003d..690e8cf 100644 --- a/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java +++ b/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java @@ -19,7 +19,7 @@ package org.apache.axis2.transport.http.server; -import edu.emory.mathcs.backport.java.util.concurrent.Executor; +import java.util.concurrent.Executor; import org.apache.axis2.context.ConfigurationContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java b/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java index 0db81f0..1638378 100644 --- a/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java +++ b/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java @@ -19,8 +19,8 @@ package org.apache.axis2.transport.http.server; -import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory; -import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; public class DefaultThreadFactory implements ThreadFactory { diff --git a/src/org/apache/axis2/transport/http/server/HttpFactory.java b/src/org/apache/axis2/transport/http/server/HttpFactory.java index c6c5e4d..c1af08b 100644 --- a/src/org/apache/axis2/transport/http/server/HttpFactory.java +++ b/src/org/apache/axis2/transport/http/server/HttpFactory.java @@ -19,11 +19,11 @@ package org.apache.axis2.transport.http.server; -import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue; -import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService; -import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue; -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.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.context.ConfigurationContext; diff --git a/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java b/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java index caab8a6..14db0a2 100644 --- a/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java +++ b/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java @@ -19,8 +19,8 @@ package org.apache.axis2.transport.http.server; -import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; -import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.ConnectionClosedException; diff --git a/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java b/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java index dbc01f2..76f7a81 100644 --- a/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java +++ b/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java @@ -19,8 +19,8 @@ package org.apache.axis2.transport.http.server; -import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService; -import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; import org.apache.axis2.context.ConfigurationContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/org/apache/axis2/transport/jms/JMSListener.java b/src/org/apache/axis2/transport/jms/JMSListener.java index 389783f..cccfc21 100644 --- a/src/org/apache/axis2/transport/jms/JMSListener.java +++ b/src/org/apache/axis2/transport/jms/JMSListener.java @@ -19,10 +19,10 @@ package org.apache.axis2.transport.jms; -import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService; -import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue; -import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor; -import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import org.apache.axiom.om.OMElement; import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.EndpointReference; diff --git a/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java b/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java index 9da89b6..348a03a 100644 --- a/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java +++ b/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java @@ -19,7 +19,7 @@ package org.apache.axis2.transport.jms; -import edu.emory.mathcs.backport.java.util.concurrent.Executor; +import java.util.concurrent.Executor; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.addressing.RelatesTo; diff --git a/src/org/apache/axis2/transport/mail/MailWorkerManager.java b/src/org/apache/axis2/transport/mail/MailWorkerManager.java index 73431b3..9aca500 100644 --- a/src/org/apache/axis2/transport/mail/MailWorkerManager.java +++ b/src/org/apache/axis2/transport/mail/MailWorkerManager.java @@ -19,8 +19,8 @@ package org.apache.axis2.transport.mail; -import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService; -import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; import org.apache.axis2.AxisFault; import org.apache.axis2.context.ConfigurationContext; /* diff --git a/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java b/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java index 56c8890..3a73854 100644 --- a/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java +++ b/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java @@ -19,12 +19,12 @@ package org.apache.axis2.transport.nhttp.util; -import edu.emory.mathcs.backport.java.util.concurrent.Executor; -import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue; -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 edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.Executor; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,7 +42,6 @@ public class BackportWorkerPool implements WorkerPool{ public BackportWorkerPool(int core, int max, int keepAlive, int queueLength, String threadGroupName, String threadGroupId) { - log.debug("Using backport of the util.concurrent package.."); executor = new ThreadPoolExecutor( core, max, keepAlive, TimeUnit.SECONDS, diff --git a/src/org/apache/axis2/util/CallbackReceiver.java b/src/org/apache/axis2/util/CallbackReceiver.java index 4fa4f76..fbb8cec 100644 --- a/src/org/apache/axis2/util/CallbackReceiver.java +++ b/src/org/apache/axis2/util/CallbackReceiver.java @@ -19,7 +19,7 @@ package org.apache.axis2.util; -import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentHashMap; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.RelatesTo; diff --git a/src/org/apache/axis2/util/threadpool/DefaultThreadFactory.java b/src/org/apache/axis2/util/threadpool/DefaultThreadFactory.java index e186c3a..476b973 100644 --- a/src/org/apache/axis2/util/threadpool/DefaultThreadFactory.java +++ b/src/org/apache/axis2/util/threadpool/DefaultThreadFactory.java @@ -19,8 +19,8 @@ package org.apache.axis2.util.threadpool; -import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory; -import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; /** * This is a simple ThreadFactory implementation using java.util.concurrent diff --git a/src/org/apache/axis2/util/threadpool/ThreadPool.java b/src/org/apache/axis2/util/threadpool/ThreadPool.java index 509875e..557f40b 100644 --- a/src/org/apache/axis2/util/threadpool/ThreadPool.java +++ b/src/org/apache/axis2/util/threadpool/ThreadPool.java @@ -20,11 +20,11 @@ package org.apache.axis2.util.threadpool; -import edu.emory.mathcs.backport.java.util.concurrent.Executor; -import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue; -import edu.emory.mathcs.backport.java.util.concurrent.SynchronousQueue; -import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor; -import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; +import java.util.concurrent.Executor; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import org.apache.axis2.AxisFault; import org.apache.axis2.i18n.Messages; import org.apache.axis2.java.security.AccessController; @@ -117,7 +117,7 @@ TimeUnit.SECONDS, new LinkedBlockingQueue(), return rc; } - private static class DefaultThreadFactory implements edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory { + private static class DefaultThreadFactory implements java.util.concurrent.ThreadFactory { private final String name; private final boolean daemon; private final int priority;