camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject svn commit: r1467828 - in /camel/trunk/examples/camel-example-spring-jms: pom.xml src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java src/main/resources/META-INF/spring/camel-server.xml src/main/resources/camel-client.xml
Date Sun, 14 Apr 2013 20:58:11 GMT
Author: bvahdat
Date: Sun Apr 14 20:58:10 2013
New Revision: 1467828

URL: http://svn.apache.org/r1467828
Log:
CAMEL-6276: Fixed the example camel-example-spring-jms being broken.

Modified:
    camel/trunk/examples/camel-example-spring-jms/pom.xml
    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.xml
    camel/trunk/examples/camel-example-spring-jms/src/main/resources/camel-client.xml

Modified: camel/trunk/examples/camel-example-spring-jms/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-jms/pom.xml?rev=1467828&r1=1467827&r2=1467828&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-jms/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-jms/pom.xml Sun Apr 14 20:58:10 2013
@@ -80,11 +80,6 @@
         
         <!-- for testing -->
         <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
           <groupId>org.apache.camel</groupId>
           <artifactId>camel-test-spring</artifactId>
           <scope>test</scope>

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=1467828&r1=1467827&r2=1467828&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
Sun Apr 14 20:58:10 2013
@@ -52,7 +52,7 @@ public final class CamelClientEndpoint {
         // we use the in out pattern for a synchronized exchange where we expect a response
         Exchange exchange = endpoint.createExchange(ExchangePattern.InOut);
         // set the input on the in body
-        // must you correct type to match the expected type of an Integer object
+        // must be correct type to match the expected type of an Integer object
         exchange.getIn().setBody(11);
 
         // to send the exchange we need an producer to do it for us

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=1467828&r1=1467827&r2=1467828&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
Sun Apr 14 20:58:10 2013
@@ -26,7 +26,7 @@
          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
          http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
          http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-         http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd">
+         http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
   <!-- END SNIPPET: e1 -->
 
   <!-- START SNIPPET: e2 -->
@@ -50,7 +50,7 @@
   <!-- END SNIPPET: e3 -->
 
   <!-- START SNIPPET: e4 -->
-  <!-- lets configure the ActiveMQ JMS broker server to listen on TCP 61610 -->
+  <!-- lets configure the ActiveMQ JMS broker server -->
   <broker:broker useJmx="true" persistent="false" brokerName="myBroker">
     <broker:transportConnectors>
       <!-- expose a VM transport for in-JVM transport between AMQ and Camel on the server
side -->

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=1467828&r1=1467827&r2=1467828&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 Sun
Apr 14 20:58:10 2013
@@ -20,8 +20,10 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:camel="http://camel.apache.org/schema/spring"
+       xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="
          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
          http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   <!-- END SNIPPET: e1 -->
 
@@ -31,10 +33,14 @@
   </camel:camelContext>
   <!-- END SNIPPET: e2 -->
 
+  <!-- spring property placeholder, ignore resource not found as the file resource is
for unit testing -->
+  <context:property-placeholder location="classpath:camel.properties,file:target/custom.properties"
+                                ignore-resource-not-found="true"/>
+
   <!-- START SNIPPET: e3 -->
   <!-- Camel JMSProducer to be able to send messages to a remote Active MQ server -->
   <bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent">
-    <property name="brokerURL" value="tcp://localhost:61610"/>
+    <property name="brokerURL" value="tcp://localhost:${tcp.port}"/>
   </bean>
   <!-- END SNIPPET: e3 -->
 



Mime
View raw message