Author: ningjiang
Date: Wed Aug 11 06:53:44 2010
New Revision: 984309
URL: http://svn.apache.org/viewvc?rev=984309&view=rev
Log:
CAMEL-3037 fix the issue of camel archetype
Modified:
camel/trunk/tooling/archetypes/camel-archetype-activemq/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-java/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-spring/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
Modified: camel/trunk/tooling/archetypes/camel-archetype-activemq/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-activemq/pom.xml?rev=984309&r1=984308&r2=984309&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-activemq/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-activemq/pom.xml Wed Aug 11
06:53:44 2010
@@ -49,7 +49,10 @@
<replacefilter token="$CAMEL_VERSION_REPLACEME$"
value="${project.version}" />
<replacefilter token="$ACTIVEMQ_VERSION_REPLACEME$"
value="${activemq-version}" />
<replacefilter token="$XBEAN_VERSION_REPLACEME$"
value="${xbean-spring-version}" />
- <replacefilter token="$LOG4J_VERSION_REPLACEME$"
value="${log4j-version}" />
+ <replacefilter token="$LOG4J_VERSION_REPLACEME$"
value="${log4j-version}" />
+ <replacefilter token="$SPRING_VESRION_REPLACEME$"
value="${spring-version}" />
+ <replacefilter token="$JAXB_API_VERSION_REPLACEME$"
value="${jaxb-api-version}" />
+ <replacefilter token="$JAXB_IMPL_VERSION_REPLACEME$"
value="${jaxb-version}" />
</replace>
</tasks>
</configuration>
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=984309&r1=984308&r2=984309&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 Aug 11 06:53:44 2010
@@ -34,6 +34,9 @@
<activemq-version>$ACTIVEMQ_VERSION_REPLACEME$</activemq-version>
<xbean-spring-version>$XBEAN_VERSION_REPLACEME$</xbean-spring-version>
<log4j-version>$LOG4J_VERSION_REPLACEME$</log4j-version>
+ <spring-version>$SPRING_VESRION_REPLACEME$</spring-version>
+ <jaxb-api-version>$JAXB_API_VERSION_REPLACEME$</jaxb-api-version>
+ <jaxb-impl-version>$JAXB_IMPL_VERSION_REPLACEME$</jaxb-impl-version>
</properties>
<dependencies>
@@ -66,7 +69,12 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean-spring-version}</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -96,4 +104,26 @@
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>jdk1.5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-impl-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
Modified: camel/trunk/tooling/archetypes/camel-archetype-java/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-java/pom.xml?rev=984309&r1=984308&r2=984309&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-java/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-java/pom.xml Wed Aug 11
06:53:44 2010
@@ -47,7 +47,9 @@
<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="$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}" />
</replace>
</tasks>
</configuration>
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=984309&r1=984308&r2=984309&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
Wed Aug 11 06:53:44 2010
@@ -32,6 +32,8 @@
<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>
@@ -71,7 +73,26 @@
<artifactId>camel-maven-plugin</artifactId>
<version>${camel-version}</version>
</plugin>
-
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>jdk1.5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-impl-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
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=984309&r1=984308&r2=984309&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-spring/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-spring/pom.xml Wed Aug 11
06:53:44 2010
@@ -47,7 +47,9 @@
<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="$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}" />
</replace>
</tasks>
</configuration>
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=984309&r1=984308&r2=984309&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 Aug 11 06:53:44 2010
@@ -32,6 +32,8 @@
<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>
@@ -74,4 +76,24 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>jdk1.5</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb-impl-version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
