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 2015/09/29 07:51:39 UTC
[1/2] camel git commit: Remove no longer needed example
Repository: camel
Updated Branches:
refs/heads/master 1b5546697 -> 26eceeec1
Remove no longer needed example
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/514bbccb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/514bbccb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/514bbccb
Branch: refs/heads/master
Commit: 514bbccbc3109235fa243a69028d4616cc2f6c46
Parents: 1b55466
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Sep 29 07:43:19 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Sep 29 07:43:19 2015 +0200
----------------------------------------------------------------------
.../README.txt | 39 +---
.../camel-example-servlet-rest-tomcat/pom.xml | 226 -------------------
.../org/apache/camel/example/rest/User.java | 53 -----
.../camel/example/rest/UserRouteBuilder.java | 63 ------
.../apache/camel/example/rest/UserService.java | 76 -------
.../src/main/resources/META-INF/LICENSE.txt | 203 -----------------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../src/main/resources/camel-config-xml.xml | 72 ------
.../src/main/resources/camel-config.xml | 39 ----
.../src/main/resources/log4j.properties | 30 ---
.../src/main/webapp/META-INF/LICENSE.txt | 203 -----------------
.../src/main/webapp/META-INF/NOTICE.txt | 11 -
.../src/main/webapp/WEB-INF/web.xml | 113 ----------
.../src/main/webapp/home.html | 102 ---------
examples/pom.xml | 1 -
15 files changed, 1 insertion(+), 1241 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/README.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/README.txt b/examples/camel-example-servlet-rest-tomcat/README.txt
index 48b7fdd..0ea73bc 100644
--- a/examples/camel-example-servlet-rest-tomcat/README.txt
+++ b/examples/camel-example-servlet-rest-tomcat/README.txt
@@ -1,38 +1 @@
-Camel Servlet REST and Apache Tomcat example
-=======================================
-
-This example shows how to use Servlet REST to define REST endpoints in Camel routes using the Rest DSL
-
-This example is implemented in both the Java and XML DSLs. By default the Java DSL is in use.
-You can change this in the src/main/webapps/WEB-INF/web.xml file
-
-For Java DSL the routes are defined in Java code, in the org.apache.camel.example.rest.UserRouteBuilder class.
-And for XML DSL the routes are define in XML code, in the src/main/resources/camel-config-xml.xml file.
-
-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 web browser which has further instructions
- http://localhost:8080/camel-example-servlet-rest-tomcat
-
-Included in this example is an api browser using Swagger. You can see the API from this url:
- http://localhost:8080/camel-example-servlet-rest-tomcat/api-docs
-
-You can also try the example from Maven using
- mvn jetty:run
-
-... and use the following url
-
- http://localhost:8080/
-
-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!
+This example has been replaced with camel-example-swagger-java
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/pom.xml b/examples/camel-example-servlet-rest-tomcat/pom.xml
deleted file mode 100755
index aea9ab9..0000000
--- a/examples/camel-example-servlet-rest-tomcat/pom.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?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.16-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-example-servlet-rest-tomcat</artifactId>
- <name>Camel :: Example :: Servlet REST Tomcat</name>
- <description>An example using Servlet REST with Apache Tomcat</description>
- <packaging>war</packaging>
-
- <properties>
- <swagger-ui.version>2.0.24</swagger-ui.version>
- <scala.version>2.11.7</scala.version>
- <logback-version>1.1.3</logback-version>
- <swagger.url>https://github.com/swagger-api/swagger-ui/archive/v${swagger-ui.version}</swagger.url>
- <destDir>target/swagger-ui</destDir>
- </properties>
-
- <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>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-metrics</artifactId>
- </dependency>
-
- <!-- swagger api -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-swagger</artifactId>
- </dependency>
- <!-- Add scala deps to resolve issue https://issues.apache.org/jira/browse/CAMEL-9057 -->
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- <version>${scala.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-reflect</artifactId>
- <version>${scala.version}</version>
- </dependency>
-
- <!-- use for json binding -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jackson</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>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback-version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>${logback-version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <!-- we do not want version in the WAR name -->
- <finalName>${project.artifactId}</finalName>
-
- <plugins>
- <!-- Step 1. - Download Swagger UI project from GitHub -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>download-single</goal>
- </goals>
- <configuration>
- <url>${swagger.url}</url>
- <fromFile>v${swagger-ui.version}.tar.gz</fromFile>
- <toFile>${project.build.directory}/swagger-ui-${swagger-ui.version}.tar.gz</toFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- Step 2. - Decompress content and move it to target/swagger-ui folder -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <echo message="Decompress archive" />
- <gunzip src="${project.build.directory}/swagger-ui-${swagger-ui.version}.tar.gz" />
- <untar src="${project.build.directory}/swagger-ui-${swagger-ui.version}.tar" dest="${project.build.directory}" />
- <echo message="moving resources" />
- <move todir="${destDir}" overwrite="yes">
- <fileset dir="${project.build.directory}/swagger-ui-${swagger-ui.version}/dist" />
- </move>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- Step 3. Copy Web Resources to target/classes but also to target/swagger-ui -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/classes/</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/webapp</directory>
- <filtering>false</filtering>
- </resource>
- <!-- Copy swagger-ui resources to classes directory to be able to use it with mvn jetty:run -->
- <resource>
- <directory>${destDir}</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- Step 4. Add Swagger-ui Resources to the WAR -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <directory>target/swagger-ui/</directory>
- <includes>
- <include>**/*.*</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
- </plugin>
-
- <!-- allows running this example with mvn:jetty-run -->
- <plugin>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty9-version}</version>
- <configuration>
- <webAppSourceDirectory>target/classes</webAppSourceDirectory>
- <webApp>
- <contextPath>/${project.artifactId}</contextPath>
- </webApp>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/User.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/User.java b/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/User.java
deleted file mode 100644
index ee63727..0000000
--- a/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/User.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * 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.
- */
-package org.apache.camel.example.rest;
-
-import com.wordnik.swagger.annotations.ApiModel;
-import com.wordnik.swagger.annotations.ApiModelProperty;
-
-@ApiModel(description = "Represents an user of the system")
-public class User {
-
- private int id;
- private String name;
-
- public User() {
- }
-
- public User(int id, String name) {
- this.id = id;
- this.name = name;
- }
-
- @ApiModelProperty(value = "The id of the user", required = true)
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- @ApiModelProperty(value = "The name of the user", required = true)
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/UserRouteBuilder.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/UserRouteBuilder.java b/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/UserRouteBuilder.java
deleted file mode 100644
index 1412501..0000000
--- a/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/UserRouteBuilder.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * 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.
- */
-package org.apache.camel.example.rest;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.model.rest.RestBindingMode;
-
-import static org.apache.camel.model.rest.RestParamType.body;
-import static org.apache.camel.model.rest.RestParamType.path;
-
-/**
- * Define REST services using the Camel REST DSL
- */
-public class UserRouteBuilder extends RouteBuilder {
-
- @Override
- public void configure() throws Exception {
-
- // configure we want to use servlet as the component for the rest DSL
- // and we enable json binding mode
- restConfiguration().component("servlet").bindingMode(RestBindingMode.json)
- // and output using pretty print
- .dataFormatProperty("prettyPrint", "true")
- // setup context path and port number that Apache Tomcat will deploy
- // this application with, as we use the servlet component, then we
- // need to aid Camel to tell it these details so Camel knows the url
- // to the REST services.
- // Notice: This is optional, but needed if the RestRegistry should
- // enlist accurate information. You can access the RestRegistry
- // from JMX at runtime
- .contextPath("camel-example-servlet-rest-tomcat/rest").port(8080);
-
- // this user REST service is json only
- rest("/user").description("User rest service")
- .consumes("application/json").produces("application/json")
-
- .get("/{id}").description("Find user by id").outType(User.class)
- .param().name("id").type(path).description("The id of the user to get").dataType("int").endParam()
- .to("bean:userService?method=getUser(${header.id})")
-
- .put().description("Updates or create a user").type(User.class)
- .param().name("body").type(body).description("The user to update or create").endParam()
- .to("bean:userService?method=updateUser")
-
- .get("/findAll").description("Find all users").outTypeList(User.class)
- .to("bean:userService?method=listUsers");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/UserService.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/UserService.java b/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/UserService.java
deleted file mode 100644
index a94942e..0000000
--- a/examples/camel-example-servlet-rest-tomcat/src/main/java/org/apache/camel/example/rest/UserService.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 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.
- */
-package org.apache.camel.example.rest;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Random;
-import java.util.TreeMap;
-
-/**
- * A {@link org.apache.camel.example.rest.User} service which we rest enable from the {@link org.apache.camel.example.rest.UserRouteBuilder}.
- */
-public class UserService {
-
- // use a tree map so they become sorted
- private final Map<String, User> users = new TreeMap<String, User>();
-
- private Random ran = new Random();
-
- public UserService() {
- users.put("123", new User(123, "John Doe"));
- users.put("456", new User(456, "Donald Duck"));
- users.put("789", new User(789, "Slow Turtle"));
- }
-
- /**
- * Gets a user by the given id
- *
- * @param id the id of the user
- * @return the user, or <tt>null</tt> if no user exists
- */
- public User getUser(String id) {
- if ("789".equals(id)) {
- // simulate some cpu processing time when returning the slow turtle
- int delay = 500 + ran.nextInt(1500);
- try {
- Thread.sleep(delay);
- } catch (Exception e) {
- // ignore
- }
- }
- return users.get(id);
- }
-
- /**
- * List all users
- *
- * @return the list of all users
- */
- public Collection<User> listUsers() {
- return users.values();
- }
-
- /**
- * Updates or creates the given user
- *
- * @param user the user
- */
- public void updateUser(User user) {
- users.put("" + user.getId(), user);
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-servlet-rest-tomcat/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/examples/camel-example-servlet-rest-tomcat/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- 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.
-
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-servlet-rest-tomcat/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/examples/camel-example-servlet-rest-tomcat/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == 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.
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/src/main/resources/camel-config-xml.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/resources/camel-config-xml.xml b/examples/camel-example-servlet-rest-tomcat/src/main/resources/camel-config-xml.xml
deleted file mode 100755
index cd6fdf0..0000000
--- a/examples/camel-example-servlet-rest-tomcat/src/main/resources/camel-config-xml.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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.
--->
-
-<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">
-
- <!-- use camel-metrics route policy to gather metrics for all routes -->
- <bean id="metricsRoutePolicyFactory" class="org.apache.camel.component.metrics.routepolicy.MetricsRoutePolicyFactory"/>
-
- <!-- a bean for user services -->
- <bean id="userService" class="org.apache.camel.example.rest.UserService"/>
-
- <camelContext id="myCamel" xmlns="http://camel.apache.org/schema/spring">
-
- <!-- configure rest to use the camel-servlet component, and use json binding mode -->
- <!-- and tell to output json in pretty print mode -->
- <!-- setup context path and port number that Apache Tomcat will deploy this application with,
- as we use the servlet component, then we need to aid Camel to tell it these details so Camel
- knows the url to the REST services.
- Notice: This is optional, but needed if the RestRegistry should enlist accurate information.
- You can access the RestRegistry from JMX at runtime -->
- <restConfiguration component="servlet" bindingMode="json" contextPath="camel-example-servlet-rest-tomcat/rest" port="8080">
- <dataFormatProperty key="prettyPrint" value="true"/>
- </restConfiguration>
-
- <!-- defines the rest services using the context-path /user -->
- <rest path="/user" consumes="application/json" produces="application/json">
- <description>User rest service</description>
-
- <!-- this is a rest GET to view an user by the given id -->
- <get uri="/{id}" outType="org.apache.camel.example.rest.User">
- <description>Find user by id</description>
- <param name="id" type="path" description="The id of the user to get" dataType="int"/>
- <to uri="bean:userService?method=getUser(${header.id})"/>
- </get>
-
- <!-- this is a rest PUT to create/update an user -->
- <put type="org.apache.camel.example.rest.User">
- <description>Updates or create a user</description>
- <param name="body" type="body" description="The user to update or create"/>
- <to uri="bean:userService?method=updateUser"/>
- </put>
-
- <!-- this is a rest GET to find all users -->
- <get uri="/findAll" outType="org.apache.camel.example.rest.User[]">
- <description>Find all users</description>
- <to uri="bean:userService?method=listUsers"/>
- </get>
- </rest>
-
- </camelContext>
-
-</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/src/main/resources/camel-config.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/resources/camel-config.xml b/examples/camel-example-servlet-rest-tomcat/src/main/resources/camel-config.xml
deleted file mode 100755
index 6c58d71..0000000
--- a/examples/camel-example-servlet-rest-tomcat/src/main/resources/camel-config.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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.
--->
-
-<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">
-
- <!-- use camel-metrics route policy to gather metrics for all routes -->
- <bean id="metricsRoutePolicyFactory" class="org.apache.camel.component.metrics.routepolicy.MetricsRoutePolicyFactory"/>
-
- <!-- a rest service which uses binding to/from pojos -->
- <bean id="userRoutes" class="org.apache.camel.example.rest.UserRouteBuilder"/>
-
- <!-- a bean for user services -->
- <bean id="userService" class="org.apache.camel.example.rest.UserService"/>
-
- <camelContext id="myCamel" xmlns="http://camel.apache.org/schema/spring">
- <routeBuilder ref="userRoutes"/>
- </camelContext>
-
-</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/resources/log4j.properties b/examples/camel-example-servlet-rest-tomcat/src/main/resources/log4j.properties
deleted file mode 100755
index ed9a8f1..0000000
--- a/examples/camel-example-servlet-rest-tomcat/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-## ------------------------------------------------------------------------
-## 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.com.wordnik.swagger=DEBUG
-#log4j.logger.org.apache.camel.component.servlet=DEBUG
-#log4j.logger.org.apache.camel.component.swagger=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
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/src/main/webapp/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/webapp/META-INF/LICENSE.txt b/examples/camel-example-servlet-rest-tomcat/src/main/webapp/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/examples/camel-example-servlet-rest-tomcat/src/main/webapp/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- 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.
-
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/src/main/webapp/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/webapp/META-INF/NOTICE.txt b/examples/camel-example-servlet-rest-tomcat/src/main/webapp/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/examples/camel-example-servlet-rest-tomcat/src/main/webapp/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == 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.
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/webapp/WEB-INF/web.xml b/examples/camel-example-servlet-rest-tomcat/src/main/webapp/WEB-INF/web.xml
deleted file mode 100755
index 3cd24b4..0000000
--- a/examples/camel-example-servlet-rest-tomcat/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?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.
--->
-
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
- <display-name>My Camel Rest Application</display-name>
-
- <!-- location of Camel Spring xml files -->
- <context-param>
- <param-name>contextConfigLocation</param-name>
-
- <!-- to use Java DSL -->
- <param-value>classpath:camel-config.xml</param-value>
-
- <!-- to use XML DSL, then enable me, and disable Java DSL above
- <param-value>classpath:camel-config-xml.xml</param-value>
- -->
- </context-param>
-
- <!-- the listener that kick-starts Spring -->
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
- <!-- to setup Camel Servlet -->
- <servlet>
- <display-name>Camel Http Transport Servlet</display-name>
- <servlet-name>CamelServlet</servlet-name>
- <servlet-class>org.apache.camel.component.servlet.CamelHttpTransportServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- START SNIPPET: e1 -->
- <!-- to setup Camel Swagger api servlet -->
- <servlet>
- <servlet-name>ApiDeclarationServlet</servlet-name>
- <servlet-class>org.apache.camel.component.swagger.DefaultCamelSwaggerServlet</servlet-class>
- <init-param>
- <!-- we specify the base.path using relative notation, that means the actual path will be calculated at runtime as
- http://server:port/contextpath/rest -->
- <param-name>base.path</param-name>
- <param-value>rest</param-value>
- </init-param>
- <init-param>
- <!-- we specify the api.path using relative notation, that means the actual path will be calculated at runtime as
- http://server:port/contextpath/api-docs -->
- <param-name>api.path</param-name>
- <param-value>api-docs</param-value>
- </init-param>
- <init-param>
- <param-name>api.version</param-name>
- <param-value>1.2.3</param-value>
- </init-param>
- <init-param>
- <param-name>api.title</param-name>
- <param-value>User Services</param-value>
- </init-param>
- <init-param>
- <param-name>api.description</param-name>
- <param-value>Camel Rest Example with Swagger that provides an User REST service</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
-
- <!-- swagger api declaration -->
- <servlet-mapping>
- <servlet-name>ApiDeclarationServlet</servlet-name>
- <url-pattern>/api-docs/*</url-pattern>
- </servlet-mapping>
- <!-- END SNIPPET: e1 -->
-
- <!-- define that url path for the Camel Servlet to use -->
- <servlet-mapping>
- <servlet-name>CamelServlet</servlet-name>
- <url-pattern>/rest/*</url-pattern>
- </servlet-mapping>
-
- <!-- START SNIPPET: e2 -->
- <!-- enable CORS filter so people can use swagger ui to browse and test the apis -->
- <filter>
- <filter-name>RestSwaggerCorsFilter</filter-name>
- <filter-class>org.apache.camel.component.swagger.RestSwaggerCorsFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>RestSwaggerCorsFilter</filter-name>
- <url-pattern>/api-docs/*</url-pattern>
- <url-pattern>/rest/*</url-pattern>
- </filter-mapping>
- <!-- END SNIPPET: e2 -->
-
- <welcome-file-list>
- <welcome-file>home.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/camel-example-servlet-rest-tomcat/src/main/webapp/home.html
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/webapp/home.html b/examples/camel-example-servlet-rest-tomcat/src/main/webapp/home.html
deleted file mode 100644
index b9c4e2a..0000000
--- a/examples/camel-example-servlet-rest-tomcat/src/main/webapp/home.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!--
- 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.
--->
-<html>
-<head>
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <title>Apache Camel Servlet REST and Apache Tomcat example</title>
- <link rel="stylesheet" href="css/foundation.min.css"/>
- <script src="js/vendor/modernizr.js"></script>
-</head>
-
-<body>
-<div class="row">
- <div class="large-12 columns">
- <h2>Apache Camel Example using Servlet REST & Web Container</h2>
- </div>
-</div>
-
-<div class="row">
- <div class="large-12 columns">
- This example shows how to use Servlet REST to define REST endpoints in Camel routes using the Rest DSL
-
- <br/>
-
- This example is implemented in both the Java and XML DSLs. By default the Java DSL is in use.
- You can change this in the src/main/webapps/WEB-INF/web.xml file
-
- <br/>
- For Java DSL the routes are defined in Java code, in the <tt>org.apache.camel.example.rest.UserRouteBuilder</tt>
- class.
- And for XML DSL the routes are define in XML code, in the <tt>src/main/resources/camel-config-xml.xml</tt> file.
-
- <p/>
- There is a <i>user</i> REST service that supports the following operations
- <ul>
- <li>GET /user/{id} - to view a user with the given id</li>
- <li>GET /user/final - to view all users</li>
- <li>PUT /user - to update/create an user</li>
- </ul>
-
- The view operations are HTTP GET, and update is using HTTP PUT.
-
- From a web browser you can access the first two services using the following links
-
- <ul>
- <li><a href="rest/user/123">user/123</a> - to view the user with id 123</li>
- <li><a href="rest/user/findAll">user/findAll</a> - to list all users</li>
- </ul>
-
- From the command shell you can use curl to access the service as shown below:
-<pre>
- curl -X GET -H "Accept: application/json" http://localhost:8080/camel-example-servlet-rest-tomcat/rest/user/123
- curl -X GET -H "Accept: application/json" http://localhost:8080/camel-example-servlet-rest-tomcat/rest/user/findAll
- curl -X PUT -d "{ \"id\": 666, \"name\": \"The devil\"}" -H "Accept: application/json" http://localhost:8080/camel-example-servlet-rest-tomcat/rest/user
-</pre>
-
- Notice when trying to get user with id 789 then there is a built-in delay of 0.5-2 seconds, to simulate some
- slowness in the service.
-
- <p/>
- This example offers an API browser using Swagger which is accessible from the following link
- <ul>
- <li><a href="api-docs">api-docs</a> - list all CamelContexts in the JVM that may have REST services</li>
- <li><a href="api-docs/myCamel">api-docs/myCamel</a> - myCamel - overview of the apis from the REST services</li>
- <li><a href="api-docs/myCamel/user">api-docs/myCamel/user</a> - myCamel - api of the user REST service</li>
- </ul>
-
- <p/>
- To use the swagger ui, follow this link. Replace the URL value with this one to access the REST local resources http://localhost:8080/camel-example-servlet-rest-tomcat/api-docs/myCamel
- <ul>
- <li><a href="index.html">swagger</a> - swagger ui page</li>
- </ul>
-
- <p/>
- 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!
- </div>
-</div>
-</body>
-
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/514bbccb/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index b684890..f2859eb 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -64,7 +64,6 @@
<module>camel-example-restlet-jdbc</module>
<module>camel-example-route-throttling</module>
<module>camel-example-servlet-rest-blueprint</module>
- <module>camel-example-servlet-rest-tomcat</module>
<module>camel-example-servlet-tomcat</module>
<module>camel-example-servlet-tomcat-blueprintweb</module>
<module>camel-example-servlet-tomcat-no-spring</module>
[2/2] camel git commit: Remove no longer needed example
Posted by da...@apache.org.
Remove no longer needed example
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/26eceeec
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/26eceeec
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/26eceeec
Branch: refs/heads/master
Commit: 26eceeec104cbb015bfddd16ea59896a6160ea3b
Parents: 514bbcc
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Sep 29 07:45:29 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Sep 29 07:45:29 2015 +0200
----------------------------------------------------------------------
.../camel-example-swagger-java/src/main/webapp/home.html | 8 ++++----
parent/pom.xml | 5 -----
2 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/26eceeec/examples/camel-example-swagger-java/src/main/webapp/home.html
----------------------------------------------------------------------
diff --git a/examples/camel-example-swagger-java/src/main/webapp/home.html b/examples/camel-example-swagger-java/src/main/webapp/home.html
index 71e50c8..dbd3700 100644
--- a/examples/camel-example-swagger-java/src/main/webapp/home.html
+++ b/examples/camel-example-swagger-java/src/main/webapp/home.html
@@ -61,9 +61,9 @@
From the command shell you can use curl to access the service as shown below:
<pre>
- curl -X GET -H "Accept: application/json" http://localhost:8080/camel-example-servlet-rest-tomcat/rest/user/123
- curl -X GET -H "Accept: application/json" http://localhost:8080/camel-example-servlet-rest-tomcat/rest/user/findAll
- curl -X PUT -d "{ \"id\": 666, \"name\": \"The devil\"}" -H "Accept: application/json" http://localhost:8080/camel-example-servlet-rest-tomcat/rest/user
+ curl -X GET -H "Accept: application/json" http://localhost:8080/camel-example-swagger-java/rest/user/123
+ curl -X GET -H "Accept: application/json" http://localhost:8080/camel-example-swagger-java/rest/user/findAll
+ curl -X PUT -d "{ \"id\": 666, \"name\": \"The devil\"}" -H "Accept: application/json" http://localhost:8080/camel-example-swagger-java/rest/user
</pre>
Notice when trying to get user with id 789 then there is a built-in delay of 0.5-2 seconds, to simulate some
@@ -78,7 +78,7 @@
</ul>
<p/>
- To use the swagger ui, follow this link. Replace the URL value with this one to access the REST local resources http://localhost:8080/camel-example-servlet-rest-tomcat/api-docs/myCamel
+ To use the swagger ui, follow this link. Replace the URL value with this one to access the REST local resources http://localhost:8080/camel-example-swagger-java/api-docs/myCamel
<ul>
<li><a href="index.html">swagger</a> - swagger ui page</li>
</ul>
http://git-wip-us.apache.org/repos/asf/camel/blob/26eceeec/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f07cdcf..4e9a6d5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1796,11 +1796,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-example-servlet-rest-tomcat</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-example-servlet-tomcat</artifactId>
<version>${project.version}</version>
</dependency>