camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-8363: Camel archetype do not use camel prefix in the routes as that is not commonly used.
Date Mon, 16 Feb 2015 19:06:12 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 0ed27dc32 -> 3e71e5991


CAMEL-8363: Camel archetype do not use camel prefix in the routes as that is not commonly
used.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e71e599
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e71e599
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e71e599

Branch: refs/heads/camel-2.14.x
Commit: 3e71e599185aa7697aac43f3ae93404f682bbbc0
Parents: 0ed27dc
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Feb 16 20:06:01 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Feb 16 20:06:50 2015 +0100

----------------------------------------------------------------------
 .../resources/OSGI-INF/blueprint/blueprint.xml  |  3 +-
 .../resources/META-INF/spring/camel-context.xml |  1 -
 .../resources/META-INF/spring/camel-context.xml | 33 ++++++++++----------
 .../main/webapp/WEB-INF/applicationContext.xml  |  7 ++---
 4 files changed, 19 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/3e71e599/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 7e7e085..ac20230 100644
--- a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -17,7 +17,6 @@
 ## ------------------------------------------------------------------------
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:camel="http://camel.apache.org/schema/blueprint"
        xsi:schemaLocation="
        http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
        http://camel.apache.org/schema/blueprint http://camel.apache.org/schema/blueprint/camel-blueprint.xsd">
@@ -26,7 +25,7 @@
       <property name="say" value="Hi from Camel"/>
   </bean>
 
-  <camelContext id="blueprintContext" trace="false" xmlns="http://camel.apache.org/schema/blueprint">
+  <camelContext xmlns="http://camel.apache.org/schema/blueprint">
     <route id="timerToLog">
       <from uri="timer:foo?period=5000"/>
       <setBody>

http://git-wip-us.apache.org/repos/asf/camel/blob/3e71e599/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
b/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
index 719c353..921953b 100644
--- a/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
+++ b/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
@@ -17,7 +17,6 @@
 ## ------------------------------------------------------------------------
 <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"
        xmlns:osgi="http://www.springframework.org/schema/osgi"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd

http://git-wip-us.apache.org/repos/asf/camel/blob/3e71e599/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
b/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
index 822b4ef..e9f0369 100644
--- a/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
+++ b/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
@@ -19,29 +19,28 @@
 
 <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">
 
-  <camel:camelContext xmlns="http://camel.apache.org/schema/spring">
+  <camelContext xmlns="http://camel.apache.org/schema/spring">
     <!-- here is a sample which processes the input files
          (leaving them in place - see the 'noop' flag)
          then performs content based routing on the message using XPath -->
-    <camel:route>
-      <camel:from uri="file:src/data?noop=true"/>
-      <camel:choice>
-        <camel:when>
-          <camel:xpath>/person/city = 'London'</camel:xpath>
-          <camel:log message="UK message"/>
-          <camel:to uri="file:target/messages/uk"/>
-        </camel:when>
-        <camel:otherwise>
-          <camel:log message="Other message"/>
-          <camel:to uri="file:target/messages/others"/>
-        </camel:otherwise>
-      </camel:choice>
-    </camel:route>
-  </camel:camelContext>
+    <route>
+      <from uri="file:src/data?noop=true"/>
+      <choice>
+        <when>
+          <xpath>/person/city = 'London'</xpath>
+          <log message="UK message"/>
+          <to uri="file:target/messages/uk"/>
+        </when>
+        <otherwise>
+          <log message="Other message"/>
+          <to uri="file:target/messages/others"/>
+        </otherwise>
+      </choice>
+    </route>
+  </camelContext>
 
 </beans>

http://git-wip-us.apache.org/repos/asf/camel/blob/3e71e599/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 90044c3..8ee1b03 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
@@ -17,12 +17,9 @@
 ## ------------------------------------------------------------------------
 <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">
+       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">
 
     <!--
         Simple camel route which send every one minute a message on the console.


Mime
View raw message