Author: davsclaus
Date: Sat Aug 7 09:54:02 2010
New Revision: 983194
URL: http://svn.apache.org/viewvc?rev=983194&view=rev
Log:
Using explicity camel id
Modified:
camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml
camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml
camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client.xml
camel/trunk/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java
Modified:
camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java?rev=983194&r1=983193&r2=983194&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
(original)
+++
camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
Sat Aug 7 09:54:02 2010
@@ -43,7 +43,7 @@ public final class CamelClientEndpoint {
System.out.println("Notice this client requires that the CamelServer
is already running!");
ApplicationContext context = new
ClassPathXmlApplicationContext("camel-client.xml");
- CamelContext camel = (CamelContext) context.getBean("camel");
+ CamelContext camel = (CamelContext) context.getBean("camel-client");
// get the endpoint from the camel context
Endpoint endpoint = camel.getEndpoint("jms:queue:numbers");
Modified:
camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml?rev=983194&r1=983193&r2=983194&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml
(original)
+++
camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server-aop.xml
Sat Aug 7 09:54:02 2010
@@ -68,7 +68,7 @@
<!-- START SNIPPET: e5 -->
<!-- declare a camel context that scans for classes that is RouteBuilder
in the package org.apache.camel.example.server -->
- <camel:camelContext id="camel">
+ <camel:camelContext id="camel-server-aop">
<camel:package>org.apache.camel.example.server</camel:package>
<!-- enable JMX connector so we can connect to the server and browse
mbeans -->
<!-- Camel will log at INFO level the service URI to use for
connecting with jconsole -->
Modified:
camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml?rev=983194&r1=983193&r2=983194&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
(original)
+++
camel/trunk/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
Sat Aug 7 09:54:02 2010
@@ -37,7 +37,7 @@
<!-- START SNIPPET: e3 -->
<!-- declare a camel context that scans for classes that is RouteBuilder
in the package org.apache.camel.example.server -->
- <camel:camelContext id="camel">
+ <camel:camelContext id="camel-server">
<camel:package>org.apache.camel.example.server</camel:package>
<!-- enable JMX connector so we can connect to the server and browse
mbeans -->
<!-- Camel will log at INFO level the service URI to use for
connecting with jconsole -->
Modified:
camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml?rev=983194&r1=983193&r2=983194&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml
(original)
+++
camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client-remoting.xml
Sat Aug 7 09:54:02 2010
@@ -23,7 +23,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <camel:camelContext id="camel">
+ <camel:camelContext id="camel-client-2">
<camel:template id="camelTemplate"/>
<!-- START SNIPPET: e1 -->
<!-- Camel proxy for a given service, in this case the JMS queue
Modified:
camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client.xml?rev=983194&r1=983193&r2=983194&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client.xml
(original)
+++
camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client.xml
Sat Aug 7 09:54:02 2010
@@ -26,7 +26,7 @@
<!-- END SNIPPET: e1 -->
<!-- START SNIPPET: e2 -->
- <camel:camelContext id="camel">
+ <camel:camelContext id="camel-client">
<camel:template id="camelTemplate"/>
</camel:camelContext>
<!-- END SNIPPET: e2 -->
Modified:
camel/trunk/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java?rev=983194&r1=983193&r2=983194&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java
(original)
+++
camel/trunk/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java
Sat Aug 7 09:54:02 2010
@@ -43,7 +43,6 @@ public class SpringJmsClientServerTest e
if (serverContext != null) {
serverContext.stop();
}
-
}
@Test
@@ -59,14 +58,12 @@ public class SpringJmsClientServerTest e
assertEquals("Get a wrong response", 66, response);
context.stop();
-
}
@Test
public void testCamelEndpointInvocation() throws Exception {
-
ConfigurableApplicationContext context = new
ClassPathXmlApplicationContext("camel-client.xml");
- CamelContext camel = (CamelContext) context.getBean("camel");
+ CamelContext camel = (CamelContext) context.getBean("camel-client");
// get the endpoint from the camel context
Endpoint endpoint = camel.getEndpoint("jms:queue:numbers");
@@ -95,12 +92,10 @@ public class SpringJmsClientServerTest e
// stop and exit the client
producer.stop();
context.stop();
-
}
@Test
public void testCamelRemotingInvocation() {
-
ConfigurableApplicationContext context = new
ClassPathXmlApplicationContext("camel-client-remoting.xml");
// just get the proxy to the service and we as the client can use the
"proxy" as it was
// a local object we are invoking. Camel will under the covers do the
remote communication
@@ -112,7 +107,6 @@ public class SpringJmsClientServerTest e
assertEquals("Get a wrong response", 99, response);
context.stop();
-
}
}
