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 2008/11/21 13:36:09 UTC
svn commit: r719568 - in /activemq/camel/branches/camel-1.x: ./
components/camel-spring/src/main/java/org/apache/camel/spring/
components/camel-spring/src/test/java/org/apache/camel/spring/config/
components/camel-spring/src/test/java/org/apache/camel/...
Author: ningjiang
Date: Fri Nov 21 04:36:08 2008
New Revision: 719568
URL: http://svn.apache.org/viewvc?rev=719568&view=rev
Log:
Merged revisions 719524 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r719524 | ningjiang | 2008-11-21 15:31:42 +0800 (Fri, 21 Nov 2008) | 1 line
CAMEL-1049 Applied patch with thanks to Andreas
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java
activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/RedeliveryPolicyReTest.java (props changed)
activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBean.xml
activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/RedeliveryPolicyRefTest.xml (props changed)
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 21 04:36:08 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=719568&r1=719567&r2=719568&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Fri Nov 21 04:36:08 2008
@@ -464,6 +464,13 @@
this.errorHandlerRef = errorHandlerRef;
}
+ public Boolean getShouldStartContext() {
+ return shouldStartContext;
+ }
+
+ public void setShouldStartContext(Boolean shouldStartContext) {
+ this.shouldStartContext = shouldStartContext;
+ }
// Implementation methods
// -------------------------------------------------------------------------
Modified: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java?rev=719568&r1=719567&r2=719568&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelContextFactoryBeanTest.java Fri Nov 21 04:36:08 2008
@@ -23,6 +23,7 @@
import org.apache.camel.Processor;
import org.apache.camel.Route;
import org.apache.camel.impl.EventDrivenConsumerRoute;
+import org.apache.camel.spring.SpringCamelContext;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -80,4 +81,17 @@
assertEndpointUri(key, "seda:test.c");
}
}
+
+ public void testShouldStartContext() throws Exception {
+ ApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/apache/camel/spring/camelContextFactoryBean.xml");
+
+ SpringCamelContext context = (SpringCamelContext) applicationContext.getBean("camel4");
+ assertNotNull("No context found!", context);
+ assertFalse("The context should not start yet", context.getShouldStartContext());
+ assertEquals("There should have not route", context.getRoutes().size(), 0);
+ context = (SpringCamelContext) applicationContext.getBean("camel3");
+ assertTrue("The context should started", context.getShouldStartContext());
+ assertEquals("There should have one route", context.getRoutes().size(), 1);
+ }
+
}
Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/RedeliveryPolicyReTest.java
('svn:mergeinfo' removed)
Modified: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBean.xml
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBean.xml?rev=719568&r1=719567&r2=719568&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBean.xml (original)
+++ activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/camelContextFactoryBean.xml Fri Nov 21 04:36:08 2008
@@ -42,4 +42,11 @@
<package>org.apache.camel.spring.example</package>
</camelContext>
<!-- END SNIPPET: example3 -->
+
+ <!-- START SNIPPET: example4 -->
+ <camelContext id="camel4" xmlns="http://activemq.apache.org/camel/schema/spring" shouldStartContext="false">
+ <package>org.apache.camel.spring.example</package>
+ </camelContext>
+ <!-- END SNIPPET: example3 -->
+
</beans>
Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/RedeliveryPolicyRefTest.xml
('svn:mergeinfo' removed)