Author: ningjiang
Date: Sat Jul  3 09:36:24 2010
New Revision: 960189

URL: http://svn.apache.org/viewvc?rev=960189&view=rev
Log:
CAMEL-2904 proxy should support to set the camelContextId

Modified:
    
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java
    
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
    
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelProxyTest.xml

Modified: 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java?rev=960189&r1=960188&r2=960189&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java
 Sat Jul  3 09:36:24 2010
@@ -127,6 +127,10 @@ public class CamelProxyFactoryBean exten
     public void setCamelContext(CamelContext camelContext) {
         this.camelContext = camelContext;
     }
+    
+    public void setCamelContextId(String contextId) {
+        this.camelContextId = contextId;
+    }
 
     public void setApplicationContext(ApplicationContext applicationContext) 
throws BeansException {
         this.applicationContext = applicationContext;

Modified: 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java?rev=960189&r1=960188&r2=960189&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
 Sat Jul  3 09:36:24 2010
@@ -45,6 +45,14 @@ public class CamelProxyTest extends Test
         anotherSender.greeting("Hello my friends!");
         result.assertIsSatisfied();
         
+        result.reset();
+        // test sending inOnly message with other sender
+        MyProxySender myProxySenderWithCamelContextId = (MyProxySender) 
ac.getBean("myProxySenderWithCamelContextId");
+        
+        result.expectedBodiesReceived("Hello my friends again!");
+        myProxySenderWithCamelContextId.greeting("Hello my friends again!");
+        result.assertIsSatisfied();
+        
     }
     
 }
\ No newline at end of file

Modified: 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelProxyTest.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelProxyTest.xml?rev=960189&r1=960188&r2=960189&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelProxyTest.xml
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelProxyTest.xml
 Sat Jul  3 09:36:24 2010
@@ -51,6 +51,11 @@
         </route>
 
     </camelContext>
+    
+    <proxy id="myProxySenderWithCamelContextId"
+               serviceInterface="org.apache.camel.spring.config.MyProxySender"
+               serviceUrl="direct:inOnly"
+               camelContextId ="myCamel" 
xmlns="http://camel.apache.org/schema/spring"/>
     <!-- END SNIPPET: e1 -->
 
 </beans>


Reply via email to