Author: bvahdat
Date: Sun Apr 14 21:04:33 2013
New Revision: 1467830
URL: http://svn.apache.org/r1467830
Log:
Merged revisions 1467828 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1467828 | bvahdat | 2013-04-14 22:58:10 +0200 (So, 14 Apr 2013) | 2 lines
CAMEL-6276: Fixed the example camel-example-spring-jms being broken.
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-jms/ (props changed)
camel/branches/camel-2.10.x/examples/camel-example-spring-jms/pom.xml
camel/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
camel/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
camel/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/resources/camel-client.xml
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1467828
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Propchange: camel/branches/camel-2.10.x/components/camel-jms/
------------------------------------------------------------------------------
Merged /camel/trunk/components/camel-jms:r1467828
Modified: camel/branches/camel-2.10.x/examples/camel-example-spring-jms/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-spring-jms/pom.xml?rev=1467830&r1=1467829&r2=1467830&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/examples/camel-example-spring-jms/pom.xml
(original)
+++ camel/branches/camel-2.10.x/examples/camel-example-spring-jms/pom.xml Sun
Apr 14 21:04:33 2013
@@ -82,11 +82,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/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java?rev=1467830&r1=1467829&r2=1467830&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
(original)
+++
camel/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
Sun Apr 14 21:04:33 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/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml?rev=1467830&r1=1467829&r2=1467830&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
(original)
+++
camel/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/resources/META-INF/spring/camel-server.xml
Sun Apr 14 21:04:33 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/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/resources/camel-client.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/resources/camel-client.xml?rev=1467830&r1=1467829&r2=1467830&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/resources/camel-client.xml
(original)
+++
camel/branches/camel-2.10.x/examples/camel-example-spring-jms/src/main/resources/camel-client.xml
Sun Apr 14 21:04:33 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 -->
