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 2011/03/02 16:43:59 UTC

svn commit: r1076263 - in /camel/trunk: examples/ examples/camel-example-servlet-tomcat/ examples/camel-example-servlet-tomcat/src/ examples/camel-example-servlet-tomcat/src/main/ examples/camel-example-servlet-tomcat/src/main/resources/ examples/camel...

Author: davsclaus
Date: Wed Mar  2 15:43:58 2011
New Revision: 1076263

URL: http://svn.apache.org/viewvc?rev=1076263&view=rev
Log:
CAMEL-3744: Added servlet example for running in Tomcat.

Added:
    camel/trunk/examples/camel-example-servlet-tomcat/   (with props)
    camel/trunk/examples/camel-example-servlet-tomcat/README.txt   (with props)
    camel/trunk/examples/camel-example-servlet-tomcat/pom.xml   (with props)
    camel/trunk/examples/camel-example-servlet-tomcat/src/
    camel/trunk/examples/camel-example-servlet-tomcat/src/main/
    camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/
    camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/
    camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/LICENSE.txt   (with props)
    camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/NOTICE.txt   (with props)
    camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml   (with props)
    camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/log4j.properties   (with props)
    camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/
    camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/WEB-INF/
    camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/WEB-INF/web.xml   (with props)
    camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/index.html   (with props)
Modified:
    camel/trunk/examples/pom.xml
    camel/trunk/parent/pom.xml

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar  2 15:43:58 2011
@@ -0,0 +1,8 @@
+.project
+.checkstyle
+.pmd
+.classpath
+target
+.settings
+eclipse-classes
+*.i??

