svn commit: r711220 - in /activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring: CamelContextFactoryBean.java SpringCamelContext.java

[ningjiang]

Author: ningjiang
Date: Tue Nov  4 02:08:33 2008
New Revision: 711220

URL: http://svn.apache.org/viewvc?rev=711220&view=rev
Log:
CAMEL-1049 Applied patch with thanks to Andreas

Modified:
    
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
    
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java

Modified: 
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=711220&r1=711219&r2=711220&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
 (original)
+++ 
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
 Tue Nov  4 02:08:33 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/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java?rev=711220&r1=711219&r2=711220&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
 (original)
+++ 
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
 Tue Nov  4 02:08:33 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.");
         }
     }