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/08 08:45:33 UTC
svn commit: r961597 - in
/servicemix/components/engines/servicemix-bean/trunk: ./
src/main/java/org/apache/servicemix/bean/ src/test/resources/
Author: gnodet
Date: Thu Jul 8 06:45:33 2010
New Revision: 961597
URL: http://svn.apache.org/viewvc?rev=961597&view=rev
Log:
SMXCOMP-771: Upgrade to spring 3.x
Modified:
servicemix/components/engines/servicemix-bean/trunk/pom.xml
servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java
servicemix/components/engines/servicemix-bean/trunk/src/test/resources/sender-bean.xml
servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring-no-endpoints-or-beans.xml
servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring-no-endpoints.xml
servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring.xml
Modified: servicemix/components/engines/servicemix-bean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/pom.xml?rev=961597&r1=961596&r2=961597&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-bean/trunk/pom.xml Thu Jul 8 06:45:33 2010
@@ -156,6 +156,12 @@
</dependencies>
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
Modified: servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java?rev=961597&r1=961596&r2=961597&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java Thu Jul 8 06:45:33 2010
@@ -31,13 +31,7 @@ import javax.annotation.Resource;
import javax.jbi.JBIException;
import javax.jbi.component.ComponentContext;
import javax.jbi.management.MBeanNames;
-import javax.jbi.messaging.DeliveryChannel;
-import javax.jbi.messaging.ExchangeStatus;
-import javax.jbi.messaging.InOut;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.MessageExchangeFactory;
-import javax.jbi.messaging.MessagingException;
-import javax.jbi.messaging.NormalizedMessage;
+import javax.jbi.messaging.*;
import javax.jbi.messaging.MessageExchange.Role;
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.management.MBeanServer;
@@ -258,7 +252,8 @@ public class BeanEndpoint extends Provid
send(exchange);
}
if (exchange.getFault() == null && exchange.getMessage("out") == null) {
- // TODO: handle MEP correctly (DONE should only be sent for InOnly)
+ //TODO: Only send DONE if(onProviderExchange(exchange)) as soon as we find a way to solve
+ // the TODO in evaluateCallbacks(Request)
done(exchange);
}
}
@@ -270,6 +265,15 @@ public class BeanEndpoint extends Provid
}
}
+ /*
+ * Check if the incoming provider exchange should be marked DONE
+ */
+ protected boolean onProviderExchangeDone(MessageExchange exchange) {
+ return (exchange instanceof InOnly) ||
+ (exchange instanceof RobustInOnly && exchange.getFault() == null) ||
+ (exchange instanceof InOptionalOut && exchange.getFault() == null && exchange.getMessage("out") == null);
+ }
+
protected Request getOrCreateCurrentRequest(MessageExchange exchange) throws ClassNotFoundException, InstantiationException, IllegalAccessException, MessagingException {
if (currentRequest.get() != null) {
return currentRequest.get();
Modified: servicemix/components/engines/servicemix-bean/trunk/src/test/resources/sender-bean.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/test/resources/sender-bean.xml?rev=961597&r1=961596&r2=961597&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/test/resources/sender-bean.xml (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/test/resources/sender-bean.xml Thu Jul 8 06:45:33 2010
@@ -20,21 +20,23 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:sm="http://servicemix.apache.org/config/1.0"
xmlns:bean="http://servicemix.apache.org/bean/1.0"
- xmlns:test="urn:test">
+ xmlns:test="urn:test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+ http://servicemix.apache.org/bean/1.0 http://servicemix.apache.org/schema/servicemix-bean-${project.version}.xsd">
<sm:container id="jbi" embedded="true" createMBeanServer="false">
- <sm:endpoints>
+ <sm:activationSpecs>
+ <sm:activationSpec service="test:receiver" endpoint="endpoint" component="#receiver" />
+ </sm:activationSpecs>
+ <sm:endpoints>
<bean:endpoint service="test:service" endpoint="endpoint" bean="#senderBean"/>
-
</sm:endpoints>
- <sm:activationSpecs>
-
- <sm:activationSpec service="test:receiver" endpoint="endpoint" component="#receiver" />
-
- </sm:activationSpecs>
<sm:listeners>
<ref bean="listener" />
Modified: servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring-no-endpoints-or-beans.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring-no-endpoints-or-beans.xml?rev=961597&r1=961596&r2=961597&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring-no-endpoints-or-beans.xml (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring-no-endpoints-or-beans.xml Thu Jul 8 06:45:33 2010
@@ -17,15 +17,25 @@
limitations under the License.
-->
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:sm="http://servicemix.apache.org/config/1.0"
xmlns:bean="http://servicemix.apache.org/bean/1.0"
- xmlns:test="urn:test">
+ xmlns:test="urn:test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+ http://servicemix.apache.org/bean/1.0 http://servicemix.apache.org/schema/servicemix-bean-${project.version}.xsd">
<sm:container id="jbi" embedded="true" createMBeanServer="false">
<sm:activationSpecs>
<sm:activationSpec>
<sm:component>
- <bean:component searchPackages="org.apache.servicemix.bean.beans"/>
+ <bean:component>
+ <bean:searchPackages>
+ <value>org.apache.servicemix.bean.beans</value>
+ </bean:searchPackages>
+ </bean:component>
</sm:component>
</sm:activationSpec>
</sm:activationSpecs>
Modified: servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring-no-endpoints.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring-no-endpoints.xml?rev=961597&r1=961596&r2=961597&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring-no-endpoints.xml (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring-no-endpoints.xml Thu Jul 8 06:45:33 2010
@@ -17,9 +17,15 @@
limitations under the License.
-->
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:sm="http://servicemix.apache.org/config/1.0"
xmlns:bean="http://servicemix.apache.org/bean/1.0"
- xmlns:test="urn:test">
+ xmlns:test="urn:test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+ http://servicemix.apache.org/bean/1.0 http://servicemix.apache.org/schema/servicemix-bean-${project.version}.xsd">
<sm:container id="jbi" embedded="true" createMBeanServer="false">
Modified: servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring.xml?rev=961597&r1=961596&r2=961597&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring.xml (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/test/resources/spring.xml Thu Jul 8 06:45:33 2010
@@ -17,9 +17,15 @@
limitations under the License.
-->
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:sm="http://servicemix.apache.org/config/1.0"
xmlns:bean="http://servicemix.apache.org/bean/1.0"
- xmlns:test="urn:test">
+ xmlns:test="urn:test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://servicemix.apache.org/config/1.0 http://servicemix.apache.org/schema/servicemix-core-${servicemix-version}.xsd
+ http://servicemix.apache.org/bean/1.0 http://servicemix.apache.org/schema/servicemix-bean-${project.version}.xsd">
<sm:container id="jbi" embedded="true" createMBeanServer="false">