Added: 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=1076263&view=auto
==============================================================================
--- camel/trunk/examples/camel-example-servlet-tomcat/README.txt (added)
+++ camel/trunk/examples/camel-example-servlet-tomcat/README.txt Wed Mar  2 15:43:58 2011
@@ -0,0 +1,33 @@
+Camel Servlet and Apache Tomcat example
+=======================================
+
+An example which shows how to use the Camel Servlet with Apache Tomcat.
+
+It can be run using Maven.
+
+You will need to package this example first:
+  mvn package
+
+To run the example deploy it in Apache Tomcat by copying the .war to the
+deploy folder of Apache Tomcat.
+
+And then hit this url from a webbrowser which has further instructions
+  http://localhost:8080/camel-example-tomcat-2.7
+
+The servlet is located at (use correct version number)
+  http://localhost:8080/camel-example-tomcat-2.7/camel
+
+For the latest & greatest documentation on how to use this example please see
+  http://camel.apache.org/servlet-tomcat-example.html
+
+If you hit any problems please let us know on the Camel Forums
+  http://camel.apache.org/discussion-forums.html
+
+Please help us make Apache Camel better - we appreciate any feedback you may
+have.  Enjoy!
+
+------------------------
+The Camel riders!
+
+
+

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/README.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: camel/trunk/examples/camel-example-servlet-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-servlet-tomcat/pom.xml?rev=1076263&view=auto
==============================================================================
--- camel/trunk/examples/camel-example-servlet-tomcat/pom.xml (added)
+++ camel/trunk/examples/camel-example-servlet-tomcat/pom.xml Wed Mar  2 15:43:58 2011
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>examples</artifactId>
+        <version>2.7-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>camel-example-servlet-tomcat</artifactId>
+    <name>Camel :: Example :: Servlet Tomcat</name>
+    <description>An example using Camel Servlet with Apache Tomcat</description>
+    <packaging>war</packaging>
+
+    <dependencies>
+
+        <!-- camel -->
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-servlet</artifactId>
+        </dependency>
+
+        <!-- we need spring web -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+
+        <!-- logging -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/LICENSE.txt?rev=1076263&view=auto
==============================================================================
--- camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/LICENSE.txt (added)
+++ camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/LICENSE.txt Wed Mar  2 15:43:58 2011
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/NOTICE.txt?rev=1076263&view=auto
==============================================================================
--- camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/NOTICE.txt (added)
+++ camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/NOTICE.txt Wed Mar  2 15:43:58 2011
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml?rev=1076263&view=auto
==============================================================================
--- camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml (added)
+++ camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml Wed Mar  2 15:43:58 2011
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- START SNIPPET: e1 -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:camel="http://camel.apache.org/schema/spring"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+    <camelContext xmlns="http://camel.apache.org/schema/spring">
+        <route>
+            <!-- incoming requests from the servlet is routed -->
+            <from uri="servlet:///hello"/>
+            <choice>
+                <when>
+                    <!-- is there a header with the key name? -->
+                    <header>name</header>
+                    <!-- yes so return back a message to the user -->
+                    <transform>
+                        <simple>Hello ${header.name} how are you?</simple>
+                    </transform>
+                </when>
+                <otherwise>
+                    <!-- if no name parameter then output a syntax to the user -->
+                    <transform>
+                        <constant>Add a name parameter to uri, eg ?name=foo</constant>
+                    </transform>
+                </otherwise>
+            </choice>
+        </route>
+    </camelContext>
+
+</beans>
+<!-- END SNIPPET: e1 -->
\ No newline at end of file

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/camel-config.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/log4j.properties?rev=1076263&view=auto
==============================================================================
--- camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/log4j.properties (added)
+++ camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/log4j.properties Wed Mar  2 15:43:58 2011
@@ -0,0 +1,30 @@
+## ------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ------------------------------------------------------------------------
+
+# default properties to initialise log4j
+log4j.rootLogger=INFO, console
+
+# settings for specific packages
+#log4j.logger.org.apache.camel.component.http=DEBUG
+#log4j.logger.org.apache.camel.component.servlet=DEBUG
+#log4j.logger.org.apache.camel=DEBUG
+
+# Console appender
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/log4j.properties
------------------------------------------------------------------------------
    svn:executable = *

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/log4j.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/resources/log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/WEB-INF/web.xml?rev=1076263&view=auto
==============================================================================
--- camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/WEB-INF/web.xml (added)
+++ camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/WEB-INF/web.xml Wed Mar  2 15:43:58 2011
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- START SNIPPET: e1 -->
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+	<display-name>My Web Application</display-name>
+
+	<!-- location of spring xml files -->
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+        <param-value>classpath:camel-config.xml</param-value>
+	</context-param>
+
+	<!-- the listener that kick-starts Spring -->
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+
+	<!-- Camel 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>
+
+	<!-- Camel servlet mapping -->
+	<servlet-mapping>
+		<servlet-name>CamelServlet</servlet-name>
+		<url-pattern>/camel/*</url-pattern>
+	</servlet-mapping>
+
+</web-app>
+<!-- END SNIPPET: e1 -->

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/index.html?rev=1076263&view=auto
==============================================================================
--- camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/index.html (added)
+++ camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/index.html Wed Mar  2 15:43:58 2011
@@ -0,0 +1,27 @@
+<html>
+
+<body>
+<h2>Camel Servlet and Apache Tomcat example</h2>
+
+This example shows how to use route messages in Apache Tomcat using servlets with Apache Camel.
+<br/>
+<br/>
+To get started click <a href="camel/hello">this link</a>.
+<br/>
+<br/>
+For the latest & greatest documentation on how to use this example please see:
+<a href="http://camel.apache.org/servlet-tomcat-example.html">servlet tomcat example</a>
+<br/>
+<br/>
+If you hit any problems please let us know on the
+<a href="http://camel.apache.org/discussion-forums.html">Camel Forums</a>
+<br/>
+<br/>
+Please help us make Apache Camel better - we appreciate any feedback you may
+have. Enjoy!
+<br/>
+<br/>
+The Camel riders!
+</body>
+
+</html>
\ No newline at end of file

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/examples/camel-example-servlet-tomcat/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Modified: camel/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/pom.xml?rev=1076263&r1=1076262&r2=1076263&view=diff
==============================================================================
--- camel/trunk/examples/pom.xml (original)
+++ camel/trunk/examples/pom.xml Wed Mar  2 15:43:58 2011
@@ -54,6 +54,7 @@
     <module>camel-example-reportincident</module>
     <module>camel-example-reportincident-ws-security-osgi</module>
     <module>camel-example-route-throttling</module>
+    <module>camel-example-servlet-tomcat</module>
     <module>camel-example-simplejirabot</module>
     <module>camel-example-spring</module>
     <module>camel-example-spring-javaconfig</module>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1076263&r1=1076262&r2=1076263&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Mar  2 15:43:58 2011
@@ -797,6 +797,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-example-servlet-tomcat</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-example-simplejirabot-javadsl</artifactId>
         <version>${project.version}</version>
       </dependency>