Author: davsclaus
Date: Sun Jan 8 16:03:53 2012
New Revision: 1228880
URL: http://svn.apache.org/viewvc?rev=1228880&view=rev
Log:
CAMEL-4874: Camel archetype for java and scala, should not have spring included
by default.
Added:
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/scala/MyRouteMain.scala
- copied unchanged from r1228879,
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/scala/MyRouteMain.scala
Removed:
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-http/ (props changed)
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/scala/MyRouteBuilder.scala
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 8 16:03:53 2012
@@ -1 +1 @@
-/camel/trunk:1227209,1227212,1227540,1228015,1228027,1228223
+/camel/trunk:1227209,1227212,1227540,1228015,1228027,1228223,1228879
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jan 8 16:03:53 2012
@@ -1 +1 @@
-/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223
+/camel/trunk:1-1227196,1227209,1227212,1227540,1228015,1228027,1228223,1228879
Propchange: camel/branches/camel-2.9.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 8 16:03:53 2012
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1227209,1227212,1228015,1228027,1228223
+/camel/trunk/components/camel-http:917526,1227209,1227212,1228015,1228027,1228223,1228879
Modified:
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt?rev=1228880&r1=1228879&r2=1228880&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
Sun Jan 8 16:03:53 2012
@@ -1,5 +1,5 @@
Camel Router with Scala DSL Project
-=====================
+===================================
To compile you run:
@@ -7,7 +7,7 @@ To compile you run:
To run this route:
- mvn camel:run
+ mvn exec:java
For more help see the Apache Camel documentation
Modified:
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml?rev=1228880&r1=1228879&r2=1228880&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
Sun Jan 8 16:03:53 2012
@@ -40,12 +40,7 @@
<artifactId>camel-scala</artifactId>
<version>${camel-version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <version>${camel-version}</version>
- </dependency>
-
+
<!-- scala -->
<dependency>
<groupId>org.scala-lang</groupId>
@@ -126,13 +121,15 @@
</configuration>
</plugin>
- <!-- allows the route to be run via 'mvn camel:run' -->
+ <!-- allows the route to be run via 'mvn exec:java' -->
<plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
- <version>${camel-version}</version>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <configuration>
+ <mainClass>${package}.MyRouteMain</mainClass>
+ </configuration>
</plugin>
-
+
</plugins>
</build>
Modified:
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/scala/MyRouteBuilder.scala
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/scala/MyRouteBuilder.scala?rev=1228880&r1=1228879&r2=1228880&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/scala/MyRouteBuilder.scala
(original)
+++
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/scala/MyRouteBuilder.scala
Sun Jan 8 16:03:53 2012
@@ -30,7 +30,7 @@ class MyRouteBuilder extends RouteBuilde
}
// a route using Scala blocks
- "timer://foo?fixedRate=true&delay=5s&period=10s" ==> {
+ "timer://foo?period=5s" ==> {
process(myProcessorMethod)
to("log:block")
}
Modified:
camel/branches/camel-2.9.x/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/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml?rev=1228880&r1=1228879&r2=1228880&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
(original)
+++
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/camel-context.xml
Sun Jan 8 16:03:53 2012
@@ -26,11 +26,9 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd">
<camel:camelContext xmlns="http://camel.apache.org/schema/spring">
- <camel:package>${package}</camel:package>
<!-- here is a sample which processes the input files
(leaving them in place - see the 'noop' flag)
- then performs content based routing on the message
- using XPath -->
+ then performs content based routing on the message using XPath -->
<camel:route>
<camel:from uri="file:src/data?noop=true"/>
<camel:choice>
Modified:
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml?rev=1228880&r1=1228879&r2=1228880&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
camel/branches/camel-2.9.x/tooling/archetypes/camel-archetype-webconsole/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
Sun Jan 8 16:03:53 2012
@@ -48,8 +48,6 @@
routing on the messages using XPath.
-->
<camelContext xmlns="http://camel.apache.org/schema/spring">
- <!-- scan pacakge for RouteBuilder Java DSL classes -->
- <package>${package}</package>
<route>
<from uri="file:src/data?noop=true"/>