You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2010/07/05 22:39:50 UTC
svn commit: r960689 - in /servicemix/smx4/nmr/trunk/jbi/cluster: engine/
engine/src/main/java/org/apache/servicemix/jbi/cluster/engine/
requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/
Author: gnodet
Date: Mon Jul 5 20:39:49 2010
New Revision: 960689
URL: http://svn.apache.org/viewvc?rev=960689&view=rev
Log:
SMX4NMR-202: clean up spring dependencies on jbi cluster engine
Modified:
servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/main/java/org/apache/servicemix/jbi/cluster/engine/ClusterEngine.java
servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/AbstractJmsRequestorPool.java
servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/AbstractPollingRequestorPool.java
servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java
servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/GenericJmsRequestorPool.java
servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestor.java
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml?rev=960689&r1=960688&r2=960689&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml Mon Jul 5 20:39:49 2010
@@ -124,6 +124,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Import-Package>
+ org.springframework.osgi*;resolution:=optional,
*
</Import-Package>
</instructions>
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/main/java/org/apache/servicemix/jbi/cluster/engine/ClusterEngine.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/main/java/org/apache/servicemix/jbi/cluster/engine/ClusterEngine.java?rev=960689&r1=960688&r2=960689&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/main/java/org/apache/servicemix/jbi/cluster/engine/ClusterEngine.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/src/main/java/org/apache/servicemix/jbi/cluster/engine/ClusterEngine.java Mon Jul 5 20:39:49 2010
@@ -48,15 +48,12 @@ import org.apache.servicemix.nmr.core.Se
import org.apache.servicemix.jbi.runtime.impl.MessageExchangeImpl;
import org.apache.servicemix.jbi.runtime.impl.ServiceEndpointImpl;
import org.apache.servicemix.jbi.runtime.impl.DeliveryChannelImpl;
-import org.apache.servicemix.jbi.runtime.impl.AbstractComponentContext;
import org.apache.servicemix.jbi.cluster.requestor.JmsRequestor;
import org.apache.servicemix.jbi.cluster.requestor.Transacted;
import org.apache.servicemix.jbi.cluster.requestor.JmsRequestorListener;
import org.apache.servicemix.jbi.cluster.requestor.JmsRequestorPool;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.DisposableBean;
/**
* Throttling
@@ -169,7 +166,7 @@ import org.springframework.beans.factory
*
*/
public class ClusterEngine extends ServiceRegistryImpl<ClusterRegistration>
- implements Endpoint, InitializingBean, DisposableBean, EndpointListener, ExchangeListener {
+ implements Endpoint, EndpointListener, ExchangeListener {
/**
* Default maximum number of pending exchanges
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/AbstractJmsRequestorPool.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/AbstractJmsRequestorPool.java?rev=960689&r1=960688&r2=960689&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/AbstractJmsRequestorPool.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/AbstractJmsRequestorPool.java Mon Jul 5 20:39:49 2010
@@ -16,31 +16,21 @@
*/
package org.apache.servicemix.jbi.cluster.requestor;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
import javax.jms.Connection;
+import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
-import javax.jms.Session;
-import javax.jms.Queue;
import javax.jms.MessageProducer;
+import javax.jms.Session;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.jms.support.destination.DestinationResolver;
-import org.springframework.jms.support.destination.DynamicDestinationResolver;
-import org.springframework.jms.support.destination.CachingDestinationResolver;
-import org.springframework.jms.support.JmsUtils;
+import org.springframework.core.task.SimpleAsyncTaskExecutor;
+import org.springframework.core.task.TaskExecutor;
import org.springframework.jms.JmsException;
import org.springframework.jms.listener.AbstractMessageListenerContainer;
+import org.springframework.jms.support.JmsUtils;
+import org.springframework.jms.support.destination.CachingDestinationResolver;
+import org.springframework.jms.support.destination.DestinationResolver;
import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.core.task.TaskExecutor;
-import org.springframework.core.task.SimpleAsyncTaskExecutor;
-import org.springframework.scheduling.SchedulingTaskExecutor;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
public abstract class AbstractJmsRequestorPool extends AbstractMessageListenerContainer {
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/AbstractPollingRequestorPool.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/AbstractPollingRequestorPool.java?rev=960689&r1=960688&r2=960689&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/AbstractPollingRequestorPool.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/AbstractPollingRequestorPool.java Mon Jul 5 20:39:49 2010
@@ -18,17 +18,15 @@ package org.apache.servicemix.jbi.cluste
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-
import javax.jms.Connection;
-import javax.jms.Session;
+import javax.jms.JMSException;
+import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
-import javax.jms.Message;
-import javax.jms.JMSException;
+import javax.jms.Session;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.springframework.util.Assert;
import org.springframework.jms.JmsException;
import org.springframework.jms.support.JmsUtils;
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java?rev=960689&r1=960688&r2=960689&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/ActiveMQJmsRequestorPool.java Mon Jul 5 20:39:49 2010
@@ -16,32 +16,25 @@
*/
package org.apache.servicemix.jbi.cluster.requestor;
-import java.util.Queue;
-import java.util.List;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.lang.reflect.Method;
-
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.XASession;
-import javax.jms.ConnectionFactory;
-import javax.jms.ExceptionListener;
-import javax.jms.Connection;
import javax.transaction.xa.XAResource;
-import org.apache.activemq.MessageAvailableListener;
-import org.apache.activemq.MessageAvailableConsumer;
-import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQSession;
-import org.apache.activemq.pool.PooledConnectionFactory;
+import org.apache.activemq.MessageAvailableConsumer;
+import org.apache.activemq.MessageAvailableListener;
import org.apache.activemq.pool.PooledSession;
import org.springframework.jms.JmsException;
-import org.springframework.jms.connection.ConnectionFactoryUtils;
-import org.springframework.util.Assert;
public class ActiveMQJmsRequestorPool extends AbstractPollingRequestorPool implements ExceptionListener {
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/GenericJmsRequestorPool.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/GenericJmsRequestorPool.java?rev=960689&r1=960688&r2=960689&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/GenericJmsRequestorPool.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/GenericJmsRequestorPool.java Mon Jul 5 20:39:49 2010
@@ -16,25 +16,14 @@
*/
package org.apache.servicemix.jbi.cluster.requestor;
-import java.util.Map;
-import java.util.Set;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.transaction.TransactionManager;
-import javax.transaction.Transaction;
-import javax.jms.Connection;
+import java.util.Set;
import javax.jms.JMSException;
import javax.jms.Session;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Message;
-import org.springframework.jms.support.JmsUtils;
-import org.springframework.jms.JmsException;
-import org.springframework.util.Assert;
import org.springframework.scheduling.SchedulingAwareRunnable;
+import org.springframework.util.Assert;
/**
* A pool of session / consumer / producer.
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestor.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestor.java?rev=960689&r1=960688&r2=960689&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestor.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/src/main/java/org/apache/servicemix/jbi/cluster/requestor/JmsRequestor.java Mon Jul 5 20:39:49 2010
@@ -16,7 +16,6 @@
*/
package org.apache.servicemix.jbi.cluster.requestor;
-import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
import javax.transaction.Transaction;