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 2012/01/25 10:55:42 UTC
svn commit: r1235706 - in /camel/trunk/tooling/archetypes:
camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/
camel-archetype-activemq/src/main/resources/archetype-resources/
camel-archetype-activemq/src/main/resources/archetype-resou...
Author: davsclaus
Date: Wed Jan 25 09:55:41 2012
New Revision: 1235706
URL: http://svn.apache.org/viewvc?rev=1235706&view=rev
Log:
CAMEL-4940: Polished Camel maven archetypes. Now include src/test directory and being ready for unit testing etc.
Added:
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/test/
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/test/java/
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/test/resources/
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/resources/
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/resources/log4j.properties (props changed)
- copied unchanged from r1235634, camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/log4j.properties
camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/resources/
camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/resources/log4j.properties
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/test/
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/test/java/
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/test/resources/
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/test/
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/test/resources/
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/test/scala/
camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/test/
camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/test/java/
camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/src/test/resources/
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/test/
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/test/java/
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/test/resources/
Removed:
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/main/resources/log4j.properties
Modified:
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/ReadMe.txt
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/trunk/tooling/archetypes/camel-archetype-dataformat/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-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/ReadMe.txt
camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml
Modified: camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml Wed Jan 25 09:55:41 2012
@@ -53,8 +53,19 @@
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*</include>
</includes>
</fileSet>
<fileSet encoding="UTF-8">
Modified: camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/ReadMe.txt
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/ReadMe.txt?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/ReadMe.txt (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/ReadMe.txt Wed Jan 25 09:55:41 2012
@@ -1,8 +1,9 @@
-Camel Router Project
-====================
+Camel ActiveMQ Project
+======================
-To run this router either embed the jar inside Spring
-or to run the route from within maven try
+This project embeds Apache ActiveMQ together with Apache Camel.
+
+To run this project use the following maven goal
mvn camel:run
Modified: camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml Wed Jan 25 09:55:41 2012
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<version>${version}</version>
- <name>A Camel Route</name>
+ <name>ActiveMQ embedded with Camel</name>
<url>http://www.myorganization.org</url>
<properties>
Modified: camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml Wed Jan 25 09:55:41 2012
@@ -26,7 +26,7 @@
<packaging>bundle</packaging>
<version>${version}</version>
- <name>A Camel Route</name>
+ <name>A Camel Blueprint Route</name>
<url>http://www.myorganization.org</url>
<dependencies>
Modified: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml Wed Jan 25 09:55:41 2012
@@ -21,9 +21,7 @@
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>HelloWorld</defaultValue>
- </requiredProperty>
+ <requiredProperty key="name"/>
<requiredProperty key="scheme">
<defaultValue>helloworld</defaultValue>
</requiredProperty>
@@ -59,6 +57,12 @@
<include>**/*.java</include>
</includes>
</fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
<fileSet encoding="UTF-8">
<directory>src/data</directory>
<includes>
Modified: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml Wed Jan 25 09:55:41 2012
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<version>${version}</version>
- <name>A Camel Component</name>
+ <name>Camel ${name} Component</name>
<url>http://www.myorganization.org</url>
<properties>
Propchange: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml Wed Jan 25 09:55:41 2012
@@ -54,5 +54,11 @@
<include>**/*.java</include>
</includes>
</fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
</fileSets>
</archetype-descriptor>
Modified: camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml Wed Jan 25 09:55:41 2012
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<version>${version}</version>
- <name>A Camel ${name} Data format</name>
+ <name>Camel ${name} Data format</name>
<url>http://www.myorganization.org</url>
<properties>
Added: camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/resources/log4j.properties?rev=1235706&view=auto
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/resources/log4j.properties (added)
+++ camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/resources/log4j.properties Wed Jan 25 09:55:41 2012
@@ -0,0 +1,32 @@
+## ------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used
+#
+log4j.rootLogger=INFO, out
+
+# uncomment the following line to turn on Camel debugging
+#log4j.logger.org.apache.camel=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file
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=1235706&r1=1235705&r2=1235706&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 Wed Jan 25 09:55:41 2012
@@ -54,6 +54,13 @@
<include>**/*.java</include>
</includes>
</fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </fileSet>
<fileSet encoding="UTF-8">
<directory>src/data</directory>
<includes>
Modified: camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml Wed Jan 25 09:55:41 2012
@@ -53,6 +53,18 @@
<include>**/*</include>
</includes>
</fileSet>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/test/scala</directory>
+ <includes>
+ <include>**/*.scala</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
<fileSet encoding="UTF-8">
<directory></directory>
<includes>
Modified: camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml Wed Jan 25 09:55:41 2012
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<version>${version}</version>
- <name>Camel :: A RouteBuilder for the Scala DSL</name>
+ <name>A Camel Scala Route</name>
<url>http://www.myorganization.org</url>
<properties>
Modified: camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml Wed Jan 25 09:55:41 2012
@@ -57,6 +57,12 @@
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
<directory></directory>
<includes>
<include>ReadMe.txt</include>
Modified: camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml Wed Jan 25 09:55:41 2012
@@ -26,7 +26,7 @@
<packaging>bundle</packaging>
<version>${version}</version>
- <name>A Camel Route</name>
+ <name>A Camel Spring-DM Route</name>
<url>http://www.myorganization.org</url>
<properties>
Modified: camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml Wed Jan 25 09:55:41 2012
@@ -53,6 +53,12 @@
<include>**/*.java</include>
</includes>
</fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
<fileSet encoding="UTF-8">
<directory>src/data</directory>
<includes>
Modified: camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml Wed Jan 25 09:55:41 2012
@@ -26,7 +26,7 @@
<packaging>jar</packaging>
<version>${version}</version>
- <name>A Camel Route</name>
+ <name>A Camel Spring Route</name>
<url>http://www.myorganization.org</url>
<properties>
Modified: camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml Wed Jan 25 09:55:41 2012
@@ -25,7 +25,7 @@
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
- <name>Camel Router Application</name>
+ <name>Camel Web Application</name>
<description>Camel project that deploys the Camel routes as a WAR</description>
<url>http://www.myorganization.org</url>
@@ -107,23 +107,21 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty-version}</version>
-
<configuration>
<webAppConfig>
<contextPath>/</contextPath>
</webAppConfig>
-
<systemProperties>
-
<!-- enable easy JMX connection to JConsole -->
<systemProperty>
<name>com.sun.management.jmxremote</name>
- <value />
+ <value/>
</systemProperty>
</systemProperties>
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
</plugin>
+
</plugins>
</build>
Modified: camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml Wed Jan 25 09:55:41 2012
@@ -28,13 +28,13 @@
<!--
Simple camel route which send every one minute a message on the console.
-->
- <camelContext trace="false" xmlns="http://camel.apache.org/schema/spring">
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
<route id="timer-to-console">
- <from uri="timer://foo?fixedRate=true&period=10s" />
+ <from uri="timer://foo?fixedRate=true&period=10s"/>
<transform>
<simple>Hello Web Application, how are you?</simple>
</transform>
- <to uri="stream:out" />
+ <to uri="stream:out"/>
</route>
</camelContext>
Modified: camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Wed Jan 25 09:55:41 2012
@@ -34,5 +34,4 @@
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
-
</web-app>
Modified: camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/ReadMe.txt
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/ReadMe.txt?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/ReadMe.txt (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/ReadMe.txt Wed Jan 25 09:55:41 2012
@@ -22,7 +22,7 @@ You can view the Web Console by pointing
You should be able to do things like
* browse the available endpoints
- * browse the messages on an endpoint if it is a BrowsableEndpoint
+ * browse the messages on an endpoint if it is a browsable endpoint
* send a message to an endpoint
* create new endpoints
Modified: camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml?rev=1235706&r1=1235705&r2=1235706&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/pom.xml Wed Jan 25 09:55:41 2012
@@ -25,7 +25,7 @@
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
- <name>Camel Router Application</name>
+ <name>Camel Web Console Application</name>
<description>Camel project that deploys the Camel Web Console, REST API, and your routes as a WAR</description>
<url>http://www.myorganization.org</url>
@@ -104,6 +104,7 @@
<defaultGoal>install</defaultGoal>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -113,11 +114,15 @@
<target>1.6</target>
</configuration>
</plugin>
+
+ <!-- plugin to run using mvn camel:run -->
<plugin>
<groupId>org.apache.camel</groupId>
<artifactId>camel-maven-plugin</artifactId>
<version>${camel-version}</version>
</plugin>
+
+ <!-- plugin to run using mvn jetty:run -->
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
@@ -127,16 +132,16 @@
<contextPath>/</contextPath>
</webAppConfig>
<systemProperties>
-
<!-- enable easy JMX connection to JConsole -->
<systemProperty>
<name>com.sun.management.jmxremote</name>
- <value />
+ <value/>
</systemProperty>
</systemProperties>
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
</plugin>
+
</plugins>
</build>