You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/01/04 10:15:44 UTC

svn commit: r1428760 - in /camel/trunk: examples/ examples/camel-example-servlet-tomcat-no-spring/ examples/camel-example-servlet-tomcat/ examples/camel-example-webapp-no-spring/ parent/

Author: davsclaus
Date: Fri Jan  4 09:15:44 2013
New Revision: 1428760

URL: http://svn.apache.org/viewvc?rev=1428760&view=rev
Log:
CAMEL-5906: Added example for webapp without Spring

Added:
    camel/trunk/examples/camel-example-servlet-tomcat-no-spring/
      - copied from r1428737, camel/trunk/examples/camel-example-webapp-no-spring/
Removed:
    camel/trunk/examples/camel-example-webapp-no-spring/
Modified:
    camel/trunk/examples/camel-example-servlet-tomcat-no-spring/README.txt
    camel/trunk/examples/camel-example-servlet-tomcat-no-spring/pom.xml
    camel/trunk/examples/camel-example-servlet-tomcat/README.txt
    camel/trunk/examples/pom.xml
    camel/trunk/parent/pom.xml

Modified: camel/trunk/examples/camel-example-servlet-tomcat-no-spring/README.txt
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-servlet-tomcat-no-spring/README.txt?rev=1428760&r1=1428737&r2=1428760&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-servlet-tomcat-no-spring/README.txt (original)
+++ camel/trunk/examples/camel-example-servlet-tomcat-no-spring/README.txt Fri Jan  4 09:15:44 2013
@@ -1,8 +1,8 @@
-Camel Web application without Spring
-====================================
+Camel Servlet and Apache Tomcat without Spring example
+======================================================
 
-An example which shows how to use Camel as a light-weight
-web application without Spring Framework.
+An example which shows how to use the Camel Servlet with Apache Tomcat,
+without using the Spring Framework.
 
 You will need to package this example first:
   mvn package
@@ -12,13 +12,13 @@ deploy folder of Apache Tomcat.
 
 And then hit this url from a webbrowser which has further
 instructions (use correct version number)
-  http://localhost:8080/camel-example-webapp-no-spring-2.11
+  http://localhost:8080/camel-example-servlet-tomcat-no-spring-2.11.0
 
 The servlet is located at (use correct version number)
-  http://localhost:8080/camel-example-webapp-no-spring-2.11/camel
+  http://localhost:8080/camel-example-servlet-tomcat-no-spring-2.11.0/camel
 
 This example is documented at
-  http://camel.apache.org/servlet-tomcat-example.html
+  http://camel.apache.org/servlet-tomcat-example-no-spring.html
 
 If you hit any problems please let us know on the Camel Forums
   http://camel.apache.org/discussion-forums.html
@@ -27,4 +27,4 @@ Please help us make Apache Camel better 
 have.  Enjoy!
 
 ------------------------
-The Camel riders!
+The Camel riders!
\ No newline at end of file

Modified: camel/trunk/examples/camel-example-servlet-tomcat-no-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-servlet-tomcat-no-spring/pom.xml?rev=1428760&r1=1428737&r2=1428760&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-servlet-tomcat-no-spring/pom.xml (original)
+++ camel/trunk/examples/camel-example-servlet-tomcat-no-spring/pom.xml Fri Jan  4 09:15:44 2013
@@ -25,9 +25,9 @@
         <version>2.11-SNAPSHOT</version>
     </parent>
 
-    <artifactId>camel-example-webapp-no-spring</artifactId>
-    <name>Camel :: Example :: Webapp without Spring</name>
-    <description>A Camel web application without using Spring</description>
+    <artifactId>camel-example-servlet-tomcat-no-spring</artifactId>
+    <name>Camel :: Example :: Servlet Tomcat without Spring</name>
+    <description>An example using Camel Servlet with Apache Tomcat without using Spring</description>
     <packaging>war</packaging>
 
     <dependencies>

Modified: camel/trunk/examples/camel-example-servlet-tomcat/README.txt
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-servlet-tomcat/README.txt?rev=1428760&r1=1428759&r2=1428760&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-servlet-tomcat/README.txt (original)
+++ camel/trunk/examples/camel-example-servlet-tomcat/README.txt Fri Jan  4 09:15:44 2013
@@ -11,10 +11,10 @@ deploy folder of Apache Tomcat.
 
 And then hit this url from a webbrowser which has further
 instructions (use correct version number)
-  http://localhost:8080/camel-example-tomcat-2.7
+  http://localhost:8080/camel-example-servlet-tomcat-2.7.0
 
 The servlet is located at (use correct version number)
-  http://localhost:8080/camel-example-tomcat-2.7/camel
+  http://localhost:8080/camel-example-servlet-tomcat-2.7.0/camel
 
 This example is documented at
   http://camel.apache.org/servlet-tomcat-example.html

Modified: camel/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/pom.xml?rev=1428760&r1=1428759&r2=1428760&view=diff
==============================================================================
--- camel/trunk/examples/pom.xml (original)
+++ camel/trunk/examples/pom.xml Fri Jan  4 09:15:44 2013
@@ -59,6 +59,7 @@
     <module>camel-example-reportincident-wssecurity</module>
     <module>camel-example-route-throttling</module>
     <module>camel-example-servlet-tomcat</module>
+    <module>camel-example-servlet-tomcat-no-spring</module>
     <module>camel-example-simplejirabot</module>
     <module>camel-example-spring</module>
     <module>camel-example-spring-javaconfig</module>
@@ -69,7 +70,6 @@
     <module>camel-example-ssh</module>
     <module>camel-example-tracer</module>
     <module>camel-example-twitter-websocket</module>
-    <module>camel-example-webapp-no-spring</module>
   </modules>
  
   <properties>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1428760&r1=1428759&r2=1428760&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Jan  4 09:15:44 2013
@@ -1213,6 +1213,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-example-servlet-tomcat-no-spring</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-example-simplejirabot-javadsl</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -1236,11 +1241,6 @@
         <artifactId>camel-example-tracer</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-example-webapp-no-spring</artifactId>
-        <version>${project.version}</version>
-      </dependency>
 
       <!-- camel misc -->
       <dependency>