You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2008/04/24 05:15:42 UTC
svn commit: r651143 - in /webservices/axis2/trunk/java: legal/
modules/adb/resources/META-INF/
modules/adb/src/org/apache/axis2/rpc/receivers/ejb/ modules/distribution/
modules/documentation/ modules/fastinfoset/
modules/jaxbri/src/org/apache/axis2/jax...
Author: dims
Date: Wed Apr 23 20:15:39 2008
New Revision: 651143
URL: http://svn.apache.org/viewvc?rev=651143&view=rev
Log:
get rid of backport util concurrent jar
Removed:
webservices/axis2/trunk/java/legal/backport-util-concurrent-LICENSE.txt
Modified:
webservices/axis2/trunk/java/modules/adb/resources/META-INF/MANIFEST.MF
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/ejb/EJBUtil.java
webservices/axis2/trunk/java/modules/distribution/pom.xml
webservices/axis2/trunk/java/modules/documentation/pom.xml
webservices/axis2/trunk/java/modules/fastinfoset/pom.xml
webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java
webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml
webservices/axis2/trunk/java/modules/kernel/pom.xml
webservices/axis2/trunk/java/modules/kernel/resources/META-INF/MANIFEST.MF
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorkerManager.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/XMPPListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/DefaultThreadFactory.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java
webservices/axis2/trunk/java/modules/parent/pom.xml
webservices/axis2/trunk/java/modules/samples/book/pom.xml
webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml
webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml
webservices/axis2/trunk/java/modules/samples/pom.xml
Modified: webservices/axis2/trunk/java/modules/adb/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/resources/META-INF/MANIFEST.MF?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/resources/META-INF/MANIFEST.MF (original)
+++ webservices/axis2/trunk/java/modules/adb/resources/META-INF/MANIFEST.MF Wed Apr 23 20:15:39 2008
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Import-Package:
- edu.emory.mathcs.backport.java.util.concurrent,
+ java.util.concurrent,
javax.activation,
javax.naming,
javax.rmi,
Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/ejb/EJBUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/ejb/EJBUtil.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/ejb/EJBUtil.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/ejb/EJBUtil.java Wed Apr 23 20:15:39 2008
@@ -19,11 +19,6 @@
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 org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
@@ -36,6 +31,11 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Properties;
+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;
public class EJBUtil {
public static final java.lang.String EJB_JNDI_NAME = "beanJndiName";
Modified: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Wed Apr 23 20:15:39 2008
@@ -174,10 +174,6 @@
<artifactId>wsdl4j</artifactId>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.woden</groupId>
<artifactId>woden-api</artifactId>
</dependency>
Modified: webservices/axis2/trunk/java/modules/documentation/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/pom.xml?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/pom.xml Wed Apr 23 20:15:39 2008
@@ -171,10 +171,6 @@
<artifactId>wsdl4j</artifactId>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.woden</groupId>
<artifactId>woden-api</artifactId>
</dependency>
Modified: webservices/axis2/trunk/java/modules/fastinfoset/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/fastinfoset/pom.xml?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/fastinfoset/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/fastinfoset/pom.xml Wed Apr 23 20:15:39 2008
@@ -90,10 +90,6 @@
<artifactId>httpcore</artifactId>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
Modified: webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/jaxbri/src/org/apache/axis2/jaxbri/JaxbSchemaGenerator.java Wed Apr 23 20:15:39 2008
@@ -230,6 +230,9 @@
map.put("com.sun.xml.bind.defaultNamespaceRemap", defaultNs);
}
+ for (Class<?> cls : classes) {
+ System.out.println(">>>> :" + cls);
+ }
return JAXBContext.newInstance(classes.toArray(new Class[classes.size()]), map);
}
Modified: webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml Wed Apr 23 20:15:39 2008
@@ -113,10 +113,10 @@
<!-- ================================================= -->
<!-- Message Receivers -->
<!-- ================================================= -->
- <!--This is the deafult MessageReceiver for the system , if you want to have MessageReceivers for -->
+ <!--This is the default MessageReceiver for the system , if you want to have MessageReceivers for -->
<!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
<!--any operation -->
- <!--Note : You can ovrride this for a particular service by adding the same element with your requirement-->
+ <!--Note : You can override this for a particular service by adding the same element with your requirement-->
<messageReceivers>
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
Modified: webservices/axis2/trunk/java/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/pom.xml?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/pom.xml Wed Apr 23 20:15:39 2008
@@ -58,11 +58,6 @@
<artifactId>wsdl4j</artifactId>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
-
- <dependency>
<groupId>${stax.impl.groupid}</groupId>
<artifactId>${stax.impl.artifact}</artifactId>
</dependency>
Modified: webservices/axis2/trunk/java/modules/kernel/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/resources/META-INF/MANIFEST.MF?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/resources/META-INF/MANIFEST.MF (original)
+++ webservices/axis2/trunk/java/modules/kernel/resources/META-INF/MANIFEST.MF Wed Apr 23 20:15:39 2008
@@ -2,9 +2,9 @@
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Import-Package:
com.ibm.wsdl.util.xml,
- edu.emory.mathcs.backport.java.util,
- edu.emory.mathcs.backport.java.util.concurrent,
- edu.emory.mathcs.backport.java.util.concurrent.atomic,
+ java.util,
+ java.util.concurrent,
+ java.util.concurrent.atomic,
javax.activation,
javax.jms;resolution:=optional,
javax.mail,
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Wed Apr 23 20:15:39 2008
@@ -20,11 +20,9 @@
package org.apache.axis2.context;
-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
-import org.apache.axis2.java.security.AccessController;
import org.apache.axis2.clustering.ClusterManager;
import org.apache.axis2.clustering.ClusteringConstants;
import org.apache.axis2.clustering.configuration.ConfigurationManager;
@@ -36,6 +34,7 @@
import org.apache.axis2.engine.DependencyManager;
import org.apache.axis2.engine.ListenerManager;
import org.apache.axis2.i18n.Messages;
+import org.apache.axis2.java.security.AccessController;
import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.util.threadpool.ThreadFactory;
import org.apache.axis2.util.threadpool.ThreadPool;
@@ -44,13 +43,14 @@
import java.io.File;
import java.net.URL;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
-import java.security.PrivilegedAction;
+import java.util.concurrent.ConcurrentHashMap;
/**
* <p>Axis2 states are held in two information models, called description hierarchy
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/AxisConfigBuilder.java Wed Apr 23 20:15:39 2008
@@ -20,7 +20,6 @@
package org.apache.axis2.deployment;
-import edu.emory.mathcs.backport.java.util.Collections;
import org.apache.axiom.attachments.lifecycle.LifecycleManager;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
@@ -39,7 +38,6 @@
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.ModuleConfiguration;
import org.apache.axis2.description.ParameterInclude;
-import org.apache.axis2.description.PolicyInclude;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
@@ -65,6 +63,7 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisDescription.java Wed Apr 23 20:15:39 2008
@@ -19,7 +19,6 @@
package org.apache.axis2.description;
-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -45,6 +44,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
public abstract class AxisDescription implements ParameterInclude,
DescriptionConstants {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/Phase.java Wed Apr 23 20:15:39 2008
@@ -20,7 +20,6 @@
package org.apache.axis2.engine;
-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.HandlerDescription;
@@ -33,6 +32,7 @@
import java.util.Iterator;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* A Phase is an ordered collection of Handlers.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java Wed Apr 23 20:15:39 2008
@@ -20,7 +20,6 @@
package org.apache.axis2.transport.http;
-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXBuilder;
import org.apache.axiom.soap.SOAP12Constants;
@@ -69,6 +68,7 @@
import java.io.PrintWriter;
import java.net.SocketException;
import java.util.Map;
+import java.util.concurrent.CountDownLatch;
/**
* Class AxisServlet
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java Wed Apr 23 20:15:39 2008
@@ -19,7 +19,6 @@
package org.apache.axis2.transport.http.server;
-import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axis2.AxisFault;
@@ -63,6 +62,7 @@
import java.net.SocketException;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.concurrent.CountDownLatch;
/**
* This class is an extension of the default HTTP service responsible for
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java Wed Apr 23 20:15:39 2008
@@ -19,7 +19,6 @@
package org.apache.axis2.transport.http.server;
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,6 +37,7 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.concurrent.Executor;
public class DefaultHttpConnectionManager implements HttpConnectionManager {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultThreadFactory.java Wed Apr 23 20:15:39 2008
@@ -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 {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpFactory.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpFactory.java Wed Apr 23 20:15:39 2008
@@ -19,11 +19,6 @@
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 org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
@@ -47,6 +42,11 @@
import org.apache.http.protocol.ResponseServer;
import java.io.IOException;
+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;
/**
* Factory used to configure and create the various instances required in http transports.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpServiceProcessor.java Wed Apr 23 20:15:39 2008
@@ -19,8 +19,6 @@
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 org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.ConnectionClosedException;
@@ -31,6 +29,8 @@
import java.io.IOException;
import java.net.SocketException;
import java.net.SocketTimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
/**
* I/O processor intended to process requests and fill in responses.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/SimpleHttpServer.java Wed Apr 23 20:15:39 2008
@@ -19,14 +19,14 @@
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 org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.params.HttpParams;
import java.io.IOException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
/**
* A simple, but configurable and extensible HTTP server.
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSListener.java Wed Apr 23 20:15:39 2008
@@ -19,10 +19,6 @@
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 org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
@@ -50,6 +46,10 @@
import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
/**
* The JMS Transport listener implementation. A JMS Listner will hold one or
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/JMSMessageReceiver.java Wed Apr 23 20:15:39 2008
@@ -19,7 +19,6 @@
package org.apache.axis2.transport.jms;
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.RelatesTo;
@@ -40,6 +39,7 @@
import javax.naming.Context;
import javax.xml.stream.XMLStreamException;
import java.io.InputStream;
+import java.util.concurrent.Executor;
/**
* This is the actual receiver which listens for and accepts JMS messages, and
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorkerManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorkerManager.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorkerManager.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/mail/MailWorkerManager.java Wed Apr 23 20:15:39 2008
@@ -19,10 +19,11 @@
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 org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
/*
*
*/
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/nhttp/util/BackportWorkerPool.java Wed Apr 23 20:15:39 2008
@@ -19,14 +19,15 @@
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 org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+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;
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/XMPPListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/XMPPListener.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/XMPPListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/XMPPListener.java Wed Apr 23 20:15:39 2008
@@ -19,10 +19,6 @@
package org.apache.axis2.transport.xmpp;
-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 org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
@@ -44,6 +40,10 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
public class XMPPListener implements TransportListener {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/xmpp/util/XMPPPacketListener.java Wed Apr 23 20:15:39 2008
@@ -19,7 +19,6 @@
package org.apache.axis2.transport.xmpp.util;
-import edu.emory.mathcs.backport.java.util.concurrent.Executor;
import org.apache.axiom.om.OMException;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
@@ -45,6 +44,7 @@
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.HashMap;
+import java.util.concurrent.Executor;
public class XMPPPacketListener implements PacketListener {
private static final Log log = LogFactory.getLog(XMPPPacketListener.class);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CallbackReceiver.java Wed Apr 23 20:15:39 2008
@@ -19,7 +19,6 @@
package org.apache.axis2.util;
-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.RelatesTo;
@@ -33,6 +32,7 @@
import org.apache.commons.logging.LogFactory;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* This is a MessageReceiver which is used on the client side to accept the
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/DefaultThreadFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/DefaultThreadFactory.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/DefaultThreadFactory.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/DefaultThreadFactory.java Wed Apr 23 20:15:39 2008
@@ -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
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/threadpool/ThreadPool.java Wed Apr 23 20:15:39 2008
@@ -20,11 +20,6 @@
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 org.apache.axis2.AxisFault;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.java.security.AccessController;
@@ -33,6 +28,11 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
+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;
/**
* This the thread pool for axis2. This class will be used a singleton
@@ -113,11 +113,12 @@
TimeUnit.SECONDS, new LinkedBlockingQueue(),
new DefaultThreadFactory(name, daemon, priority));
}
- rc.allowCoreThreadTimeOut(true);
+// FIXME: This API is only in JDK 1.6 - Use reflection?
+// rc.allowCoreThreadTimeOut(true);
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;
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Wed Apr 23 20:15:39 2008
@@ -96,7 +96,6 @@
<ant.version>1.7.0</ant.version>
<antlr.version>2.7.7</antlr.version>
<axiom.version>SNAPSHOT</axiom.version>
- <backport.util.concurrent.version>3.1</backport.util.concurrent.version>
<bcel.version>5.2</bcel.version>
<bsf.version>2.4.0</bsf.version>
<commons.codec.version>1.3</commons.codec.version>
@@ -775,11 +774,6 @@
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>${wsdl4j.version}</version>
- </dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>${backport.util.concurrent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.woden</groupId>
Modified: webservices/axis2/trunk/java/modules/samples/book/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/book/pom.xml?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/book/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/book/pom.xml Wed Apr 23 20:15:39 2008
@@ -110,11 +110,6 @@
<version>1.0.1</version>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
<groupId>annogen</groupId>
<artifactId>annogen</artifactId>
<version>0.1.0</version>
Modified: webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml Wed Apr 23 20:15:39 2008
@@ -115,11 +115,6 @@
<version>1.0.1</version>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
<groupId>annogen</groupId>
<artifactId>annogen</artifactId>
<version>0.1.0</version>
Modified: webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml Wed Apr 23 20:15:39 2008
@@ -125,11 +125,6 @@
<version>1.0.1</version>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
<groupId>annogen</groupId>
<artifactId>annogen</artifactId>
<version>0.1.0</version>
Modified: webservices/axis2/trunk/java/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/pom.xml?rev=651143&r1=651142&r2=651143&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/pom.xml Wed Apr 23 20:15:39 2008
@@ -58,11 +58,6 @@
<artifactId>wsdl4j</artifactId>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
-
- <dependency>
<groupId>${stax.impl.groupid}</groupId>
<artifactId>${stax.impl.artifact}</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org