You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/05/19 15:56:24 UTC
svn commit: r776320 - in /camel/branches/camel-1.x: ./
examples/camel-example-osgi/src/main/java/org/apache/camel/example/osgi/MyRouteBuilder.java
examples/camel-example-osgi/src/main/resources/META-INF/spring/camelContext.xml
Author: ningjiang
Date: Tue May 19 13:56:24 2009
New Revision: 776320
URL: http://svn.apache.org/viewvc?rev=776320&view=rev
Log:
Merged revisions 776289 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r776289 | ningjiang | 2009-05-19 20:25:58 +0800 (Tue, 19 May 2009) | 1 line
CAMEL-1629 add Java DSL example for the camel-example-osgi
........
Added:
camel/branches/camel-1.x/examples/camel-example-osgi/src/main/java/org/apache/camel/example/osgi/MyRouteBuilder.java
- copied unchanged from r776289, camel/trunk/examples/camel-example-osgi/src/main/java/org/apache/camel/example/osgi/MyRouteBuilder.java
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/examples/camel-example-osgi/src/main/resources/META-INF/spring/camelContext.xml
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 19 13:56:24 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/examples/camel-example-osgi/src/main/resources/META-INF/spring/camelContext.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/examples/camel-example-osgi/src/main/resources/META-INF/spring/camelContext.xml?rev=776320&r1=776319&r2=776320&view=diff
==============================================================================
--- camel/branches/camel-1.x/examples/camel-example-osgi/src/main/resources/META-INF/spring/camelContext.xml (original)
+++ camel/branches/camel-1.x/examples/camel-example-osgi/src/main/resources/META-INF/spring/camelContext.xml Tue May 19 13:56:24 2009
@@ -25,6 +25,7 @@
http://activemq.apache.org/camel/schema/osgi http://activemq.apache.org/camel/schema/osgi/camel-osgi.xsd">
<camelContext xmlns="http://activemq.apache.org/camel/schema/osgi">
+ <camel:package>org.apache.camel.example.osgi</camel:package>
<camel:route>
<camel:from uri="timer://myTimer?fixedRate=true&period=2000"/>
<camel:bean ref="myTransform" method="transform"/>
@@ -33,7 +34,7 @@
</camelContext>
<bean id="myTransform" class="org.apache.camel.example.osgi.MyTransform">
- <property name="prefix" value="MyTransform"/>
+ <property name="prefix" value="SpringDSL"/>
</bean>
</beans>