Author: ningjiang
Date: Wed Apr 14 09:29:04 2010
New Revision: 933891
URL: http://svn.apache.org/viewvc?rev=933891&view=rev
Log:
CAMEL-2641 Camel-Servlet component should support to load more than one
application context file
Modified:
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web-spring.xml
Modified:
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java?rev=933891&r1=933890&r2=933891&view=diff
==============================================================================
---
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
(original)
+++
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
Wed Apr 14 09:29:04 2010
@@ -43,7 +43,8 @@ public class CamelHttpTransportServlet e
String contextConfigLocation =
config.getInitParameter("contextConfigLocation");
if (contextConfigLocation != null) {
//Create a spring application context for it
- applicationContext = new ClassPathXmlApplicationContext(new
String[]{contextConfigLocation});
+ applicationContext = new
ClassPathXmlApplicationContext(contextConfigLocation.split(","));
+ LOG.info("Started the application context rightly");
}
}
Modified:
camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web-spring.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web-spring.xml?rev=933891&r1=933890&r2=933891&view=diff
==============================================================================
---
camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web-spring.xml
(original)
+++
camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web-spring.xml
Wed Apr 14 09:29:04 2010
@@ -35,7 +35,10 @@
<param-name>matchOnUriPrefix</param-name>
<param-value>true</param-value>
</init-param>
- <!-- set the camel context application file location here -->
+ <!-- Set the camel context application file location here.
+ From Camel 2.3.0, you can specify more than one application context
configure file
+ which is separated by ','.
+ -->
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>/org/apache/camel/component/servlet/camelContext.xml</param-value>
