camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1164529 - in /camel/branches/camel-2.8.x: ./ examples/camel-example-loan-broker/ examples/camel-example-loan-broker/src/main/resources/META-INF/spring/ examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/vers...
Date Fri, 02 Sep 2011 13:39:36 GMT
Author: davsclaus
Date: Fri Sep  2 13:39:28 2011
New Revision: 1164529

URL: http://svn.apache.org/viewvc?rev=1164529&view=rev
Log:
Merged revisions 1157749 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk


Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/examples/camel-example-loan-broker/pom.xml
    camel/branches/camel-2.8.x/examples/camel-example-loan-broker/src/main/resources/META-INF/spring/queueCamelContext.xml
    camel/branches/camel-2.8.x/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueContainerTestClient.java
    camel/branches/camel-2.8.x/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerQueueServerTest.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  2 13:39:28 2011
@@ -1 +1 @@
-/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395
+/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/examples/camel-example-loan-broker/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-loan-broker/pom.xml?rev=1164529&r1=1164528&r2=1164529&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-loan-broker/pom.xml (original)
+++ camel/branches/camel-2.8.x/examples/camel-example-loan-broker/pom.xml Fri Sep  2 13:39:28
2011
@@ -39,7 +39,7 @@
 			org.apache.activemq.xbean,org.apache.activemq.broker,org.apache.activemq.pool
     </camel.osgi.import.additional>
 		<!-- to avoid us import bunch of cxf package -->
-                <camel.osgi.dynamic>*</camel.osgi.dynamic>
+    <camel.osgi.dynamic>*</camel.osgi.dynamic>
 	</properties>
 
 	<dependencies>



Mime
View raw message