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 2014/08/13 10:31:54 UTC
[4/4] git commit: Polished
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0d842d12
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0d842d12
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0d842d12
Branch: refs/heads/master
Commit: 0d842d123b637b15fddbb124219611eef53caf49
Parents: f070a83
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Aug 13 10:25:44 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Aug 13 10:31:39 2014 +0200
----------------------------------------------------------------------
.../camel-example-servlet-rest-tomcat/pom.xml | 24 ++++----------------
.../camel/example/rest/UserRouteBuilder.java | 5 ----
2 files changed, 4 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0d842d12/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
index 5804e59..3f68013 100755
--- a/examples/camel-example-servlet-rest-tomcat/pom.xml
+++ b/examples/camel-example-servlet-rest-tomcat/pom.xml
@@ -46,10 +46,11 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-servlet</artifactId>
</dependency>
+
+ <!-- swagger api -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-swagger</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- use for json binding -->
@@ -64,23 +65,6 @@
<artifactId>spring-web</artifactId>
</dependency>
- <!-- swagger -->
- <dependency>
- <groupId>com.wordnik</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>1.3.7</version>
- </dependency>
- <dependency>
- <groupId>com.wordnik</groupId>
- <artifactId>swagger-jaxrs_2.10</artifactId>
- <version>1.3.7</version>
- </dependency>
- <dependency>
- <groupId>com.wordnik</groupId>
- <artifactId>swagger-servlet_2.10</artifactId>
- <version>1.3.7</version>
- </dependency>
-
<!-- logging -->
<dependency>
<groupId>log4j</groupId>
@@ -94,19 +78,19 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.13</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.0.13</version>
- <scope>compile</scope>
</dependency>
</dependencies>
<build>
+ <!-- we do not want version in the WAR name -->
<finalName>${project.artifactId}</finalName>
+ <!-- allows running this example with mvn:jetty-run -->
<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/0d842d12/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
index 0bcdf36..0f6fbd5 100644
--- 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
@@ -16,13 +16,8 @@
*/
package org.apache.camel.example.rest;
-import com.wordnik.swagger.config.SwaggerConfig;
-import com.wordnik.swagger.model.ApiListing;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.swagger.RestSwaggerReader;
import org.apache.camel.model.rest.RestBindingMode;
-import org.apache.camel.model.rest.RestDefinition;
-import scala.Option;
/**
* Define REST services using the Camel REST DSL