Author: hadrian
Date: Thu Jun 9 13:37:25 2011
New Revision: 1133869
URL: http://svn.apache.org/viewvc?rev=1133869&view=rev
Log:
CAMEL-3799. Port to 2.7.x
Added:
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/
- copied from r1095469,
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/
- copied from r1095469,
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/
- copied from r1095469,
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
- copied unchanged from r1095469,
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/
- copied from r1095471,
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/
- copied from r1095471,
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/
- copied from r1095471,
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
- copied unchanged from r1095471,
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/
- copied from r1095475,
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/
- copied from r1095475,
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/
- copied from r1095475,
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
- copied unchanged from r1095475,
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/
- copied from r1095475,
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/
- copied from r1095475,
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/
- copied from r1095475,
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
- copied unchanged from r1095475,
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/
- copied from r1095476,
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/
- copied from r1095476,
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/
- copied from r1095476,
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
- copied unchanged from r1095476,
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/
- copied from r1095476,
camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/
- copied from r1095476,
camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/
- copied from r1095476,
camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
- copied unchanged from r1095476,
camel/trunk/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources-filtered/
- copied from r1095476,
camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources-filtered/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources-filtered/META-INF/
- copied from r1095476,
camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources-filtered/META-INF/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources-filtered/META-INF/maven/
- copied from r1095476,
camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources-filtered/META-INF/maven/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
- copied unchanged from r1095476,
camel/trunk/tooling/archetypes/camel-archetype-webconsole/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Removed:
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/src/main/resources/META-INF/maven/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/src/main/resources/META-INF/maven/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/src/main/resources/META-INF/maven/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/src/main/resources/META-INF/maven/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/src/main/resources/META-INF/maven/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/src/main/resources/META-INF/maven/
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/META-INF/maven/
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/pom.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/pom.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/pom.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/pom.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/pom.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/pom.xml
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/pom.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 9 13:37:25 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1102162,1104076,1124497,1131411
+/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1095469,1095471,1095475-1095476,1102162,1104076,1124497,1131411
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 9 13:37:25 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1102162,1104076,1124497,1131411
+/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1093978,1095405,1095469,1095471,1095475-1095476,1102162,1104076,1124497,1131411
Modified:
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/pom.xml?rev=1133869&r1=1133868&r2=1133869&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/pom.xml
(original)
+++
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-activemq/pom.xml
Thu Jun 9 13:37:25 2011
@@ -47,7 +47,7 @@
<filtering>false</filtering>
</resource>
<resource>
- <directory>src/main/resources</directory>
+ <directory>src/main/resources-filtered</directory>
<filtering>true</filtering>
<includes>
<include>**/archetype-metadata.xml</include>
Modified:
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/pom.xml?rev=1133869&r1=1133868&r2=1133869&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/pom.xml
(original)
+++
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-component/pom.xml
Thu Jun 9 13:37:25 2011
@@ -47,7 +47,7 @@
<filtering>false</filtering>
</resource>
<resource>
- <directory>src/main/resources</directory>
+ <directory>src/main/resources-filtered</directory>
<filtering>true</filtering>
<includes>
<include>**/archetype-metadata.xml</include>
Modified:
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/pom.xml?rev=1133869&r1=1133868&r2=1133869&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/pom.xml
(original)
+++ camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-java/pom.xml
Thu Jun 9 13:37:25 2011
@@ -47,7 +47,7 @@
<filtering>false</filtering>
</resource>
<resource>
- <directory>src/main/resources</directory>
+ <directory>src/main/resources-filtered</directory>
<filtering>true</filtering>
<includes>
<include>**/archetype-metadata.xml</include>
Modified:
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/pom.xml?rev=1133869&r1=1133868&r2=1133869&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/pom.xml
(original)
+++ camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/pom.xml
Thu Jun 9 13:37:25 2011
@@ -47,7 +47,7 @@
<filtering>false</filtering>
</resource>
<resource>
- <directory>src/main/resources</directory>
+ <directory>src/main/resources-filtered</directory>
<filtering>true</filtering>
<includes>
<include>**/archetype-metadata.xml</include>
Modified:
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/pom.xml?rev=1133869&r1=1133868&r2=1133869&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/pom.xml
(original)
+++
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-spring/pom.xml
Thu Jun 9 13:37:25 2011
@@ -47,7 +47,7 @@
<filtering>false</filtering>
</resource>
<resource>
- <directory>src/main/resources</directory>
+ <directory>src/main/resources-filtered</directory>
<filtering>true</filtering>
<includes>
<include>**/archetype-metadata.xml</include>
Modified:
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/pom.xml?rev=1133869&r1=1133868&r2=1133869&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/pom.xml
(original)
+++ camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-web/pom.xml
Thu Jun 9 13:37:25 2011
@@ -47,7 +47,7 @@
<filtering>false</filtering>
</resource>
<resource>
- <directory>src/main/resources</directory>
+ <directory>src/main/resources-filtered</directory>
<filtering>true</filtering>
<includes>
<include>**/archetype-metadata.xml</include>
Modified:
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/pom.xml?rev=1133869&r1=1133868&r2=1133869&view=diff
==============================================================================
---
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/pom.xml
(original)
+++
camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-webconsole/pom.xml
Thu Jun 9 13:37:25 2011
@@ -47,7 +47,7 @@
<filtering>false</filtering>
</resource>
<resource>
- <directory>src/main/resources</directory>
+ <directory>src/main/resources-filtered</directory>
<filtering>true</filtering>
<includes>
<include>**/archetype-metadata.xml</include>
