camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1468312 - in /camel/trunk/tooling/archetypes: camel-archetype-blueprint/src/main/resources/archetype-resources/ camel-archetype-component-scala/src/main/resources/archetype-resources/ camel-archetype-component/src/main/resources/archetype-...
Date Tue, 16 Apr 2013 06:39:09 GMT
Author: davsclaus
Date: Tue Apr 16 06:39:08 2013
New Revision: 1468312

URL: http://svn.apache.org/r1468312
Log:
Polished Camel Maven Archetypes

Modified:
    camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt
    camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt
    camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
    camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/ReadMe.txt
    camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
    camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/ReadMe.txt
    camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
    camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
    camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/ReadMe.txt
    camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
    camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java
    camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
    camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt
    camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/ReadMe.txt

Modified: camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt
Tue Apr 16 06:39:08 2013
@@ -5,14 +5,14 @@ To build this project use
 
     mvn install
 
-To run the example you can execute the following Maven goal
+To run the project you can execute the following Maven goal
 
     mvn camel:run
 
-To deploy the example in OSGi. For example using Apache ServiceMix
-or Apache Karaf. You will run the following command from its shell:
+To deploy the project in OSGi. For example using Apache ServiceMix
+or Apache Karaf. You can run the following command from its shell:
 
-    osgi:install -s mvn:${groupId}/${artifactId}
+    osgi:install -s mvn:${groupId}/${artifactId}/${version}
 
 For more help see the Apache Camel documentation
 

Modified: camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt
Tue Apr 16 06:39:08 2013
@@ -1,6 +1,7 @@
 Camel Component Project
-====================
-This Project is a template of a Camel component using Scala.
+=======================
+
+This project is a template of a Camel component using Scala.
 
 To build this project use
 
@@ -10,6 +11,13 @@ For more help see the Apache Camel docum
 
     http://camel.apache.org/writing-components.html
 
-Scala should only be used for Scala-related components such as Akka or Play framework.
-See http://camel.465427.n5.nabble.com/Create-a-new-Camel-component-via-Scala-Component-Archetype-td5708543.html#a5711675
+
+Notice:
+
+We favor writing Camel components in plain Java, which allows all people to consume and use
the components easily.
+Writing components in Scala is intended in situations when being used together with other
Scala libraries such as Akka, Play, etc.
+
+See discussion at:
+
+    http://camel.465427.n5.nabble.com/Create-a-new-Camel-component-via-Scala-Component-Archetype-td5708543.html#a5711675
 

Modified: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
Tue Apr 16 06:39:08 2013
@@ -1,7 +1,7 @@
 Camel Component Project
 =======================
 
-This Project is a template of a Camel component.
+This project is a template of a Camel component.
 
 To build this project use
 

Modified: camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/ReadMe.txt
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/ReadMe.txt?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/ReadMe.txt
Tue Apr 16 06:39:08 2013
@@ -1,7 +1,7 @@
 Camel Data Format Project
 =========================
 
-This Project is a template of a Camel data format.
+This project is a template of a Camel data format.
 
 To build this project use
 
@@ -9,5 +9,5 @@ To build this project use
 
 For more help see the Apache Camel documentation:
 
-    http://camel.apache.org/
+    http://camel.apache.org/writing-components.html
     

Modified: camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Tue Apr 16 06:39:08 2013
@@ -24,6 +24,9 @@
     <requiredProperty key="camel-version">
       <defaultValue>${project.version}</defaultValue>
     </requiredProperty>
+    <requiredProperty key="exec-maven-plugin-version">
+      <defaultValue>${exec-maven-plugin-version}</defaultValue>
+    </requiredProperty>
     <requiredProperty key="log4j-version">
       <defaultValue>${log4j-version}</defaultValue>
     </requiredProperty>

Modified: camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/ReadMe.txt
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/ReadMe.txt?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/ReadMe.txt
Tue Apr 16 06:39:08 2013
@@ -5,14 +5,10 @@ To build this project use
 
     mvn install
 
-To run this example from within Maven use
+To run this project from within Maven use
 
     mvn exec:java
 
-From a web browser access the example using
-
-    http://localhost:8080
-
 For more help see the Apache Camel documentation
 
     http://camel.apache.org/

Modified: camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
Tue Apr 16 06:39:08 2013
@@ -128,6 +128,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
+				<version>${exec-maven-plugin-version}</version>
 				<configuration>
 					<mainClass>${package}.MainApp</mainClass>
 					<includePluginDependencies>false</includePluginDependencies>

Modified: camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Tue Apr 16 06:39:08 2013
@@ -24,6 +24,9 @@
     <requiredProperty key="camel-version">
       <defaultValue>${project.version}</defaultValue>
     </requiredProperty>
+    <requiredProperty key="exec-maven-plugin-version">
+      <defaultValue>${exec-maven-plugin-version}</defaultValue>
+    </requiredProperty>
     <requiredProperty key="log4j-version">
       <defaultValue>${log4j-version}</defaultValue>
     </requiredProperty>

Modified: camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/ReadMe.txt
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/ReadMe.txt?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/ReadMe.txt
Tue Apr 16 06:39:08 2013
@@ -5,7 +5,7 @@ To build this project use
 
     mvn install
 
-To run this example from within Maven use
+To run this project from within Maven use
 
     mvn exec:java
 

Modified: camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
Tue Apr 16 06:39:08 2013
@@ -90,6 +90,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
+        <version>${exec-maven-plugin-version}</version>
         <configuration>
             <mainClass>${package}.MainApp</mainClass>
             <includePluginDependencies>false</includePluginDependencies>

Modified: camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java
Tue Apr 16 06:39:08 2013
@@ -34,8 +34,10 @@ public class MyRouteBuilder extends Rout
         from("file:src/data?noop=true")
             .choice()
                 .when(xpath("/person/city = 'London'"))
+                    .log("UK message")
                     .to("file:target/messages/uk")
                 .otherwise()
+                    .log("Other message")
                     .to("file:target/messages/others");
     }
 

Modified: camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
Tue Apr 16 06:39:08 2013
@@ -5,7 +5,7 @@ To build this project use
 
     mvn install
 
-To run this example
+To run this project
 
     mvn exec:java
     

Modified: camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt
Tue Apr 16 06:39:08 2013
@@ -5,15 +5,14 @@ To build this project use
 
     mvn install
 
-You can run this example from the command line using
-the following Maven goal:
+You can run this project using he following Maven goal:
 
     mvn camel:run
 
-To deploy the example in OSGi. For example using Apache ServiceMix
+To deploy the project in OSGi. For example using Apache ServiceMix
 or Apache Karaf. You will run the following command from its shell:
 
-    osgi:install -s mvn:${groupId}/${artifactId}
+    osgi:install -s mvn:${groupId}/${artifactId}/${version}
 
 For more help see the Apache Camel documentation
 

Modified: camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/ReadMe.txt
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/ReadMe.txt?rev=1468312&r1=1468311&r2=1468312&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++ camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/ReadMe.txt
Tue Apr 16 06:39:08 2013
@@ -5,8 +5,7 @@ To build this project use
 
     mvn install
 
-To run this example either embed the jar inside Spring
-or to run the route from within Maven try
+To run this project with Maven use
 
     mvn camel:run
 



Mime
View raw message