/[Apache-SVN]

Revision 1374891

Jump to revision:
Author:	ningjiang
Date:	Mon Aug 20 01:24:19 2012 UTC (11 years, 8 months ago)
Changed paths:	10
Log Message:	Merged revisions 1374582-1374584,1374709 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1374582 \| ningjiang \| 2012-08-18 22:02:29 +0800 (Sat, 18 Aug 2012) \| 1 line CAMEL-5518 fix the issue that Camel Proxy,Export ignores camelContextId property in Spring configuration ........ r1374583 \| ningjiang \| 2012-08-18 22:03:32 +0800 (Sat, 18 Aug 2012) \| 1 line CAMEL-5519 fix the issue that camel template, endpoint etc ignore camelContextId property ........ r1374584 \| ningjiang \| 2012-08-18 22:04:14 +0800 (Sat, 18 Aug 2012) \| 1 line CAMEL-5518 fix a failed test ........ r1374709 \| ningjiang \| 2012-08-19 16:24:55 +0800 (Sun, 19 Aug 2012) \| 1 line CAMEL-5518 fix another failed test ........

Changed paths

Path	Details
camel/branches/camel-2.10.x/	modified , props changed
camel/branches/camel-2.10.x/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelFactoryBean.java	modified , text changed
camel/branches/camel-2.10.x/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelProxyFactoryBean.java	modified , text changed
camel/branches/camel-2.10.x/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/CamelServiceExporter.java	modified , text changed
camel/branches/camel-2.10.x/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest.java (Copied from camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest.java, r1374584)	added
camel/branches/camel-2.10.x/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingTwoCamelContextTest.java (Copied from camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingTwoCamelContextTest.java, r1374584)	added
camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelProxyTest.xml	modified , text changed
camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest-context.xml (Copied from camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/produce/ProduceTemplateWithTwoCamelContextTest-context.xml, r1374584)	added
camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/echo-pojo-out-of-camelContext.xml	modified , text changed
camel/branches/camel-2.10.x/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/spring-with-two-camelcontext.xml (Copied from camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/spring-with-two-camelcontext.xml, r1374584)	added

infrastructure at apache.org	ViewVC Help
Powered by ViewVC 1.1.26