Author: davsclaus
Date: Thu Mar 3 16:32:49 2011
New Revision: 1076669
URL: http://svn.apache.org/viewvc?rev=1076669&view=rev
Log:
CAMEL-3658: Migrated the spring archetype to the new format. And fixed so it
works.
Added:
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/META-INF/maven/archetype-metadata.xml
(with props)
Removed:
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/META-INF/maven/archetype.xml
Modified:
camel/trunk/tooling/archetypes/camel-archetype-light-war/src/main/resources/archetype-resources/ReadMe.txt
camel/trunk/tooling/archetypes/camel-archetype-spring/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/log4j.properties
Modified:
camel/trunk/tooling/archetypes/camel-archetype-light-war/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-light-war/src/main/resources/archetype-resources/ReadMe.txt?rev=1076669&r1=1076668&r2=1076669&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-light-war/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-light-war/src/main/resources/archetype-resources/ReadMe.txt
Thu Mar 3 16:32:49 2011
@@ -12,3 +12,7 @@ favorite web container or just 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
Modified: camel/trunk/tooling/archetypes/camel-archetype-spring/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring/pom.xml?rev=1076669&r1=1076668&r2=1076669&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-spring/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-spring/pom.xml Thu Mar 3
16:32:49 2011
@@ -41,31 +41,19 @@
<artifactId>archetype-packaging</artifactId>
</extension>
</extensions>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <replace casesensitive="true"
file="${project.build.directory}/classes/archetype-resources/pom.xml">
- <replacefilter token="$CAMEL_VERSION_REPLACEME$"
value="${project.version}" />
- <replacefilter token="$LOG4J_VERSION_REPLACEME$"
value="${log4j-version}" />
- <replacefilter token="$JAXB_API_VERSION_REPLACEME$"
value="${jaxb-api-version}" />
- <replacefilter token="$JAXB_IMPL_VERSION_REPLACEME$"
value="${jaxb-version}" />
- <replacefilter
token="$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$"
value="${maven-compiler-plugin-version}" />
- </replace>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/archetype-metadata.xml</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Added:
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1076669&view=auto
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/META-INF/maven/archetype-metadata.xml
(added)
+++
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/META-INF/maven/archetype-metadata.xml
Thu Mar 3 16:32:49 2011
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<archetype-descriptor
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0
http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd";
name="camel-archetype-java"
+
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="camel-version">
+ <defaultValue>${project.version}</defaultValue>
+ </requiredProperty>
+ <requiredProperty key="log4j-version">
+ <defaultValue>${log4j-version}</defaultValue>
+ </requiredProperty>
+ <requiredProperty key="maven-compiler-plugin-version">
+ <defaultValue>${maven-compiler-plugin-version}</defaultValue>
+ </requiredProperty>
+ <requiredProperty key="slf4j-version">
+ <defaultValue>${slf4j-version}</defaultValue>
+ </requiredProperty>
+ </requiredProperties>
+ <fileSets>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/data</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory></directory>
+ <includes>
+ <include>ReadMe.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</archetype-descriptor>
Propchange:
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/META-INF/maven/archetype-metadata.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
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=1076669&r1=1076668&r2=1076669&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
Thu Mar 3 16:32:49 2011
@@ -29,13 +29,6 @@
<name>A Camel Route</name>
<url>http://www.myorganization.org</url>
- <properties>
- <camel-version>$CAMEL_VERSION_REPLACEME$</camel-version>
- <log4j-version>$LOG4J_VERSION_REPLACEME$</log4j-version>
- <jaxb-api-version>$JAXB_API_VERSION_REPLACEME$</jaxb-api-version>
- <jaxb-impl-version>$JAXB_IMPL_VERSION_REPLACEME$</jaxb-impl-version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -47,6 +40,13 @@
<artifactId>camel-spring</artifactId>
<version>${camel-version}</version>
</dependency>
+
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$</version>
+ <version>${maven-compiler-plugin-version}</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -74,7 +74,6 @@
<artifactId>camel-maven-plugin</artifactId>
<version>${camel-version}</version>
</plugin>
-
</plugins>
</build>
</project>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml?rev=1076669&r1=1076668&r2=1076669&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
Thu Mar 3 16:32:49 2011
@@ -36,9 +36,11 @@
<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>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/log4j.properties?rev=1076669&r1=1076668&r2=1076669&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/log4j.properties
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/log4j.properties
Thu Mar 3 16:32:49 2011
@@ -16,16 +16,13 @@
## ------------------------------------------------------------------------
#
-# The logging properties used for eclipse testing, We want to see debug output
on the console.
+# The logging properties used
#
log4j.rootLogger=INFO, out
# uncomment the following line to turn on Camel debugging
#log4j.logger.org.apache.camel=DEBUG
-# uncomment the following line to turn on ActiveMQ debugging
-#log4j.logger.org.apache.activemq=DEBUG
-
log4j.logger.org.springframework=WARN
