svn commit: r711241 - in /activemq/camel/branches/camel-1.x: ./ components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r711241 - in /activemq/camel/branches/camel-1.x: ./ components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java

ningjiang
Author: ningjiang
Date: Tue Nov  4 04:29:01 2008
New Revision: 711241

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

........
  r711220 | ningjiang | 2008-11-04 18:08:33 +0800 (Tue, 04 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/main/java/org/apache/camel/spring/SpringCamelContext.java

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  4 04:29:01 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219
+/activemq/camel/trunk:709850,711200,711206,711219-711220

Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov  4 04:29:01 2008
@@ -1 +1 @@
-/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219
+/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220

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=711241&r1=711240&r2=711241&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 Tue Nov  4 04:29:01 2008
@@ -88,6 +88,8 @@
     private Long delay;
     @XmlAttribute(required = false)
     private String errorHandlerRef;
+    @XmlAttribute(required = false)
+    private Boolean shouldStartContext = Boolean.TRUE;
     @XmlElement(name = "package", required = false)
     private String[] packages = {};
     @XmlElement(name = "jmxAgent", type = CamelJMXAgentType.class, required = false)
@@ -485,6 +487,11 @@
             }
             ctx.setErrorHandlerBuilder(errorHandlerBuilder);
         }
+
+        if (shouldStartContext != null) {
+            ctx.setShouldStartContext(shouldStartContext);
+        }
+
         return ctx;
     }
 

Modified: activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java?rev=711241&r1=711240&r2=711241&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java Tue Nov  4 04:29:01 2008
@@ -96,7 +96,7 @@
             LOG.debug("Starting the CamelContext now that the ApplicationContext has started");
             start();
         } else {
-            LOG.debug("Not starting the CamelContext since shouldStartContext property was true.");
+            LOG.debug("Not starting the CamelContext since shouldStartContext property was false.");
         }
     }