camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1241048 - in /camel/branches/camel-2.8.x: ./ examples/camel-example-spring-security/ examples/camel-example-spring-security/src/main/resources/ examples/camel-example-spring-security/src/main/resources/org/ examples/camel-example-spring-se...
Date Mon, 06 Feb 2012 15:39:45 GMT
Author: cschneider
Date: Mon Feb  6 15:39:45 2012
New Revision: 1241048

URL: http://svn.apache.org/viewvc?rev=1241048&view=rev
Log:
CAMEL-4985 Backport to 2.8.x

Added:
    camel/branches/camel-2.8.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.8.x/examples/camel-example-spring-security/src/main/resources/org/
    camel/branches/camel-2.8.x/examples/camel-example-spring-security/src/main/webapp/WEB-INF/applicationContext-security.xml
Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/examples/camel-example-spring-security/pom.xml
    camel/branches/camel-2.8.x/examples/camel-example-spring-security/src/main/webapp/WEB-INF/web.xml

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb  6 15:39:45 2012
@@ -1,2 +1,2 @@
 /camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006
-/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950
+/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967

Modified: camel/branches/camel-2.8.x/examples/camel-example-spring-security/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-spring-security/pom.xml?rev=1241048&r1=1241047&r2=1241048&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-spring-security/pom.xml (original)
+++ camel/branches/camel-2.8.x/examples/camel-example-spring-security/pom.xml Mon Feb  6 15:39:45
2012
@@ -81,26 +81,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>resources</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			
-			<!-- 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.8.x/examples/camel-example-spring-security/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-spring-security/src/main/webapp/WEB-INF/web.xml?rev=1241048&r1=1241047&r2=1241048&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/examples/camel-example-spring-security/src/main/webapp/WEB-INF/web.xml
(original)
+++ camel/branches/camel-2.8.x/examples/camel-example-spring-security/src/main/webapp/WEB-INF/web.xml
Mon Feb  6 15:39:45 2012
@@ -22,11 +22,11 @@
 
     <display-name>My Web Application</display-name>
 
-    <!-- location of spring xml files -->
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>/WEB-INF/applicationContext-security.xml</param-value>
-    </context-param>
+  <!-- location of spring xml files -->
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>classpath:camel-context.xml</param-value>
+  </context-param>
 
     <!-- the listener that kick-starts Spring -->
     <listener>
@@ -43,19 +43,11 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-    <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>
-    </servlet>
+  <servlet>
+    <servlet-name>CamelServlet</servlet-name>
+    <servlet-class>org.apache.camel.component.servlet.CamelHttpTransportServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
 
     <servlet-mapping>
         <servlet-name>CamelServlet</servlet-name>



Mime
View raw message