Author: davsclaus
Date: Fri Oct 19 14:05:22 2012
New Revision: 1400102
URL: http://svn.apache.org/viewvc?rev=1400102&view=rev
Log:
CAMEL-5715: Fixed the maven archetypes.
Added:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/dataformat/__scheme__
- copied unchanged from r1400097,
camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/dataformat/__scheme__
Removed:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org/apache/camel/dataformat/__name__
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/parent/pom.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/ReadMe.txt
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/ReadMe.txt
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/java/__name__DataFormat.java
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/ReadMe.txt
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/ReadMe.txt
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/ReadMe.txt
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/ReadMe.txt
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1400097
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Fri Oct 19 14:05:22 2012
@@ -71,6 +71,7 @@
<dozer-version>5.3.2</dozer-version>
<easymock-version>3.0</easymock-version>
<ehcache-bundle-version>2.5.2_1</ehcache-bundle-version>
+ <exec-maven-plugin-version>1.2.1</exec-maven-plugin-version>
<flatpack-version>3.2.0_2</flatpack-version>
<fop-version>1.0</fop-version>
<ftpserver-version>1.0.6</ftpserver-version>
@@ -133,6 +134,9 @@
<leveldbjni-version>1.3</leveldbjni-version>
<log4j-version>1.2.17</log4j-version>
<lucene-version>3.6.0</lucene-version>
+ <maven-bundle-version>2.3.7</maven-bundle-version>
+ <maven-compiler-plugin-version>2.5.1</maven-compiler-plugin-version>
+ <maven-eclipse-plugin-version>2.9</maven-eclipse-plugin-version>
<maven-resources-plugin-version>2.4.3</maven-resources-plugin-version>
<mina-version>1.1.7</mina-version>
<mina2-version>2.0.7</mina2-version>
@@ -164,7 +168,7 @@
<saxon-version>9.3.0.11</saxon-version>
<scala-version>2.9.1</scala-version>
<scala-plugin-version>2.15.2</scala-plugin-version>
- <scala-maven-plugin-version>3.0.2</scala-maven-plugin-version>
+ <scala-maven-plugin-version>3.1.0</scala-maven-plugin-version>
<servicemix-specs-version>1.9.0</servicemix-specs-version>
<shiro-version>1.2.0</shiro-version>
<slf4j-api-version>1.6.6</slf4j-api-version>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Fri Oct 19 14:05:22 2012
@@ -33,7 +33,10 @@
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
</requiredProperty>
- <requiredProperty key="slf4j-version">
+ <requiredProperty key="maven-resources-plugin-version">
+ <defaultValue>${maven-resources-plugin-version}</defaultValue>
+ </requiredProperty>
+ <requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
</requiredProperty>
<requiredProperty key="spring-version">
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/ReadMe.txt?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/ReadMe.txt
Fri Oct 19 14:05:22 2012
@@ -7,11 +7,11 @@ To build this project use
mvn install
-To run this project use the following maven goal
+To run this project use the following Maven goal
mvn camel:run
For more help see the Apache Camel documentation
http://camel.apache.org/
-
\ No newline at end of file
+
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Fri Oct 19 14:05:22 2012
@@ -30,6 +30,9 @@
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="maven-resources-plugin-version">
+ <defaultValue>${maven-resources-plugin-version}</defaultValue>
+ </requiredProperty>
<requiredProperty key="maven-bundle-plugin-version">
<defaultValue>${maven-bundle-version}</defaultValue>
</requiredProperty>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt
Fri Oct 19 14:05:22 2012
@@ -5,6 +5,10 @@ To build this project use
mvn install
+To run the example 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:
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Fri Oct 19 14:05:22 2012
@@ -21,12 +21,8 @@
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<requiredProperties>
- <requiredProperty key="name">
- <defaultValue>HelloScalaWorld</defaultValue>
- </requiredProperty>
- <requiredProperty key="scheme">
- <defaultValue>helloscalaworld</defaultValue>
- </requiredProperty>
+ <requiredProperty key="name"/>
+ <requiredProperty key="scheme"/>
<requiredProperty key="camel-version">
<defaultValue>${project.version}</defaultValue>
</requiredProperty>
@@ -36,6 +32,9 @@
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="maven-resources-plugin-version">
+ <defaultValue>${maven-resources-plugin-version}</defaultValue>
+ </requiredProperty>
<requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
</requiredProperty>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt
Fri Oct 19 14:05:22 2012
@@ -2,6 +2,10 @@ Camel Component Project
====================
This Project is a template of a Camel component using Scala.
+To build this project use
+
+ mvn install
+
For more help see the Apache Camel documentation:
http://camel.apache.org/writing-components.html
@@ -9,5 +13,3 @@ For more help see the Apache Camel docum
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
-
-
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Fri Oct 19 14:05:22 2012
@@ -22,9 +22,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<requiredProperties>
<requiredProperty key="name"/>
- <requiredProperty key="scheme">
- <defaultValue>helloworld</defaultValue>
- </requiredProperty>
+ <requiredProperty key="scheme"/>
<requiredProperty key="camel-version">
<defaultValue>${project.version}</defaultValue>
</requiredProperty>
@@ -34,6 +32,9 @@
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="maven-resources-plugin-version">
+ <defaultValue>${maven-resources-plugin-version}</defaultValue>
+ </requiredProperty>
<requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
</requiredProperty>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
Fri Oct 19 14:05:22 2012
@@ -1,12 +1,8 @@
Camel Component Project
-====================
+=======================
This Project is a template of a Camel component.
-When you create a component project, you need to move the
META-INF/services/org/apache/camel/component/${name}
-file to META-INF/services/org/apache/camel/component/foo where "foo" is the
URI scheme for your component and any
-related endpoints created on the fly.
-
To build this project use
mvn install
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Fri Oct 19 14:05:22 2012
@@ -22,6 +22,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<requiredProperties>
<requiredProperty key="name"/>
+ <requiredProperty key="scheme"/>
<requiredProperty key="camel-version">
<defaultValue>${project.version}</defaultValue>
</requiredProperty>
@@ -31,6 +32,9 @@
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="maven-resources-plugin-version">
+ <defaultValue>${maven-resources-plugin-version}</defaultValue>
+ </requiredProperty>
<requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
</requiredProperty>
@@ -60,5 +64,11 @@
<include>**/*</include>
</includes>
</fileSet>
+ <fileSet encoding="UTF-8">
+ <directory></directory>
+ <includes>
+ <include>ReadMe.txt</include>
+ </includes>
+ </fileSet>
</fileSets>
</archetype-descriptor>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/ReadMe.txt?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/ReadMe.txt
Fri Oct 19 14:05:22 2012
@@ -1,11 +1,8 @@
Camel Data Format Project
-====================
+=========================
This Project is a template of a Camel data format.
-When you create a data format project, you need to move the
META-INF/services/org/apache/camel/dataformat/${name}
-file to META-INF/services/org/apache/camel/dataformat/foo where "foo" is the
URI scheme for your data format.
-
To build this project use
mvn install
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/java/__name__DataFormat.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/java/__name__DataFormat.java?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/java/__name__DataFormat.java
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/main/java/__name__DataFormat.java
Fri Oct 19 14:05:22 2012
@@ -27,6 +27,7 @@ import org.apache.camel.spi.DataFormat;
* for ${name} data.
*/
public class ${name}DataFormat implements DataFormat {
+
public void marshal(Exchange exchange, Object graph, OutputStream stream)
throws Exception {
byte[] bytes =
exchange.getContext().getTypeConverter().mandatoryConvertTo(byte[].class,
graph);
stream.write(bytes);
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Fri Oct 19 14:05:22 2012
@@ -30,6 +30,9 @@
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="maven-resources-plugin-version">
+ <defaultValue>${maven-resources-plugin-version}</defaultValue>
+ </requiredProperty>
<requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
</requiredProperty>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/ReadMe.txt?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/ReadMe.txt
Fri Oct 19 14:05:22 2012
@@ -5,11 +5,11 @@ To build this project use
mvn install
-To run this router from within Maven use
+To run this example from within Maven use
mvn exec:java
For more help see the Apache Camel documentation
http://camel.apache.org/
-
\ No newline at end of file
+
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Fri Oct 19 14:05:22 2012
@@ -30,11 +30,14 @@
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="maven-resources-plugin-version">
+ <defaultValue>${maven-resources-plugin-version}</defaultValue>
+ </requiredProperty>
<requiredProperty key="maven-eclipse-plugin-version">
- <defaultValue>2.8</defaultValue>
+ <defaultValue>${maven-eclipse-plugin-version}</defaultValue>
</requiredProperty>
<requiredProperty key="exec-maven-plugin-version">
- <defaultValue>1.2.1</defaultValue>
+ <defaultValue>${exec-maven-plugin-version}</defaultValue>
</requiredProperty>
<requiredProperty key="scala-version">
<defaultValue>${scala-version}</defaultValue>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
Fri Oct 19 14:05:22 2012
@@ -5,7 +5,7 @@ To build this project use
mvn install
-To run this route:
+To run this example
mvn exec:java
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Fri Oct 19 14:05:22 2012
@@ -30,8 +30,11 @@
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="maven-resources-plugin-version">
+ <defaultValue>${maven-resources-plugin-version}</defaultValue>
+ </requiredProperty>
<requiredProperty key="maven-bundle-plugin-version">
- <defaultValue>2.3.4</defaultValue>
+ <defaultValue>${maven-bundle-version}</defaultValue>
</requiredProperty>
<requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt
Fri Oct 19 14:05:22 2012
@@ -6,7 +6,7 @@ To build this project use
mvn install
You can run this example from the command line using
-the following maven goal:
+the following Maven goal:
mvn camel:run
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Fri Oct 19 14:05:22 2012
@@ -30,6 +30,9 @@
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="maven-resources-plugin-version">
+ <defaultValue>${maven-resources-plugin-version}</defaultValue>
+ </requiredProperty>
<requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
</requiredProperty>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/ReadMe.txt?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/ReadMe.txt
Fri Oct 19 14:05:22 2012
@@ -1,16 +1,16 @@
Camel Router Spring Project
-====================
+===========================
To build this project use
mvn install
-To run this router either embed the jar inside Spring
-or to run the route from within maven try
+To run this example either embed the jar inside Spring
+or to run the route from within Maven try
mvn camel:run
For more help see the Apache Camel documentation
http://camel.apache.org/
-
\ No newline at end of file
+
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Fri Oct 19 14:05:22 2012
@@ -33,6 +33,9 @@
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="maven-resources-plugin-version">
+ <defaultValue>${maven-resources-plugin-version}</defaultValue>
+ </requiredProperty>
<requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
</requiredProperty>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/ReadMe.txt?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/ReadMe.txt
Fri Oct 19 14:05:22 2012
@@ -4,15 +4,16 @@ Camel Router WAR Project
This project includes a sample route as as a WAR.
You can build the WAR by running
-mvn install
+ mvn install
You can then run the project by dropping the WAR into your
favorite web container or just run
-mvn jetty:run
+ mvn jetty:run
to start up and deploy to Jetty.
For more help see the Apache Camel documentation
- http://camel.apache.org/
\ No newline at end of file
+ http://camel.apache.org/
+
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Fri Oct 19 14:05:22 2012
@@ -39,6 +39,9 @@
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="maven-resources-plugin-version">
+ <defaultValue>${maven-resources-plugin-version}</defaultValue>
+ </requiredProperty>
<requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
</requiredProperty>
Modified:
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/ReadMe.txt?rev=1400102&r1=1400101&r2=1400102&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/branches/camel-2.10.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/ReadMe.txt
Fri Oct 19 14:05:22 2012
@@ -4,12 +4,12 @@ Camel Router WAR Project with Web Consol
This project bundles the Camel Web Console, REST API, and some
sample routes as a WAR. You can build the WAR by running
-mvn install
+ mvn install
You can then run the project by dropping the WAR into your
favorite web container or just run
-mvn jetty:run
+ mvn jetty:run
to start up and deploy to Jetty.
