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/11/03 17:28:49 UTC
[1/2] camel git commit: CAMEL-9263: camel-servlet - Allow to
configure the context path without leading slash
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 3bebadb1e -> 6f8605693
refs/heads/master 29a2c92ae -> aee90b1c0
CAMEL-9263: camel-servlet - Allow to configure the context path without leading slash
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aee90b1c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aee90b1c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aee90b1c
Branch: refs/heads/master
Commit: aee90b1c0024f98262e4b9b0cc8154155ca8b7d2
Parents: 29a2c92
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Nov 3 17:28:28 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Nov 3 17:31:48 2015 +0100
----------------------------------------------------------------------
.../src/main/resources/camel-config.xml | 2 +-
.../src/main/resources/camel-context.xml | 4 ++--
.../src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/aee90b1c/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/camel-config.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/camel-config.xml b/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/camel-config.xml
index b99bae2..5432bd2 100755
--- a/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/camel-config.xml
+++ b/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/camel-config.xml
@@ -24,7 +24,7 @@
<route>
<!-- incoming requests from the servlet is routed -->
- <from uri="servlet:///hello"/>
+ <from uri="servlet:hello"/>
<choice>
<when>
<!-- is there a header with the key name? -->
http://git-wip-us.apache.org/repos/asf/camel/blob/aee90b1c/examples/camel-example-spring-security/src/main/resources/camel-context.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-security/src/main/resources/camel-context.xml b/examples/camel-example-spring-security/src/main/resources/camel-context.xml
index e8b16cc..d51dc0a 100644
--- a/examples/camel-example-spring-security/src/main/resources/camel-context.xml
+++ b/examples/camel-example-spring-security/src/main/resources/camel-context.xml
@@ -73,7 +73,7 @@
</onException>
<route>
- <from uri="servlet:///user"/>
+ <from uri="servlet:user"/>
<!-- wrap the route in the policy which enforces security check -->
<policy ref="user">
<transform>
@@ -83,7 +83,7 @@
</route>
<route>
- <from uri="servlet:///admin"/>
+ <from uri="servlet:admin"/>
<!-- wrap the route in the policy which enforces security check -->
<policy ref="admin">
<transform>
http://git-wip-us.apache.org/repos/asf/camel/blob/aee90b1c/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
index 1aa4b50..dfac873 100644
--- a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
@@ -24,7 +24,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route id="helloRoute">
<!-- incoming requests from the servlet is routed -->
- <from uri="servlet:///hello"/>
+ <from uri="servlet:hello"/>
<choice>
<when>
<!-- is there a header with the key name? -->
[2/2] camel git commit: CAMEL-9263: camel-servlet - Allow to
configure the context path without leading slash
Posted by da...@apache.org.
CAMEL-9263: camel-servlet - Allow to configure the context path without leading slash
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6f860569
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6f860569
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6f860569
Branch: refs/heads/camel-2.16.x
Commit: 6f8605693775d7d80a43e7fc2020852516e3ddd3
Parents: 3bebadb
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Nov 3 17:28:28 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Nov 3 17:31:58 2015 +0100
----------------------------------------------------------------------
.../src/main/resources/camel-config.xml | 2 +-
.../src/main/resources/camel-context.xml | 4 ++--
.../src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6f860569/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/camel-config.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/camel-config.xml b/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/camel-config.xml
index b99bae2..5432bd2 100755
--- a/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/camel-config.xml
+++ b/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/camel-config.xml
@@ -24,7 +24,7 @@
<route>
<!-- incoming requests from the servlet is routed -->
- <from uri="servlet:///hello"/>
+ <from uri="servlet:hello"/>
<choice>
<when>
<!-- is there a header with the key name? -->
http://git-wip-us.apache.org/repos/asf/camel/blob/6f860569/examples/camel-example-spring-security/src/main/resources/camel-context.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-security/src/main/resources/camel-context.xml b/examples/camel-example-spring-security/src/main/resources/camel-context.xml
index e8b16cc..d51dc0a 100644
--- a/examples/camel-example-spring-security/src/main/resources/camel-context.xml
+++ b/examples/camel-example-spring-security/src/main/resources/camel-context.xml
@@ -73,7 +73,7 @@
</onException>
<route>
- <from uri="servlet:///user"/>
+ <from uri="servlet:user"/>
<!-- wrap the route in the policy which enforces security check -->
<policy ref="user">
<transform>
@@ -83,7 +83,7 @@
</route>
<route>
- <from uri="servlet:///admin"/>
+ <from uri="servlet:admin"/>
<!-- wrap the route in the policy which enforces security check -->
<policy ref="admin">
<transform>
http://git-wip-us.apache.org/repos/asf/camel/blob/6f860569/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
index 1aa4b50..dfac873 100644
--- a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
@@ -24,7 +24,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route id="helloRoute">
<!-- incoming requests from the servlet is routed -->
- <from uri="servlet:///hello"/>
+ <from uri="servlet:hello"/>
<choice>
<when>
<!-- is there a header with the key name? -->