activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r534156 - in /activemq/camel/trunk: ./ apache-camel/ apache-camel/src/main/descriptors/ camel-core/src/main/java/org/apache/camel/component/pojo/ camel-core/src/main/java/org/apache/camel/impl/ camel-cxf/ camel-cxf/src/main/java/org/apache/...
Date Tue, 01 May 2007 16:58:45 GMT
Author: jstrachan
Date: Tue May  1 09:58:44 2007
New Revision: 534156

URL: http://svn.apache.org/viewvc?view=rev&rev=534156
Log:
fixed some failing test cases & added camel-rmi to the assembly

Modified:
    activemq/camel/trunk/apache-camel/pom.xml
    activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
    activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoEndpoint.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
    activemq/camel/trunk/camel-cxf/pom.xml
    activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeProducer.java
    activemq/camel/trunk/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiProducer.java
    activemq/camel/trunk/pom.xml

Modified: activemq/camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/pom.xml?view=diff&rev=534156&r1=534155&r2=534156
==============================================================================
--- activemq/camel/trunk/apache-camel/pom.xml (original)
+++ activemq/camel/trunk/apache-camel/pom.xml Tue May  1 09:58:44 2007
@@ -80,6 +80,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-rmi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-script</artifactId>
     </dependency>
     <dependency>
@@ -180,7 +184,7 @@
               <goal>createbundle</goal>
             </goals>
             <configuration>
-              <includes>camel-core,camel-cxf,camel-file,camel-http,camel-jaxb,camel-jbi,camel-jms,camel-josql,camel-jpa,camel-mina,camel-saxon,camel-script,camel-spring,camel-xmpp,commons-logging</includes>
+              <includes>camel-core,camel-cxf,camel-file,camel-http,camel-jaxb,camel-jbi,camel-jms,camel-josql,camel-jpa,camel-mail,camel-mina,camel-rmi,camel-saxon,camel-script,camel-spring,camel-xmpp,commons-logging</includes>
             </configuration>
           </execution>
         </executions>

Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml?view=diff&rev=534156&r1=534155&r2=534156
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml Tue May  1 09:58:44
2007
@@ -58,6 +58,7 @@
         <include>org.apache.camel:camel-josql</include>
         <include>org.apache.camel:camel-jpa</include>
         <include>org.apache.camel:camel-mail</include>
+        <include>org.apache.camel:camel-rmi</include>
         <include>org.apache.camel:camel-mina</include>
         <include>org.apache.camel:camel-saxon</include>
         <include>org.apache.camel:camel-script</include>

Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml?view=diff&rev=534156&r1=534155&r2=534156
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml Tue May  1 09:58:44
2007
@@ -65,6 +65,7 @@
         <include>org.apache.camel:camel-jpa</include>
         <include>org.apache.camel:camel-mail</include>
         <include>org.apache.camel:camel-mina</include>
+        <include>org.apache.camel:camel-rmi</include>
         <include>org.apache.camel:camel-saxon</include>
         <include>org.apache.camel:camel-script</include>
         <include>org.apache.camel:camel-spring</include>

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoEndpoint.java?view=diff&rev=534156&r1=534155&r2=534156
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoEndpoint.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/pojo/PojoEndpoint.java
Tue May  1 09:58:44 2007
@@ -25,6 +25,7 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.impl.DefaultExchange;
 
 /**
  * Represents a pojo endpoint that uses reflection
@@ -49,7 +50,9 @@
         
         return startService(new DefaultProducer(this) {
             public void process(Exchange exchange) {
-                invoke(pojo, toExchangeType(exchange));
+                PojoExchange pojoExchange = toExchangeType(exchange);
+                invoke(pojo, pojoExchange);
+                exchange.copyFrom(pojoExchange);
             }
         });
     }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java?view=diff&rev=534156&r1=534155&r2=534156
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java
Tue May  1 09:58:44 2007
@@ -53,6 +53,9 @@
     }
 
     public void copyFrom(Exchange exchange) {
+        if (exchange == this) {
+            return;
+        }
         setHeaders(safeCopy(exchange.getProperties()));
         setIn(safeCopy(exchange.getIn()));
         setOut(safeCopy(exchange.getOut()));

Modified: activemq/camel/trunk/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/pom.xml?view=diff&rev=534156&r1=534155&r2=534156
==============================================================================
--- activemq/camel/trunk/camel-cxf/pom.xml (original)
+++ activemq/camel/trunk/camel-cxf/pom.xml Tue May  1 09:58:44 2007
@@ -167,7 +167,6 @@
           </includes>
           <excludes>
             <!-- TODO re-enable ASAP! -->
-            <exclude>**/CxfInvokeTest.*</exclude>
             <exclude>**/CxfTest.*</exclude>
             <exclude>**/transport/*Test.*</exclude>
           </excludes>

Modified: activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeProducer.java?view=diff&rev=534156&r1=534155&r2=534156
==============================================================================
--- activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeProducer.java
(original)
+++ activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfInvokeProducer.java
Tue May  1 09:58:44 2007
@@ -42,6 +42,7 @@
     public void process(Exchange exchange) {
         CxfExchange cxfExchange = endpoint.toExchangeType(exchange);
         process(cxfExchange);
+        exchange.copyFrom(cxfExchange);
     }
 
     public void process(CxfExchange exchange) {

Modified: activemq/camel/trunk/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiProducer.java?view=diff&rev=534156&r1=534155&r2=534156
==============================================================================
--- activemq/camel/trunk/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiProducer.java
(original)
+++ activemq/camel/trunk/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiProducer.java
Tue May  1 09:58:44 2007
@@ -44,7 +44,8 @@
 	public void process(Exchange exchange) throws AccessException, RemoteException, NotBoundException
{
         PojoExchange pojoExchange = endpoint.toExchangeType(exchange);
         PojoEndpoint.invoke(getRemote(), pojoExchange);
-	}
+        exchange.copyFrom(pojoExchange);
+    }
 
 	public Remote getRemote() throws AccessException, RemoteException, NotBoundException {
 		if( remote == null ) {

Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?view=diff&rev=534156&r1=534155&r2=534156
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Tue May  1 09:58:44 2007
@@ -204,6 +204,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-rmi</artifactId>
+        <version>${camel-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-saxon</artifactId>
         <version>${camel-version}</version>
       </dependency>



Mime
View raw message