Skip to content

Commit

Permalink
CAMEL-8865 Removal of version from url in web based examples
Browse files Browse the repository at this point in the history
  • Loading branch information
sabre1041 authored and davsclaus committed Jun 14, 2015
1 parent e47aa24 commit 48c6c4c
Show file tree
Hide file tree
Showing 12 changed files with 47 additions and 19 deletions.
3 changes: 3 additions & 0 deletions examples/camel-example-servlet-rest-tomcat/pom.xml
Expand Up @@ -198,6 +198,9 @@
<version>${jetty9-version}</version>
<configuration>
<webAppSourceDirectory>target/classes</webAppSourceDirectory>
<webApp>
<contextPath>/${project.artifactId}</contextPath>
</webApp>
</configuration>
</plugin>
</plugins>
Expand Down
Expand Up @@ -79,8 +79,7 @@ <h2>Apache Camel Example using Servlet REST & Web Container</h2>
</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/api-docs or (http://localhost:8080/camel-example-servlet-rest-tomcat/api-docs
when deployed in Apache Tomcat)
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
<ul>
<li><a href="index.html">swagger</a> - swagger ui page</li>
</ul>
Expand Down
8 changes: 4 additions & 4 deletions examples/camel-example-servlet-tomcat-no-spring/README.txt
Expand Up @@ -11,11 +11,11 @@ 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 (use correct version number)
http://localhost:8080/camel-example-servlet-tomcat-no-spring-{version}
instructions
http://localhost:8080/camel-example-servlet-tomcat-no-spring

The servlet is located at (use correct version number)
http://localhost:8080/camel-example-servlet-tomcat-no-spring-{version}/camel
The servlet is located at
http://localhost:8080/camel-example-servlet-tomcat-no-spring/camel

This example is documented at
http://camel.apache.org/servlet-tomcat-example-no-spring.html
Expand Down
7 changes: 6 additions & 1 deletion examples/camel-example-servlet-tomcat-no-spring/pom.xml
Expand Up @@ -62,11 +62,16 @@

<build>
<plugins>
<!-- allows running this example with mvn:jetty-run -->
<!-- allows running this example with mvn jetty:run -->
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty9-version}</version>
<configuration>
<webApp>
<contextPath>/${project.artifactId}</contextPath>
</webApp>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Expand Up @@ -21,8 +21,8 @@

public class HelloBean {

public String sayHello(@Header("name") String name, @Simple("${sysenv.HOSTNAME}") String host) {
return "Hello " + name + ", how are you? You are from host: " + host;
public String sayHello(@Header("name") String name, @Simple("${sys.user.country}") String country) {
return "Hello " + name + ", how are you? You are from: " + country;
}

}
8 changes: 4 additions & 4 deletions examples/camel-example-servlet-tomcat/README.txt
Expand Up @@ -10,11 +10,11 @@ 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 (use correct version number)
http://localhost:8080/camel-example-servlet-tomcat-{version}
instructions
http://localhost:8080/camel-example-servlet-tomcat

The servlet is located at (use correct version number)
http://localhost:8080/camel-example-servlet-tomcat-{version}/camel/hello
The servlet is located at
http://localhost:8080/camel-example-servlet-tomcat/camel/hello

This example is documented at
http://camel.apache.org/servlet-tomcat-example.html
Expand Down
12 changes: 10 additions & 2 deletions examples/camel-example-servlet-tomcat/pom.xml
Expand Up @@ -65,12 +65,20 @@
</dependencies>

<build>

<finalName>${project.artifactId}</finalName>

<plugins>
<!-- allows running this example with mvn:jetty-run -->
<!-- allows running this example with mvn jetty:run -->
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty9-version}</version>
<version>${jetty9-version}</version>
<configuration>
<webApp>
<contextPath>/${project.artifactId}</contextPath>
</webApp>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
Expand Up @@ -35,7 +35,7 @@
<header>name</header>
<!-- yes so return back a message to the user -->
<transform>
<simple>Hello ${header.name} how are you? You are from host: ${sysenv.HOSTNAME}</simple>
<simple>Hello ${header.name} how are you? You are from: ${sys.user.country}</simple>
</transform>
</when>
<otherwise>
Expand Down
4 changes: 2 additions & 2 deletions examples/camel-example-spark-rest-tomcat/README.txt
Expand Up @@ -12,8 +12,8 @@ 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 (use correct version number)
http://localhost:8080/camel-example-spark-rest-tomcat-{version}
instructions
http://localhost:8080/camel-example-spark-rest-tomcat

You can also try the example from Maven using
mvn jetty:run
Expand Down
9 changes: 9 additions & 0 deletions examples/camel-example-spark-rest-tomcat/pom.xml
Expand Up @@ -78,11 +78,20 @@
</dependencies>

<build>
<!-- we do not want version in the WAR name -->
<finalName>${project.artifactId}</finalName>

<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty9-version}</version>
<configuration>
<webApp>
<contextPath>/${project.artifactId}</contextPath>
</webApp>
</configuration>

</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion examples/camel-example-spring-boot/README.txt
Expand Up @@ -22,7 +22,7 @@ To run the example type

You can also execute the fat WAR directly:

java -jar target/camel-example-spring-boot-2.x-SNAPSHOT.war
java -jar target/camel-example-spring-boot.war

You will see the message printed to the console every second.

Expand Down
4 changes: 4 additions & 0 deletions examples/camel-example-spring-boot/pom.xml
Expand Up @@ -75,6 +75,10 @@
</dependencies>

<build>

<!-- we do not want version in the WAR name -->
<finalName>${project.artifactId}</finalName>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

0 comments on commit 48c6c4c

Please sign in to comment.