Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 095F8BA25 for ; Sun, 8 Jan 2012 16:04:17 +0000 (UTC) Received: (qmail 30275 invoked by uid 500); 8 Jan 2012 16:04:16 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 30213 invoked by uid 500); 8 Jan 2012 16:04:16 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 30206 invoked by uid 99); 8 Jan 2012 16:04:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2012 16:04:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2012 16:04:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0404323888CD for ; Sun, 8 Jan 2012 16:03:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1228880 - in /camel/branches/camel-2.9.x: ./ components/camel-http/ tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/r... Date: Sun, 08 Jan 2012 16:03:53 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120108160354.0404323888CD@eris.apache.org> 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 @@ camel-scala ${camel-version} - - org.apache.camel - camel-spring - ${camel-version} - - + org.scala-lang @@ -126,13 +121,15 @@ - + - org.apache.camel - camel-maven-plugin - ${camel-version} + org.codehaus.mojo + exec-maven-plugin + + ${package}.MyRouteMain + - + 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"> - ${package} + then performs content based routing on the message using XPath --> 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. --> - - ${package}