Author: cschneider
Date: Wed Feb 8 10:30:20 2012
New Revision: 1241849
URL: http://svn.apache.org/viewvc?rev=1241849&view=rev
Log:
Merged revision(s) 1240967 from camel/trunk:
CAMEL-4985 Adjusting the configuration to the new style like used in the
servlet tomcat example
........
Added:
camel/branches/camel-2.9.x/examples/camel-example-spring-security/src/main/resources/camel-context.xml
- copied unchanged from r1240967,
camel/trunk/examples/camel-example-spring-security/src/main/resources/camel-context.xml
Removed:
camel/branches/camel-2.9.x/examples/camel-example-spring-security/src/main/resources/org/
camel/branches/camel-2.9.x/examples/camel-example-spring-security/src/main/webapp/WEB-INF/applicationContext-security.xml
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/examples/camel-example-spring-security/pom.xml
camel/branches/camel-2.9.x/examples/camel-example-spring-security/src/main/webapp/WEB-INF/web.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 8 10:30:20 2012
@@ -1 +1 @@
-/camel/trunk:1235643,1236639,1236667,1237666,1237807,1238225,1238229,1238387,1238463,1238477,1238503,1238937,1238988,1239006,1239045,1239080-1239081,1239470,1239479,1239497,1240025,1240063,1240950,1241482,1241485,1241737
+/camel/trunk:1235643,1236639,1236667,1237666,1237807,1238225,1238229,1238387,1238463,1238477,1238503,1238937,1238988,1239006,1239045,1239080-1239081,1239470,1239479,1239497,1240025,1240063,1240950,1240967,1241482,1241485,1241737
Modified:
camel/branches/camel-2.9.x/examples/camel-example-spring-security/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-spring-security/pom.xml?rev=1241849&r1=1241848&r2=1241849&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/examples/camel-example-spring-security/pom.xml
(original)
+++ camel/branches/camel-2.9.x/examples/camel-example-spring-security/pom.xml
Wed Feb 8 10:30:20 2012
@@ -81,13 +81,6 @@
<build>
<plugins>
- <!-- Allows the routes to be run via 'mvn camel:run' -->
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
-
<!-- so we can run mvn jetty:run -->
<plugin>
<groupId>org.mortbay.jetty</groupId>
Modified:
camel/branches/camel-2.9.x/examples/camel-example-spring-security/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-spring-security/src/main/webapp/WEB-INF/web.xml?rev=1241849&r1=1241848&r2=1241849&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/examples/camel-example-spring-security/src/main/webapp/WEB-INF/web.xml
(original)
+++
camel/branches/camel-2.9.x/examples/camel-example-spring-security/src/main/webapp/WEB-INF/web.xml
Wed Feb 8 10:30:20 2012
@@ -25,7 +25,7 @@
<!-- location of spring xml files -->
<context-param>
<param-name>contextConfigLocation</param-name>
- <param-value>/WEB-INF/applicationContext-security.xml</param-value>
+ <param-value>classpath:camel-context.xml</param-value>
</context-param>
<!-- the listener that kick-starts Spring -->
@@ -46,15 +46,7 @@
<servlet>
<servlet-name>CamelServlet</servlet-name>
<servlet-class>org.apache.camel.component.servlet.CamelHttpTransportServlet</servlet-class>
- <init-param>
- <param-name>matchOnUriPrefix</param-name>
- <param-value>true</param-value>
- </init-param>
- <!-- set the camel context application file location here -->
- <init-param>
- <param-name>contextConfigLocation</param-name>
-
<param-value>/org/apache/camel/example/spring/security/camel-context.xml</param-value>
- </init-param>
+ <load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
