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:48:00 UTC
svn commit: r695846 - in
/servicemix/components/engines/servicemix-bean/trunk/src:
main/java/org/apache/servicemix/bean/ test/java/org/apache/servicemix/bean/
test/java/org/apache/servicemix/bean/beans/ test/resources/
Author: gnodet
Date: Tue Sep 16 05:48:00 2008
New Revision: 695846
URL: http://svn.apache.org/viewvc?rev=695846&view=rev
Log:
SM-1576: Change endpoints lifecycle to use activate / start / stop / deactivate
Modified:
servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanComponent.java
servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/ConsumerBeanTest.java
servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/ConsumerListenerTest.java
servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerListener.java
servicemix/components/engines/servicemix-bean/trunk/src/test/resources/log4j.properties
Modified: servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanComponent.java?rev=695846&r1=695845&r2=695846&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanComponent.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanComponent.java Tue Sep 16 05:48:00 2008
@@ -116,7 +116,6 @@
}
IntrospectionSupport.setProperties(endpoint.getBean(), map);
- endpoint.activate();
return endpoint;
}
Modified: servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/ConsumerBeanTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/ConsumerBeanTest.java?rev=695846&r1=695845&r2=695846&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/ConsumerBeanTest.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/ConsumerBeanTest.java Tue Sep 16 05:48:00 2008
@@ -42,6 +42,10 @@
jbi.init();
}
+ protected void tearDown() throws Exception {
+ jbi.shutDown();
+ }
+
/*
public void test() throws Exception {
BeanComponent bc = new BeanComponent();
Modified: servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/ConsumerListenerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/ConsumerListenerTest.java?rev=695846&r1=695845&r2=695846&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/ConsumerListenerTest.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/ConsumerListenerTest.java Tue Sep 16 05:48:00 2008
@@ -42,6 +42,10 @@
jbi.init();
}
+ protected void tearDown() throws Exception {
+ jbi.shutDown();
+ }
+
public void test() throws Exception {
BeanComponent bc = new BeanComponent();
BeanEndpoint ep = new BeanEndpoint();
@@ -64,10 +68,6 @@
nm.setContent(new StringSource("<hello>world</hello>"));
client.sendSync(me);
assertExchangeWorked(me);
- client.done(me);
- }
-
- protected void assertExchangeWorked(MessageExchange me) throws Exception {
if (me.getStatus() == ExchangeStatus.ERROR) {
if (me.getError() != null) {
throw me.getError();
@@ -75,8 +75,15 @@
fail("Received ERROR status");
}
} else if (me.getFault() != null) {
- fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
+ String txt = new SourceTransformer().toString(me.getFault().getContent());
+ client.done(me);
+ fail("Received fault: " + txt);
+ } else {
+ client.done(me);
}
}
+ protected void assertExchangeWorked(MessageExchange me) throws Exception {
+ }
+
}
\ No newline at end of file
Modified: servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerListener.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerListener.java?rev=695846&r1=695845&r2=695846&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerListener.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerListener.java Tue Sep 16 05:48:00 2008
@@ -40,6 +40,8 @@
MessageUtil.transferOutToOut(exchange, io);
io.setProperty("exchange", exchange);
channel.send(io);
+ exchange.setStatus(ExchangeStatus.DONE);
+ channel.send(exchange);
} else if (exchange.getStatus() == ExchangeStatus.DONE) {
MessageExchange io = (MessageExchange) exchange.getProperty("exchange");
io.setStatus(ExchangeStatus.DONE);
Modified: servicemix/components/engines/servicemix-bean/trunk/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/test/resources/log4j.properties?rev=695846&r1=695845&r2=695846&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/test/resources/log4j.properties (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/test/resources/log4j.properties Tue Sep 16 05:48:00 2008
@@ -21,7 +21,7 @@
#
# The logging properties used during tests..
#
-log4j.rootLogger=INFO, stdout
+log4j.rootLogger=DEBUG, stdout
log4j.logger.org.springframework=INFO
log4j.logger.org.apache.activemq=INFO