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 2008/09/16 14:47:28 UTC
svn commit: r695842 - in
/servicemix/components/bindings/servicemix-jms/trunk/src:
main/java/org/apache/servicemix/jms/
main/java/org/apache/servicemix/jms/endpoints/
main/java/org/apache/servicemix/jms/multiplexing/
main/java/org/apache/servicemix/jms...
Author: gnodet
Date: Tue Sep 16 05:47:27 2008
New Revision: 695842
URL: http://svn.apache.org/viewvc?rev=695842&view=rev
Log:
SM-1576: Change endpoints lifecycle to use activate / start / stop / deactivate
Modified:
servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsComponent.java
servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java
servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsWsdl1Deployer.java
servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/AbstractConsumerEndpoint.java
servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerEndpoint.java
servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsProviderEndpoint.java
servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java
servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java
servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java
servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/standard/StandardProviderProcessor.java
servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java
servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsSpringTest.java
servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsXBeanDeployerTest.java
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java Tue Sep 16 05:47:27 2008
@@ -37,16 +37,16 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.EndpointComponentContext;
-import org.apache.servicemix.common.ExchangeProcessor;
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.soap.Context;
import org.apache.servicemix.soap.SoapFault;
import org.apache.servicemix.soap.SoapHelper;
+import org.apache.servicemix.soap.SoapExchangeProcessor;
import org.apache.servicemix.soap.marshalers.SoapMessage;
import org.apache.servicemix.store.Store;
import org.apache.servicemix.store.memory.MemoryStoreFactory;
-public abstract class AbstractJmsProcessor implements ExchangeProcessor {
+public abstract class AbstractJmsProcessor implements SoapExchangeProcessor {
public static final String STYLE_QUEUE = "queue";
public static final String STYLE_TOPIC = "topic";
@@ -73,34 +73,6 @@
this.channel = context.getDeliveryChannel();
}
- public void start() throws Exception {
- try {
- InitialContext ctx = getInitialContext();
- ConnectionFactory connectionFactory = null;
- connectionFactory = getConnectionFactory(ctx);
- connection = connectionFactory.createConnection();
- connection.start();
-
- // set up the Store
- if (endpoint.store != null) {
- store = endpoint.store;
- } else if (endpoint.storeFactory != null) {
- store = endpoint.storeFactory.open(endpoint.getService().toString() + endpoint.getEndpoint());
- } else {
- store = new MemoryStoreFactory().open(endpoint.getService().toString() + endpoint.getEndpoint());
- }
-
- doStart(ctx);
- } catch (Exception e) {
- try {
- stop();
- } catch (Exception inner) {
- // TODO: log
- }
- throw e;
- }
- }
-
protected void commonDoStartTasks(InitialContext ctx) throws Exception {
channel = endpoint.getServiceUnit().getComponent().getComponentContext().getDeliveryChannel();
session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -167,12 +139,61 @@
return store;
}
- protected void doStart(InitialContext ctx) throws Exception {
+ public void init() throws Exception {
+ try {
+ InitialContext ctx = getInitialContext();
+ ConnectionFactory connectionFactory = null;
+ connectionFactory = getConnectionFactory(ctx);
+ connection = connectionFactory.createConnection();
+ connection.start();
+
+ // set up the Store
+ if (endpoint.store != null) {
+ store = endpoint.store;
+ } else if (endpoint.storeFactory != null) {
+ store = endpoint.storeFactory.open(endpoint.getService().toString() + endpoint.getEndpoint());
+ } else {
+ store = new MemoryStoreFactory().open(endpoint.getService().toString() + endpoint.getEndpoint());
+ }
+
+ doInit(ctx);
+ } catch (Exception e) {
+ shutdown();
+ }
+ }
+
+ protected void doInit(InitialContext ctx) throws Exception {
+ }
+
+ public void start() throws Exception {
+ try {
+ doStart();
+ } catch (Exception e) {
+ try {
+ stop();
+ } catch (Exception inner) {
+ // TODO: log
+ }
+ throw e;
+ }
+ }
+
+ protected void doStart() throws Exception {
}
public void stop() throws Exception {
try {
doStop();
+ } finally {
+ }
+ }
+
+ protected void doStop() throws Exception {
+ }
+
+ public void shutdown() throws Exception {
+ try {
+ doShutdown();
if (connection != null) {
connection.close();
}
@@ -181,9 +202,9 @@
}
}
- protected void doStop() throws Exception {
+ protected void doShutdown() throws Exception {
}
-
+
protected Context createContext() {
return soapHelper.createContext();
}
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsComponent.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsComponent.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsComponent.java Tue Sep 16 05:47:27 2008
@@ -28,6 +28,7 @@
import org.apache.servicemix.common.Deployer;
import org.apache.servicemix.common.Endpoint;
import org.apache.servicemix.common.ServiceUnit;
+import org.apache.servicemix.common.DefaultServiceUnit;
import org.apache.servicemix.common.util.IntrospectionSupport;
import org.apache.servicemix.common.util.URISupport;
import org.apache.servicemix.common.xbean.BaseXBeanDeployer;
@@ -155,8 +156,8 @@
protected Endpoint getResolvedEPR(ServiceEndpoint ep) throws Exception {
// We receive an exchange for an EPR that has not been used yet.
// Register a provider endpoint and restart processing.
- JmsEndpoint jmsEp = new JmsEndpoint();
- jmsEp.setServiceUnit(new ServiceUnit(component));
+ JmsEndpoint jmsEp = new JmsEndpoint(true);
+ jmsEp.setServiceUnit(new DefaultServiceUnit(component));
jmsEp.setService(ep.getServiceName());
jmsEp.setEndpoint(ep.getEndpointName());
jmsEp.setRole(MessageExchange.Role.PROVIDER);
@@ -178,7 +179,6 @@
jmsEp.setJmsProviderDestinationName(path.substring(AbstractJmsProcessor.STYLE_TOPIC.length() + 1));
}
}
- jmsEp.activateDynamic();
return jmsEp;
}
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java Tue Sep 16 05:47:27 2008
@@ -31,11 +31,11 @@
import javax.wsdl.Port;
import javax.wsdl.Service;
-import org.apache.servicemix.common.ExchangeProcessor;
import org.apache.servicemix.common.ExternalEndpoint;
import org.apache.servicemix.common.security.AuthenticationService;
import org.apache.servicemix.common.security.KeystoreManager;
import org.apache.servicemix.soap.SoapEndpoint;
+import org.apache.servicemix.soap.SoapExchangeProcessor;
import org.apache.servicemix.store.Store;
import org.apache.servicemix.store.StoreFactory;
@@ -88,9 +88,15 @@
protected StoreFactory storeFactory;
public JmsEndpoint() {
+ super();
marshaler = new DefaultJmsMarshaler(this);
}
-
+
+ public JmsEndpoint(boolean dynamic) {
+ super(dynamic);
+ this.marshaler = new DefaultJmsMarshaler(this);
+ }
+
/**
* The BootstrapContext to use for a JCA consumer endpoint.
*
@@ -393,15 +399,15 @@
this.storeFactory = storeFactory;
}
- protected ExchangeProcessor createProviderProcessor() {
+ protected SoapExchangeProcessor createProviderProcessor() {
return createProcessor("provider");
}
- protected ExchangeProcessor createConsumerProcessor() {
+ protected SoapExchangeProcessor createConsumerProcessor() {
return createProcessor("consumer");
}
- protected ExchangeProcessor createProcessor(String type) {
+ protected SoapExchangeProcessor createProcessor(String type) {
try {
String procName = processorName;
if (processorName == null) {
@@ -414,7 +420,7 @@
String className = props.getProperty(type);
Class cl = loadClass(className);
Constructor cns = cl.getConstructor(new Class[] {getClass()});
- return (ExchangeProcessor) cns.newInstance(new Object[] {this});
+ return (SoapExchangeProcessor) cns.newInstance(new Object[] {this});
} catch (Exception e) {
throw new RuntimeException("Could not create processor of type " + type + " and name " + processorName, e);
}
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsWsdl1Deployer.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsWsdl1Deployer.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsWsdl1Deployer.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/JmsWsdl1Deployer.java Tue Sep 16 05:47:27 2008
@@ -20,6 +20,7 @@
import javax.wsdl.extensions.ExtensionRegistry;
import org.apache.servicemix.common.Endpoint;
+import org.apache.servicemix.common.endpoints.AbstractEndpoint;
import org.apache.servicemix.common.wsdl1.AbstractWsdl1Deployer;
import org.apache.servicemix.common.wsdl1.JbiEndpoint;
import org.apache.servicemix.jms.wsdl.JmsAddress;
@@ -36,7 +37,7 @@
super(component);
}
- protected Endpoint createEndpoint(ExtensibilityElement portElement,
+ protected AbstractEndpoint createEndpoint(ExtensibilityElement portElement,
ExtensibilityElement bindingElement,
JbiEndpoint jbiEndpoint) {
if (jbiEndpoint == null) {
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/AbstractConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/AbstractConsumerEndpoint.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/AbstractConsumerEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/AbstractConsumerEndpoint.java Tue Sep 16 05:47:27 2008
@@ -316,8 +316,8 @@
return getService() + "#" + getEndpoint();
}
- public synchronized void start() throws Exception {
- super.start();
+ public synchronized void activate() throws Exception {
+ super.activate();
if (template == null) {
if (isJms102()) {
template = new JmsTemplate102(getConnectionFactory(), isPubSubDomain());
@@ -333,14 +333,14 @@
}
}
- public synchronized void stop() throws Exception {
+ public synchronized void deactivate() throws Exception {
if (store != null) {
if (storeFactory != null) {
storeFactory.close(store);
}
store = null;
}
- super.stop();
+ super.deactivate();
}
public void process(MessageExchange exchange) throws Exception {
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerEndpoint.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerEndpoint.java Tue Sep 16 05:47:27 2008
@@ -365,25 +365,33 @@
return getService() + "#" + getEndpoint();
}
- public synchronized void start() throws Exception {
+ public synchronized void activate() throws Exception {
+ super.activate();
listenerContainer = createListenerContainer();
listenerContainer.setMessageListener(new SessionAwareMessageListener() {
public void onMessage(Message message, Session session) throws JMSException {
JmsConsumerEndpoint.this.onMessage(message, session);
}
});
- listenerContainer.setAutoStartup(true);
+ listenerContainer.setAutoStartup(false);
listenerContainer.afterPropertiesSet();
- super.start();
}
+ public synchronized void start() throws Exception {
+ listenerContainer.start();
+ }
+
public synchronized void stop() throws Exception {
+ listenerContainer.stop();
+ }
+
+ public synchronized void deactivate() throws Exception {
if (listenerContainer != null) {
listenerContainer.stop();
listenerContainer.shutdown();
listenerContainer = null;
}
- super.stop();
+ super.deactivate();
}
public void validate() throws DeploymentException {
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsProviderEndpoint.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsProviderEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/endpoints/JmsProviderEndpoint.java Tue Sep 16 05:47:27 2008
@@ -693,7 +693,8 @@
*
* @throws Exception
*/
- public synchronized void start() throws Exception {
+ public synchronized void activate() throws Exception {
+ super.activate();
if (store == null) {
if (storeFactory == null) {
storeFactory = new MemoryStoreFactory();
@@ -722,7 +723,6 @@
listenerContainer = createListenerContainer();
listenerContainer.start();
}
- super.start();
}
/**
@@ -730,9 +730,10 @@
*
* @throws Exception
*/
- public synchronized void stop() throws Exception {
+ public synchronized void deactivate() throws Exception {
if (listenerContainer != null) {
listenerContainer.stop();
+ listenerContainer.shutdown();
}
if (store != null) {
if (storeFactory != null) {
@@ -740,7 +741,7 @@
}
store = null;
}
- super.stop();
+ super.deactivate();
}
/**
@@ -816,6 +817,7 @@
JmsProviderEndpoint.this.onMessage(message);
}
});
+ cont.setAutoStartup(false);
cont.afterPropertiesSet();
return cont;
}
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java Tue Sep 16 05:47:27 2008
@@ -45,7 +45,7 @@
super(endpoint);
}
- protected void doStart(InitialContext ctx) throws Exception {
+ protected void doInit(InitialContext ctx) throws Exception {
session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
destination = endpoint.getDestination();
if (destination == null) {
@@ -63,10 +63,17 @@
}
pendingMessages = new ConcurrentHashMap();
consumer = session.createConsumer(destination);
+ }
+
+ protected void doStart() throws Exception {
consumer.setMessageListener(this);
}
protected void doStop() throws Exception {
+ consumer.setMessageListener(null);
+ }
+
+ protected void doShutdown() throws Exception {
session = null;
destination = null;
consumer = null;
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java Tue Sep 16 05:47:27 2008
@@ -44,7 +44,7 @@
super(endpoint);
}
- protected void doStart(InitialContext ctx) throws Exception {
+ protected void doInit(InitialContext ctx) throws Exception {
// channel = endpoint.getServiceUnit().getComponent().getComponentContext().getDeliveryChannel();
commonDoStartTasks(ctx);
//Create temp destination of no reply destination found.
@@ -60,7 +60,7 @@
consumer.setMessageListener(this);
}
- protected void doStop() throws Exception {
+ protected void doShutdown() throws Exception {
session = null;
destination = null;
consumer = null;
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java Tue Sep 16 05:47:27 2008
@@ -40,7 +40,7 @@
super(endpoint);
}
- protected void doStart(InitialContext ctx) throws Exception {
+ protected void doInit(InitialContext ctx) throws Exception {
destination = endpoint.getDestination();
if (destination == null) {
if (endpoint.getJndiDestinationName() != null) {
@@ -49,6 +49,9 @@
throw new IllegalStateException("No destination provided");
}
}
+ }
+
+ protected void doStart() throws Exception {
synchronized (running) {
endpoint.getServiceUnit().getComponent().getExecutor().execute(new Runnable() {
public void run() {
@@ -62,12 +65,16 @@
protected void doStop() throws Exception {
if (running.get()) {
synchronized (running) {
- if (session != null) {
- session.close();
- }
+ running.set(false);
running.wait();
}
}
+ }
+
+ protected void doShutdown() throws Exception {
+ if (session != null) {
+ session.close();
+ }
session = null;
destination = null;
}
@@ -97,7 +104,6 @@
log.error("", e);
} finally {
synchronized (running) {
- running.set(false);
running.notify();
}
}
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/standard/StandardProviderProcessor.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/standard/StandardProviderProcessor.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/standard/StandardProviderProcessor.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/main/java/org/apache/servicemix/jms/standard/StandardProviderProcessor.java Tue Sep 16 05:47:27 2008
@@ -46,7 +46,7 @@
super(endpoint);
}
- protected void doStart(InitialContext ctx) throws Exception {
+ protected void doInit(InitialContext ctx) throws Exception {
try {
commonDoStartTasks(ctx);
} finally {
@@ -56,7 +56,7 @@
}
}
- protected void doStop() throws Exception {
+ protected void doShutdown() throws Exception {
destination = null;
}
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java Tue Sep 16 05:47:27 2008
@@ -71,6 +71,7 @@
File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("provider", path.getAbsolutePath());
+ component.getServiceUnitManager().init("provider", path.getAbsolutePath());
component.getServiceUnitManager().start("provider");
// Call it
@@ -108,6 +109,7 @@
File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("provider", path.getAbsolutePath());
+ component.getServiceUnitManager().init("provider", path.getAbsolutePath());
component.getServiceUnitManager().start("provider");
// Call it
@@ -139,6 +141,7 @@
File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("consumer", path.getAbsolutePath());
+ component.getServiceUnitManager().init("consumer", path.getAbsolutePath());
component.getServiceUnitManager().start("consumer");
// Send test message
@@ -175,6 +178,7 @@
File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("provider", path.getAbsolutePath());
+ component.getServiceUnitManager().init("provider", path.getAbsolutePath());
component.getServiceUnitManager().start("provider");
// Deploy Consumer SU
@@ -183,6 +187,7 @@
path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("consumer", path.getAbsolutePath());
+ component.getServiceUnitManager().init("consumer", path.getAbsolutePath());
component.getServiceUnitManager().start("consumer");
// Call it
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsSpringTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsSpringTest.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsSpringTest.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsSpringTest.java Tue Sep 16 05:47:27 2008
@@ -51,6 +51,7 @@
}
} else {
logger.info(new SourceTransformer().toString(me.getOutMessage().getContent()));
+ client.done(me);
}
}
Modified: servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsXBeanDeployerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsXBeanDeployerTest.java?rev=695842&r1=695841&r2=695842&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsXBeanDeployerTest.java (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/src/test/java/org/apache/servicemix/jms/JmsXBeanDeployerTest.java Tue Sep 16 05:47:27 2008
@@ -87,6 +87,7 @@
File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("xbean", path.getAbsolutePath());
+ component.getServiceUnitManager().init("xbean", path.getAbsolutePath());
component.getServiceUnitManager().start("xbean");
// Test wsdls
@@ -157,6 +158,7 @@
File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("xbean", path.getAbsolutePath());
+ component.getServiceUnitManager().init("xbean", path.getAbsolutePath());
component.getServiceUnitManager().start("xbean");
// Test wsdls