date:20130102

Author: bvahdat
Date: Thu Jan  3 05:39:03 2013
New Revision: 1428172

URL: http://svn.apache.org/viewvc?rev=1428172&view=rev
Log:
Removed the second definition of 'commons-jxpath-version' inside the parent 
pom. Also added back the removed version properties inside the parent pom 
through the previous commit as they're used by the karaf features (my bad).

Modified:
camel/trunk/parent/pom.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1428172&r1=1428171&r2=1428172&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Jan  3 05:39:03 2013
@@ -78,6 +78,7 @@
 1.8
 1.0-r706899_5
 1.2
+1.0.5
 1.4_3
 1.4
 2.1
@@ -85,13 +86,14 @@
 
3.1_7
 1.4_3
 1.4
+2.0.1
 1.3
 2.6
 2.5
 1.1.1
+2.2
 3.2
 1.6
-1.3
 2.0
 1.3.2
 2.7.1

svn commit: r844659 - in /websites/production/camel/content: cache/main.pageCache camel-2110-release.html

2013-01-02 Thread buildbot

Author: buildbot
Date: Wed Jan  2 21:18:33 2013
New Revision: 844659

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2110-release.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/camel-2110-release.html
==
--- websites/production/camel/content/camel-2110-release.html (original)
+++ websites/production/camel/content/camel-2110-release.html Wed Jan  2 
21:18:33 2013
@@ -144,7 +144,7 @@
 
 Dependency Upgrades
 
-Aries Blueprint 0.3 to 1.0.0Async Http Client 1.7.5 to 
1.7.9Avro 1.6.2 to 1.7.2AWS 1.3.10 to 1.3.14Axiom 
1.2.10 to 1.2.12BeanIO 2.0.0 to 2.0.2Commons Exec 1.0.1 to 
1.1ConcurrentLinkedHashMap 1.2 to 1.3.2Ehcache 2.5.1 to 
2.6.0Groovy 1.8.6 to 2.0.6GSon 2.1 to 2.2.2Hazelcast 
2.0.2 to 2.4HBase 0.90.5 to 0.94.2HTTP Client 4.1.3 to 
4.2.2Icu4j 4.0.1 to 4.8.1.1Jackson 1.9.7 to 
1.9.10Jaxen 1.1.3 to 1.1.4JClouds 1.4.0 to 
1.5.4Jettison 1.3.1 to 1.3.2Jetty 7.5.4 to 
7.6.8JRuby 1.6.7 to 1.7.1JT400 6.0 to 6.7Krati 0.4.5 
to 0.4.6LevelDBJNI 1.2 to 1.3Lucene 3.6.0 to 
3.6.1Mina 2.0.4 to 2.0.7MongoDB Java Driver 2.7.3 to 
2.9.1MQTTClient 1.2 to 1.4Netty 3.5.1 to 3.5.11Ognl 
bundle 3.0.4_1 to 3.0.5_1OSGi 4.2.0 to 4.3.0<
 li>Pax Logging 1.5.3 to 1.6.10QPid 0.16 to 0.18Quartz 1.8.5 
to 1.8.6Restlet 2.0.14 to 2.0.15Saxon 9.3.0.11 to 
9.4.0.1Scala 2.9.1 to 2.9.2Shiro 1.2.0 to 1.2.1SLF4J 
1.6.6 to 1.7.2Solr 3.6.0 to 3.6.1Spring Batch 2.1.8 to 
2.1.9Spring Framework 3.1.1 to 3.1.2Spring Integration 2.1.2 
to 2.1.4Spring Security 3.1.0 to 3.1.3SSHD 0.6.0 to 
0.8.0StringTemplate 3.2.1 to 4.0.2TestNG 6.0.1 to 
6.8TWitter4j 2.2.5 to 3.0.3Woodstox 4.1.2 to 
4.1.3XStream 1.4.2 to 1.4.3
+Aries Blueprint 0.3 to 1.0.0Async Http Client 1.7.5 to 
1.7.9Avro 1.6.2 to 1.7.2AWS 1.3.10 to 1.3.14Axiom 
1.2.10 to 1.2.12BeanIO 2.0.0 to 2.0.2Commons CSV (ServiceMix 
Bundle) 1.0-r706900_3 to 1.0-r706899_5Commons Exec 1.0.1 to 
1.1Commons Net 3.1 to 3.2ConcurrentLinkedHashMap 1.2 to 
1.3.2Ehcache 2.5.1 to 2.6.0Groovy 1.8.6 to 2.0.6GSon 
2.1 to 2.2.2Hazelcast 2.0.2 to 2.4HBase 0.90.5 to 
0.94.2HTTP Client 4.1.3 to 4.2.2Icu4j 4.0.1 to 
4.8.1.1Jackson 1.9.7 to 1.9.10Jaxen 1.1.3 to 
1.1.4JClouds 1.4.0 to 1.5.4Jettison 1.3.1 to 
1.3.2Jetty 7.5.4 to 7.6.8JRuby 1.6.7 to 1.7.1JT400 
6.0 to 6.7Krati 0.4.5 to 0.4.6LevelDBJNI 1.2 to 
1.3Lucene 3.6.0 to 3.6.1Mina 2.0.4 to 2.0.7MongoDB 
Java Driver 2.7.3 to 2.9.1MQTTClient 1.2 to 1.4<
 /li>Netty 3.5.1 to 3.5.11Ognl bundle 3.0.4_1 to 
3.0.5_1OSGi 4.2.0 to 4.3.0Pax Logging 1.5.3 to 
1.6.10QPid 0.16 to 0.18Quartz 1.8.5 to 1.8.6Restlet 
2.0.14 to 2.0.15Saxon 9.3.0.11 to 9.4.0.1Scala 2.9.1 to 
2.9.2Shiro 1.2.0 to 1.2.1SLF4J 1.6.6 to 1.7.2Solr 
3.6.0 to 3.6.1Spring Batch 2.1.8 to 2.1.9Spring Framework 
3.1.1 to 3.1.2Spring Integration 2.1.2 to 2.1.4Spring 
Security 3.1.0 to 3.1.3SSHD 0.6.0 to 0.8.0StringTemplate 
3.2.1 to 4.0.2TestNG 6.0.1 to 6.8Twitter4j 2.2.5 to 
3.0.3Woodstox 4.1.2 to 4.1.3XStream 1.4.2 to 1.4.3
 
 
 Important 
changes to consider when upgrading

[CONF] Apache Camel > Camel 2.11.0 Release

Camel 2.11.0 Release
Page edited by Babak Vahdat

Changes (3)

...
* Axiom 1.2.10 to 1.2.12 * BeanIO 2.0.0 to 2.0.2
* Commons CSV (ServiceMix Bundle) 1.0-r706900_3 to 1.0-r706899_5
* Commons Exec 1.0.1 to 1.1
* Commons Net 3.1 to 3.2
* ConcurrentLinkedHashMap 1.2 to 1.3.2 * Ehcache 2.5.1 to 2.6.0
...
* StringTemplate 3.2.1 to 4.0.2 * TestNG 6.0.1 to 6.8
* TWwitter4j 2.2.5 to 3.0.3
* Woodstox 4.1.2 to 4.1.3 * XStream 1.4.2 to 1.4.3
...

Full Content

Camel 2.11.0 release (currently in progress)

New and Noteworthy

Welcome to the 2.11.0 release with approximately XXX issues resolved - including new features, improvements, and bug fixes, such as:

Added Binding support, so it is easy to combine things like a Data Format to an Endpoint for easier composition of routes.
Added support for SOAP 1.2 in SOAP data format.
Cache operation for add/update now supports expiry headers to control time to live/idle/eternal.
Added allowNullBody option to JMS to configure whether sending messages with no body is allowed.
Added connectOnStartup option to HDFS to allow to connect on demand, to avoid having Hadoop block for long time connecting to the HDFS cluster, as it has a hardcoded 15 minute retry mechanism.
Added support for daily and weekly trends to Twitter component.
The Camel Maven Archetypes now generates projects without any license headers.
Added 'rejectOld' option to the Resequencer to prevent out of order messages from being delivered after capacity/timeout events occur
Further optimized XPath under concurrent load, and as well ensured resources are cleaned up eagerly
Added options allowNullBody and readLockMinLength to the File and FTP components.
Made changed read lock strategy on FTP go faster (eg when the FTP server has a lot of files in the directory) if you enable the fastExistsCheck=true option as well. Notice that some FTP server may not support this.
HL7 moves to HAPI 2.0 and supports using a dedicated Parser instance in the HL7 MLLP codec and DataFormat. Added "Terser" language and _expression_ to be able to extract fields from a parsed message. HL7 now uses Apache Mina 2.x.
Add an option HttpMethodRestrict to restrict HTTP method in Jetty and SERVLET
Add support for selection of Direct-VM consumers by using ant-like path _expression_.
The POJO Producing, and POJO Consuming with @Consume, @Produce, @EndpointInject now supports a new {{property} attribute to get the endpoint configuration from a bean property (eg using a getter method); this allows you to configure this on the bean using conventional bean configuration.
Testing with camel-test-blueprint on Windows no longer tries to cleanup after testing taking up 5 seconds and logging WARNs.
The File, and FTP components now support fileExist=Move option to move any existing files before writing a file.
Added option loadStatisticsEnabled on Camel JMX to allow to disable load statistics if not needed (avoids a background thread being in use, to calculate the load stats).
Enabled "lazy connections" for XMPP providers via the testConnectionOnStartup option
Added a connection monitor to detect and fix dropped XMPP consumer connections at configurable connectionPollDelay intervals
Added an org.apache.camel.builder.ExchangeBuilder to build the Exchange using a builder pattern.
The Camel Run Maven Goal can now run CDI applications.
The Camel CDI component has improved a lot.
Added option allowRedeliveryWhileStopping to error handlers to control if redelivery is allowed during stopping/shutting down Camel or the route(s). Turning this option false allows to stop quicker by rejecting redelivery attempts.
Added support for specifying user info in Camel Endpoint urls, which contains the @ sign; now the @ sign can be given as is; without being encoded to %40.
Added robust connection support for JMX. Optional testConnectionOnStartup allows a JMX consumer to attach to a JMX server that becomes available after the JMX endpoint starts; reconnectOnConnectionFailure enables re-connection of failed JMX connections.
JAXB and SOAP data format now supports controlling namespace prefix mappings when marshalling (eg to avoid prefixes such as ns2, ns3, ns4 etc.)
Added support for using raw uris when Components create Endpoints. This gives component writers full power in case their component has special syntax/notation for endpoint uri configurations.
EIPs configured with custom AggregationStrategy will now strict check the custom strategy exists in the Registry and no longer fallback and use a default strategy if not.
Camel now logs on shutdown if any thread pools hasn't been properly shutdown, and will

svn commit: r1428013 - /camel/trunk/parent/pom.xml

Author: bvahdat
Date: Wed Jan  2 20:39:33 2013
New Revision: 1428013

URL: http://svn.apache.org/viewvc?rev=1428013&view=rev
Log:
Upgraded the commons-csv & commons-net dependencies as well as removed some 
non-used version properties inside the parent pom.

Modified:
camel/trunk/parent/pom.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1428013&r1=1428012&r2=1428013&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jan  2 20:39:33 2013
@@ -76,23 +76,20 @@
 1.6
 3.2.1
 1.8
-1.0-r706900_3
+1.0-r706899_5
 1.2
 1.4_3
 1.4
-1.0.5
 2.1
 1.1
 
3.1_7
 1.4_3
 1.4
-2.0.1
 1.3
 2.6
 2.5
 1.1.1
-2.2
-3.1
+3.2
 1.6
 1.3
 2.0

svn commit: r1427990 - in /camel/branches/camel-2.10.x: ./ components/camel-spring-batch/pom.xml components/camel-spring-batch/src/test/resources/log4j.properties

Author: bvahdat
Date: Wed Jan  2 20:09:56 2013
New Revision: 1427990

URL: http://svn.apache.org/viewvc?rev=1427990&view=rev
Log:
Merged revisions 1427989 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk


  r1427989 | bvahdat | 2013-01-02 21:06:34 +0100 (Mi, 02 Jan 2013) | 1 line
  
  Fixed the tests by camel-spring-batch to log properly (the slf4j static 
initialization used to fail). Also removed 2 obsolete dependencies from it's 
pom.


Added:

camel/branches/camel-2.10.x/components/camel-spring-batch/src/test/resources/log4j.properties
  - copied unchanged from r1427989, 
camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties
Modified:
camel/branches/camel-2.10.x/   (props changed)
camel/branches/camel-2.10.x/components/camel-spring-batch/pom.xml

Propchange: camel/branches/camel-2.10.x/
--
  Merged /camel/trunk:r1427989

Propchange: camel/branches/camel-2.10.x/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.10.x/components/camel-spring-batch/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-spring-batch/pom.xml?rev=1427990&r1=1427989&r2=1427990&view=diff
==
--- camel/branches/camel-2.10.x/components/camel-spring-batch/pom.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-spring-batch/pom.xml Wed Jan  
2 20:09:56 2013
@@ -50,14 +50,14 @@
 
 
 
-commons-lang
-commons-lang
-${commons-lang-version}
+org.slf4j
+slf4j-log4j12
 test
 
 
-junit
-junit
+commons-lang
+commons-lang
+${commons-lang-version}
 test
 
 
@@ -72,11 +72,6 @@
 
 
 org.apache.camel
-camel-core-xml
-test
-
-
-org.apache.camel
 camel-spring
 test

svn commit: r1427989 - in /camel/trunk/components/camel-spring-batch: pom.xml src/test/resources/log4j.properties

Author: bvahdat
Date: Wed Jan  2 20:06:34 2013
New Revision: 1427989

URL: http://svn.apache.org/viewvc?rev=1427989&view=rev
Log:
Fixed the tests by camel-spring-batch to log properly (the slf4j static 
initialization used to fail). Also removed 2 obsolete dependencies from it's 
pom.

Added:

camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties   
(with props)
Modified:
camel/trunk/components/camel-spring-batch/pom.xml

Modified: camel/trunk/components/camel-spring-batch/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-batch/pom.xml?rev=1427989&r1=1427988&r2=1427989&view=diff
==
--- camel/trunk/components/camel-spring-batch/pom.xml (original)
+++ camel/trunk/components/camel-spring-batch/pom.xml Wed Jan  2 20:06:34 2013
@@ -47,14 +47,14 @@
 
 
 
-commons-lang
-commons-lang
-${commons-lang-version}
+org.slf4j
+slf4j-log4j12
 test
 
 
-junit
-junit
+commons-lang
+commons-lang
+${commons-lang-version}
 test
 
 
@@ -69,11 +69,6 @@
 
 
 org.apache.camel
-camel-core-xml
-test
-
-
-org.apache.camel
 camel-spring
 test
 

Added: 
camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties?rev=1427989&view=auto
==
--- 
camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties 
(added)
+++ 
camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties 
Wed Jan  2 20:06:34 2013
@@ -0,0 +1,37 @@
+## 
+## 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.
+## 
+
+#
+# The logging properties used for testing.
+#
+log4j.rootLogger=INFO, file
+
+# uncomment the following line to turn on Camel debugging
+#log4j.logger.org.apache.camel=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - 
%m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - 
%m%n
+log4j.appender.file.file=target/camel-spring-ws-test.log
+log4j.appender.file.append=true

Propchange: 
camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties
--
svn:eol-style = native

svn commit: r1427865 - in /camel/trunk: parent/pom.xml platforms/karaf/features/src/main/resources/features.xml

Author: davsclaus
Date: Wed Jan  2 17:07:51 2013
New Revision: 1427865

URL: http://svn.apache.org/viewvc?rev=1427865&view=rev
Log:
CAMEL-5903: Fixed validation of karaf features.

Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1427865&r1=1427864&r2=1427865&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jan  2 17:07:51 2013
@@ -86,6 +86,7 @@
 
3.1_7
 1.4_3
 1.4
+2.0.1
 1.3
 2.6
 2.5
@@ -94,6 +95,7 @@
 3.1
 1.6
 1.3
+2.0
 1.3.2
 2.7.1
 [2.4,2.8)

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1427865&r1=1427864&r2=1427865&view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed 
Jan  2 17:07:51 2013
@@ -371,14 +371,16 @@
 mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}
 mvn:org.apache.camel/camel-hawtdb/${project.version}
   
-
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jcr-api-2.0/${servicemix-specs-version}
+mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.5.2
+mvn:org.apache.jackrabbit/jackrabbit-webdav/2.5.2
+mvn:org.apache.commons/commons-jexl/${commons-jexl2-version}
+mvn:org.apache.commons/commons-vfs2/${commons-vfs2-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}
+mvn:org.codehaus.jettison/jettison/${jettison-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snappy-java/${snappy-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.paranamer/${paranamer-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/${avro-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-bundle-version}
+mvn:javax.jmdns/jmdns/3.4.1
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libthrift/0.9.0_1
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_6
+mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}
+mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}
+mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-spec-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jets3t/0.9.0_2
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jopt-simple/4.3_1
+wrap:mvn:bsf/bsf/2.4.0
   
--->
-
+mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jcr-api-2.0/${servicemix-specs-version}
+mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.5.2
+mvn:org.apache.jackrabbit/jackrabbit-webdav/2.5.2
+mvn:org.apache.commons/commons-jexl/${commons-jexl2-version}
+mvn:org.apache.commons/commons-vfs2/${commons-vfs2-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}
   
--->
   
 camel-core
 mvn:org.apache.mina/mina-core/${mina2-version}

svn commit: r1427855 - in /camel/branches/camel-2.9.x: ./ tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java

Author: bvahdat
Date: Wed Jan  2 16:35:42 2013
New Revision: 1427855

URL: http://svn.apache.org/viewvc?rev=1427855&view=rev
Log:
Merged revisions 1427854 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


  r1427854 | bvahdat | 2013-01-02 17:33:26 +0100 (Mi, 02 Jan 2013) | 9 lines
  
  Merged revisions 1427853 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  
r1427853 | bvahdat | 2013-01-02 17:29:39 +0100 (Mi, 02 Jan 2013) | 1 line

Polished.
  


Modified:
camel/branches/camel-2.9.x/   (props changed)

camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java

Propchange: camel/branches/camel-2.9.x/
--
  Merged /camel/trunk:r1427853
  Merged /camel/branches/camel-2.10.x:r1427854

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java?rev=1427855&r1=1427854&r2=1427855&view=diff
==
--- 
camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java
 Wed Jan  2 16:35:42 2013
@@ -65,12 +65,11 @@ public class HeaderBasedRoutingPerforman
 
 resetMock(count);
 
-long start = System.currentTimeMillis();
+StopWatch watch = new StopWatch();
 execute(count);
-long end = System.currentTimeMillis();
 
 assertMockEndpointsSatisfied();
-log.warn("Run " +  count + " tests in " + (end - start) + "ms");
+log.warn("Ran {} tests in {}ms", count, watch.taken());
 }
 
 @Test
@@ -82,12 +81,11 @@ public class HeaderBasedRoutingPerforman
 
 resetMock(count);
 
-long start = System.currentTimeMillis();
+StopWatch watch = new StopWatch();
 execute(count);
-long end = System.currentTimeMillis();
 
 assertMockEndpointsSatisfied();
-log.warn("Run " +  count + " tests in " + (end - start) + "ms");
+log.warn("Ran {} tests in {}ms", count, watch.taken());
 }
 
 @Override

svn commit: r1427854 - in /camel/branches/camel-2.10.x: ./ tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java

Author: bvahdat
Date: Wed Jan  2 16:33:26 2013
New Revision: 1427854

URL: http://svn.apache.org/viewvc?rev=1427854&view=rev
Log:
Merged revisions 1427853 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk


  r1427853 | bvahdat | 2013-01-02 17:29:39 +0100 (Mi, 02 Jan 2013) | 1 line
  
  Polished.


Modified:
camel/branches/camel-2.10.x/   (props changed)

camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java

Propchange: camel/branches/camel-2.10.x/
--
  Merged /camel/trunk:r1427853

Propchange: camel/branches/camel-2.10.x/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java?rev=1427854&r1=1427853&r2=1427854&view=diff
==
--- 
camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java
 (original)
+++ 
camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java
 Wed Jan  2 16:33:26 2013
@@ -65,12 +65,11 @@ public class HeaderBasedRoutingPerforman
 
 resetMock(count);
 
-long start = System.currentTimeMillis();
+StopWatch watch = new StopWatch();
 execute(count);
-long end = System.currentTimeMillis();
 
 assertMockEndpointsSatisfied();
-log.warn("Run " +  count + " tests in " + (end - start) + "ms");
+log.warn("Ran {} tests in {}ms", count, watch.taken());
 }
 
 @Test
@@ -82,12 +81,11 @@ public class HeaderBasedRoutingPerforman
 
 resetMock(count);
 
-long start = System.currentTimeMillis();
+StopWatch watch = new StopWatch();
 execute(count);
-long end = System.currentTimeMillis();
 
 assertMockEndpointsSatisfied();
-log.warn("Run " +  count + " tests in " + (end - start) + "ms");
+log.warn("Ran {} tests in {}ms", count, watch.taken());
 }
 
 @Override

svn commit: r1427853 - /camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java

Author: bvahdat
Date: Wed Jan  2 16:29:39 2013
New Revision: 1427853

URL: http://svn.apache.org/viewvc?rev=1427853&view=rev
Log:
Polished.

Modified:

camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java

Modified: 
camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java?rev=1427853&r1=1427852&r2=1427853&view=diff
==
--- 
camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java
 (original)
+++ 
camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java
 Wed Jan  2 16:29:39 2013
@@ -65,12 +65,11 @@ public class HeaderBasedRoutingPerforman
 
 resetMock(count);
 
-long start = System.currentTimeMillis();
+StopWatch watch = new StopWatch();
 execute(count);
-long end = System.currentTimeMillis();
 
 assertMockEndpointsSatisfied();
-log.warn("Run " +  count + " tests in " + (end - start) + "ms");
+log.warn("Ran {} tests in {}ms", count, watch.taken());
 }
 
 @Test
@@ -82,12 +81,11 @@ public class HeaderBasedRoutingPerforman
 
 resetMock(count);
 
-long start = System.currentTimeMillis();
+StopWatch watch = new StopWatch();
 execute(count);
-long end = System.currentTimeMillis();
 
 assertMockEndpointsSatisfied();
-log.warn("Run " +  count + " tests in " + (end - start) + "ms");
+log.warn("Ran {} tests in {}ms", count, watch.taken());
 }
 
 @Override

svn commit: r1427849 - in /camel/branches/camel-2.9.x: ./ tests/camel-performance/src/test/java/org/apache/camel/test/perf/

Author: bvahdat
Date: Wed Jan  2 16:24:00 2013
New Revision: 1427849

URL: http://svn.apache.org/viewvc?rev=1427849&view=rev
Log:
Merged revisions 1427844 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x


  r1427844 | bvahdat | 2013-01-02 17:18:40 +0100 (Mi, 02 Jan 2013) | 9 lines
  
  Merged revisions 1427825 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  
r1427825 | bvahdat | 2013-01-02 16:33:34 +0100 (Mi, 02 Jan 2013) | 1 line

Polished (only backported the camel-performance part of this commit).
  


Modified:
camel/branches/camel-2.9.x/   (props changed)

camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java

camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java

camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java

camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/SplitterPerformanceTest.java

camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java

camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XQueryBasedRoutingPerformanceTest.java

camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XsltPerformanceTest.java

Propchange: camel/branches/camel-2.9.x/
--
  Merged /camel/trunk:r1427825
  Merged /camel/branches/camel-2.10.x:r1427844

Propchange: camel/branches/camel-2.9.x/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java?rev=1427849&r1=1427848&r2=1427849&view=diff
==
--- 
camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java
 Wed Jan  2 16:24:00 2013
@@ -56,9 +56,4 @@ public abstract class AbstractBasePerfor
 public boolean isCreateCamelContextPerClass() {
 return true;
 }
-
-@Override
-protected boolean useJmx() {
-return false;
-}
 }
\ No newline at end of file

Modified: 
camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java?rev=1427849&r1=1427848&r2=1427849&view=diff
==
--- 
camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java
 Wed Jan  2 16:24:00 2013
@@ -17,6 +17,7 @@
 package org.apache.camel.test.perf;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.util.StopWatch;
 import org.junit.Test;
 
 public class ContentBasedRoutingPerformanceTest extends 
AbstractBasePerformanceTest {
@@ -32,12 +33,11 @@ public class ContentBasedRoutingPerforma
 
 resetMock(count);
 
-long start = System.currentTimeMillis();
+StopWatch watch = new StopWatch();
 execute(count);
-long end = System.currentTimeMillis();
-
+
 assertMockEndpointsSatisfied();
-log.warn("Run " +  count + " tests in " + (end - start) + "ms");
+log.warn("Ran {} tests in {}ms", count, watch.taken());
 }
 
 @Test
@@ -49,12 +49,11 @@ public class ContentBasedRoutingPerforma
 
 resetMock(count);
 
-long start = System.currentTimeMillis();
+StopWatch watch = new StopWatch();
 execute(count);
-long end = System.currentTimeMillis();
-
+
 assertMockEndpointsSatisfied();
-log.warn("Run " +  count + " tests in " + (end - start) + "ms");
+log.warn("Ran {} tests in {}ms", count, watch.taken());
 }
 
 @Test
@@ -66,12 +65,11 @@ public class ContentBasedRoutingPerforma
 
 resetMock(count);
 
-

svn commit: r1427844 - in /camel/branches/camel-2.10.x: ./ tests/camel-performance/src/test/java/org/apache/camel/test/perf/

Author: bvahdat
Date: Wed Jan  2 16:18:40 2013
New Revision: 1427844

URL: http://svn.apache.org/viewvc?rev=1427844&view=rev
Log:
Merged revisions 1427825 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk


  r1427825 | bvahdat | 2013-01-02 16:33:34 +0100 (Mi, 02 Jan 2013) | 1 line
  
  Polished (only backported the camel-performance part of this commit).


Modified:
camel/branches/camel-2.10.x/   (props changed)

camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java

camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java

camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java

camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/SplitterPerformanceTest.java

camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java

camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XQueryBasedRoutingPerformanceTest.java

camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XsltPerformanceTest.java

Propchange: camel/branches/camel-2.10.x/
--
  Merged /camel/trunk:r1427825

Propchange: camel/branches/camel-2.10.x/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java?rev=1427844&r1=1427843&r2=1427844&view=diff
==
--- 
camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java
 (original)
+++ 
camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java
 Wed Jan  2 16:18:40 2013
@@ -58,9 +58,4 @@ public abstract class AbstractBasePerfor
 public boolean isCreateCamelContextPerClass() {
 return true;
 }
-
-@Override
-protected boolean useJmx() {
-return false;
-}
 }
\ No newline at end of file

Modified: 
camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java?rev=1427844&r1=1427843&r2=1427844&view=diff
==
--- 
camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java
 (original)
+++ 
camel/branches/camel-2.10.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java
 Wed Jan  2 16:18:40 2013
@@ -17,6 +17,7 @@
 package org.apache.camel.test.perf;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.util.StopWatch;
 import org.junit.Test;
 
 public class ContentBasedRoutingPerformanceTest extends 
AbstractBasePerformanceTest {
@@ -32,12 +33,11 @@ public class ContentBasedRoutingPerforma
 
 resetMock(count);
 
-long start = System.currentTimeMillis();
+StopWatch watch = new StopWatch();
 execute(count);
-long end = System.currentTimeMillis();
-
+
 assertMockEndpointsSatisfied();
-log.warn("Run " +  count + " tests in " + (end - start) + "ms");
+log.warn("Ran {} tests in {}ms", count, watch.taken());
 }
 
 @Test
@@ -49,12 +49,11 @@ public class ContentBasedRoutingPerforma
 
 resetMock(count);
 
-long start = System.currentTimeMillis();
+StopWatch watch = new StopWatch();
 execute(count);
-long end = System.currentTimeMillis();
-
+
 assertMockEndpointsSatisfied();
-log.warn("Run " +  count + " tests in " + (end - start) + "ms");
+log.warn("Ran {} tests in {}ms", count, watch.taken());
 }
 
 @Test
@@ -66,12 +65,11 @@ public class ContentBasedRoutingPerforma
 
 resetMock(count);
 
-long start = System.currentTimeMillis();
+StopWatch watch = new StopWatch();
 execute(count);
-long end = System.currentTimeMillis();
 
 assertMockEndpointsSatisfied();
-log.warn("Run " +  count + " tests in " + (end - s

svn commit: r1427842 - in /camel/trunk/components: camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/ camel-http/src/main/java/org/apache/camel/component/http/helper/ camel-http4/src/mai

Author: bvahdat
Date: Wed Jan  2 16:17:49 2013
New Revision: 1427842

URL: http://svn.apache.org/viewvc?rev=1427842&view=rev
Log:
Fixed CS.

Modified:

camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java

camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java

camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java

Modified: 
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java?rev=1427842&r1=1427841&r2=1427842&view=diff
==
--- 
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
 (original)
+++ 
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java
 Wed Jan  2 16:17:49 2013
@@ -29,8 +29,8 @@ import org.apache.camel.dataformat.bindy
 import org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Trailer;
 import org.apache.camel.impl.DefaultPackageScanClassResolver;
 import org.apache.camel.spi.PackageScanClassResolver;
-import org.junit.Before;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: 
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java?rev=1427842&r1=1427841&r2=1427842&view=diff
==
--- 
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
 (original)
+++ 
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
 Wed Jan  2 16:17:49 2013
@@ -378,8 +378,8 @@ public final class HttpHelper {
 }
 }
 if (request == null) {
-throw new IllegalArgumentException("UrlRewrite " + 
endpoint.getUrlRewrite() + " requires the message body to be a" +
-"HttpServletRequest instance, but was: " + 
ObjectHelper.className(exchange.getIn().getBody()));
+throw new IllegalArgumentException("UrlRewrite " + 
endpoint.getUrlRewrite() + " requires the message body to be a"
++ "HttpServletRequest instance, but was: " + 
ObjectHelper.className(exchange.getIn().getBody()));
 }
 // we need to adapt the context-path to be the path from the 
endpoint, if it came from a http based endpoint
 // as eg camel-jetty have hardcoded context-path as / for all 
its servlets/endpoints

Modified: 
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java?rev=1427842&r1=1427841&r2=1427842&view=diff
==
--- 
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
 (original)
+++ 
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
 Wed Jan  2 16:17:49 2013
@@ -431,8 +431,8 @@ public final class HttpHelper {
 }
 }
 if (request == null) {
-throw new IllegalArgumentException("UrlRewrite " + 
endpoint.getUrlRewrite() + " requires the message body to be a" +
-"HttpServletRequest instance, but was: " + 
ObjectHelper.className(exchange.getIn().getBody()));
+throw new IllegalArgumentException("UrlRewrite " + 
endpoint.getUrlRewrite() + " requires the message body to be a"
++ "HttpServletRequest instance, but was: " + 
ObjectHelper.className(exchange.getIn().getBody()));
 }
 // we need to adapt the context-path to be the path from the 
endpoint, if it came from a http based endpoint
 // as eg camel-jetty have hardcoded context-path as / for all 
its servlets/endpoints

svn commit: r1427833 - in /camel/trunk: components/camel-redis/ components/camel-redis/src/test/java/org/apache/camel/component/redis/ components/camel-redis/src/test/java/org/apache/camel/component/r

Author: davsclaus
Date: Wed Jan  2 15:52:16 2013
New Revision: 1427833

URL: http://svn.apache.org/viewvc?rev=1427833&view=rev
Log:
CAMEL-5903: Fixed validation of karaf features. Upgraded to redis 1.0.2

Modified:
camel/trunk/components/camel-redis/pom.xml

camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java

camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/components/camel-redis/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-redis/pom.xml?rev=1427833&r1=1427832&r2=1427833&view=diff
==
--- camel/trunk/components/camel-redis/pom.xml (original)
+++ camel/trunk/components/camel-redis/pom.xml Wed Jan  2 15:52:16 2013
@@ -46,6 +46,7 @@
 spring-data-redis
 ${spring-data-redis-version}
 
+
 
 org.apache.camel
 camel-test
@@ -63,10 +64,6 @@
 
 
 org.slf4j
-slf4j-api
-
-
-org.slf4j
 slf4j-log4j12
 test
 
@@ -76,17 +73,5 @@
 test
 
 
-
-
-
-org.apache.maven.plugins
-maven-compiler-plugin
-2.3.2
-
-1.6
-1.6
-
-
-
-
+
 

Modified: 
camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java?rev=1427833&r1=1427832&r2=1427833&view=diff
==
--- 
camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
 (original)
+++ 
camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/RedisConsumerTest.java
 Wed Jan  2 15:52:16 2013
@@ -63,8 +63,9 @@ public class RedisConsumerTest extends C
 
 Topic firstTopic = topicIterator.next();
 Topic twoTopic = topicIterator.next();
-assertThat(firstTopic.getTopic(), is("one"));
-assertThat(twoTopic.getTopic(), is("two"));
+
+assertEquals("one", firstTopic.getTopic());
+assertEquals("two", twoTopic.getTopic());
 }
 
 @Test

Modified: 
camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java?rev=1427833&r1=1427832&r2=1427833&view=diff
==
--- 
camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java
 (original)
+++ 
camel/trunk/components/camel-redis/src/test/java/org/apache/camel/component/redis/processor/idempotent/RedisIdempotentRepositoryTest.java
 Wed Jan  2 15:52:16 2013
@@ -21,8 +21,7 @@ import org.junit.Test;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.SetOperations;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -63,6 +62,6 @@ public class RedisIdempotentRepositoryTe
 @Test
 public void shouldReturnProcessorName() {
 String processorName = idempotentRepository.getProcessorName();
-assertThat(processorName, is(REPOSITORY));
+assertEquals(REPOSITORY, processorName);
 }
 }

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1427833&r1=1427832&r2=1427833&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jan  2 15:52:16 2013
@@ -40,7 +40,8 @@
 5.7.0
 1.7.9
 1.7.0_6
-2.7.7_5
+3.4_1
+3.4_2
 1.0_6
 1.5.7
 0.7.2
@@ -74,7 +75,6 @@
 
1.8.3_1
 1.6
 3.2.1
-
1.8_1
 1.8
 1.0-r706900_3
 1.2
@@ -303,7 +303,7 @@
 3.6.1
 2.1.9.RELEASE
 1.2.0
-1.0.0.RELEASE
+1.0.2.RELEASE
 2.1.4.RELEASE
 1.0.0-20090215
 2.1.0.RELEASE

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc

svn commit: r1427825 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/util/ camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/

Author: bvahdat
Date: Wed Jan  2 15:33:34 2013
New Revision: 1427825

URL: http://svn.apache.org/viewvc?rev=1427825&view=rev
Log:
Polished.

Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java

camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperOneWayTest.java

camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/pojomessage/PojoProxyHelperRequestReplyTest.java

camel/trunk/camel-core/src/test/java/org/apache/camel/util/URISupportTest.java

camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java

camel/trunk/components/camel-avro/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java

camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java

camel/trunk/components/camel-aws/src/test/java/org/apache/camel/component/aws/sns/AmazonSNSClientMock.java

camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java

camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java

camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java

camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindyComplexKeyValuePairStandaloneTest.java

camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java

camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyRouteBuilder.java

camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java

camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpConsumer.java

camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java

camel/trunk/components/camel-jmx/src/test/java/org/apache/camel/component/jmx/JMXMonitorTypeLongCounterTest.java

camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConstants.java

camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java

camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerTest.java

camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ConsumerWSAEndpointMappingRouteTest.java

camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java

camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java

camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java

camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java

camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketConsumerRouteTest.java

camel/trunk/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java

camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java

camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java

camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java

camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/SplitterPerformanceTest.java

camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java

camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XQueryBasedRoutingPerformanceTest.java

camel/trunk/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XsltPerformanceTest.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java?rev=1427825&r1=1427824&r2=1427825&view=diff
==
--- camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java 
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/TypeConverter.java 
Wed Jan  2 15:33:34 2013
@@ -58,7 +58,7 @@ public interface TypeConverter {
  * @param value the value to be converted
  * @return the converted value, is never null
  * @throws TypeConversionException is thrown if error during type 
co

svn commit: r1427823 - in /camel/trunk: parent/pom.xml platforms/karaf/features/src/main/resources/features.xml

Author: davsclaus
Date: Wed Jan  2 15:15:40 2013
New Revision: 1427823

URL: http://svn.apache.org/viewvc?rev=1427823&view=rev
Log:
CAMEL-5903: More osgi dependency upgrades.

Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1427823&r1=1427822&r2=1427823&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jan  2 15:15:40 2013
@@ -74,6 +74,7 @@
 
1.8.3_1
 1.6
 3.2.1
+
1.8_1
 1.8
 1.0-r706900_3
 1.2
@@ -283,6 +284,7 @@
 9.4.0.4_1
 9.4.0.4
 2.9.2_2
+2.9.2_1
 2.9.2
 3.1.0
 1.1
@@ -348,7 +350,7 @@
 2.5.0
 1.2_5
 3.1.3
-
3.1.3_1-SNAPSHOT
+3.1.3_1
 2.0
 1.5.1
 1.3

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1427823&r1=1427822&r2=1427823&view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed 
Jan  2 15:15:40 2013
@@ -380,6 +380,7 @@
 mvn:javax.mail/mail/${javax-mail-version}
 mvn:commons-codec/commons-codec/${commons-codec-version}
 mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-configuration/${commons-configuration-bundle-version}
 mvn:commons-collections/commons-collections/${commons-collections-version}
 mvn:commons-digester/commons-digester/${commons-digester-version}
 mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}
@@ -683,7 +684,7 @@
 mvn:org.apache.camel/camel-saxon/${project.version}
   
   
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-bundle-version}
+mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-library-bundle-version}
 camel-core
 mvn:org.apache.camel/camel-scala/${project.version}

svn commit: r1427816 - in /camel/branches/camel-2.10.x: ./ components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java

Author: bvahdat
Date: Wed Jan  2 15:02:27 2013
New Revision: 1427816

URL: http://svn.apache.org/viewvc?rev=1427816&view=rev
Log:
Merged revisions 1427815 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk


  r1427815 | bvahdat | 2013-01-02 16:01:18 +0100 (Mi, 02 Jan 2013) | 1 line
  
  Overrided the toString() method by RemoteFile to avoid mix-up/confusion with 
the GenericFile type while people look at their application logs or debug them.


Modified:
camel/branches/camel-2.10.x/   (props changed)

camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java

Propchange: camel/branches/camel-2.10.x/
--
  Merged /camel/trunk:r1427815

Propchange: camel/branches/camel-2.10.x/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java?rev=1427816&r1=1427815&r2=1427816&view=diff
==
--- 
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
 Wed Jan  2 15:02:27 2013
@@ -72,4 +72,9 @@ public class RemoteFile extends Gener
 remoteResult.setHostname(remoteSource.getHostname());
 }
 
+@Override
+public String toString() {
+return "RemoteFile[" + (isAbsolute() ? getAbsoluteFilePath() : 
getRelativeFilePath()) + "]";
+}
+
 }

svn commit: r1427815 - /camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java

Author: bvahdat
Date: Wed Jan  2 15:01:18 2013
New Revision: 1427815

URL: http://svn.apache.org/viewvc?rev=1427815&view=rev
Log:
Overrided the toString() method by RemoteFile to avoid mix-up/confusion with 
the GenericFile type while people look at their application logs or debug them.

Modified:

camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java

Modified: 
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java?rev=1427815&r1=1427814&r2=1427815&view=diff
==
--- 
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
 (original)
+++ 
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
 Wed Jan  2 15:01:18 2013
@@ -72,4 +72,9 @@ public class RemoteFile extends Gener
 remoteResult.setHostname(remoteSource.getHostname());
 }
 
+@Override
+public String toString() {
+return "RemoteFile[" + (isAbsolute() ? getAbsoluteFilePath() : 
getRelativeFilePath()) + "]";
+}
+
 }

svn commit: r1427809 - in /camel/branches/camel-2.10.x: ./ components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Author: bvahdat
Date: Wed Jan  2 14:57:12 2013
New Revision: 1427809

URL: http://svn.apache.org/viewvc?rev=1427809&view=rev
Log:
Merged revisions 1427806 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk


  r1427806 | bvahdat | 2013-01-02 15:54:28 +0100 (Mi, 02 Jan 2013) | 1 line
  
  CAMEL-5877: Fixed the typo in case the value is of the type Source.


Modified:
camel/branches/camel-2.10.x/   (props changed)

camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Propchange: camel/branches/camel-2.10.x/
--
  Merged /camel/trunk:r1427806

Propchange: camel/branches/camel-2.10.x/
--
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1427809&r1=1427808&r2=1427809&view=diff
==
--- 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 Wed Jan  2 14:57:12 2013
@@ -126,7 +126,7 @@ public final class CxfPayloadConverter {
 } else if (value instanceof Node) {
 src = new DOMSource((Node)value);
 } else if (value instanceof Source) {
-src = (Source)src;
+src = (Source)value;
 }
 if (src == null) {
 // assuming staxsource is preferred, otherwise use the one 
preferred

svn commit: r1427806 - /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Author: bvahdat
Date: Wed Jan  2 14:54:28 2013
New Revision: 1427806

URL: http://svn.apache.org/viewvc?rev=1427806&view=rev
Log:
CAMEL-5877: Fixed the typo in case the value is of the type Source.

Modified:

camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1427806&r1=1427805&r2=1427806&view=diff
==
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 Wed Jan  2 14:54:28 2013
@@ -126,7 +126,7 @@ public final class CxfPayloadConverter {
 } else if (value instanceof Node) {
 src = new DOMSource((Node)value);
 } else if (value instanceof Source) {
-src = (Source)src;
+src = (Source)value;
 }
 if (src == null) {
 // assuming staxsource is preferred, otherwise use the one 
preferred

svn commit: r844623 - in /websites/production/camel/content: cache/main.pageCache camel-2110-release.html groovy-dsl.html

2013-01-02 Thread buildbot

Author: buildbot
Date: Wed Jan  2 14:18:35 2013
New Revision: 844623

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2110-release.html
websites/production/camel/content/groovy-dsl.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/camel-2110-release.html
==
--- websites/production/camel/content/camel-2110-release.html (original)
+++ websites/production/camel/content/camel-2110-release.html Wed Jan  2 
14:18:35 2013
@@ -144,7 +144,7 @@
 
 Dependency Upgrades
 
-Aries Blueprint 0.3 to 1.0.0Async Http Client 1.7.5 to 
1.7.9Avro 1.6.2 to 1.7.2AWS 1.3.10 to 1.3.14Axiom 
1.2.10 to 1.2.12BeanIO 2.0.0 to 2.0.2Commons Exec 1.0.1 to 
1.1ConcurrentLinkedHashMap 1.2 to 1.3.2Ehcache 2.5.1 to 
2.6.0Groovy 1.8.6 to 2.0.6GSon 2.1 to 2.2.2Hazelcast 
2.0.2 to 2.4HTTP Client 4.1.3 to 4.2.2Icu4j 4.0.1 to 
4.8.1.1Jackson 1.9.7 to 1.9.10Jaxen 1.1.3 to 
1.1.4JClouds 1.4.0 to 1.5.4Jettison 1.3.1 to 
1.3.2Jetty 7.5.4 to 7.6.8JRuby 1.6.7 to 1.7.1JT400 
6.0 to 6.7Krati 0.4.5 to 0.4.6LevelDBJNI 1.2 to 
1.3Lucene 3.6.0 to 3.6.1Mina 2.0.4 to 2.0.7MongoDB 
Java Driver 2.7.3 to 2.9.1MQTTClient 1.2 to 1.4Netty 3.5.1 to 
3.5.11Ognl bundle 3.0.4_1 to 3.0.5_1OSGi 4.2.0 to 
4.3.0Pax Logging 1.5.3 to 1.6.10<
 /li>QPid 0.16 to 0.18Quartz 1.8.5 to 1.8.6Restlet 2.0.14 
to 2.0.15Saxon 9.3.0.11 to 9.4.0.1Scala 2.9.1 to 
2.9.2Shiro 1.2.0 to 1.2.1SLF4J 1.6.6 to 1.7.2Solr 
3.6.0 to 3.6.1Spring Batch 2.1.8 to 2.1.9Spring Framework 
3.1.1 to 3.1.2Spring Integration 2.1.2 to 2.1.4Spring 
Security 3.1.0 to 3.1.3SSHD 0.6.0 to 0.8.0TestNG 6.0.1 to 
6.8Woodstox 4.1.2 to 4.1.3XStream 1.4.2 to 1.4.3
+Aries Blueprint 0.3 to 1.0.0Async Http Client 1.7.5 to 
1.7.9Avro 1.6.2 to 1.7.2AWS 1.3.10 to 1.3.14Axiom 
1.2.10 to 1.2.12BeanIO 2.0.0 to 2.0.2Commons Exec 1.0.1 to 
1.1ConcurrentLinkedHashMap 1.2 to 1.3.2Ehcache 2.5.1 to 
2.6.0Groovy 1.8.6 to 2.0.6GSon 2.1 to 2.2.2Hazelcast 
2.0.2 to 2.4HBase 0.90.5 to 0.94.2HTTP Client 4.1.3 to 
4.2.2Icu4j 4.0.1 to 4.8.1.1Jackson 1.9.7 to 
1.9.10Jaxen 1.1.3 to 1.1.4JClouds 1.4.0 to 
1.5.4Jettison 1.3.1 to 1.3.2Jetty 7.5.4 to 
7.6.8JRuby 1.6.7 to 1.7.1JT400 6.0 to 6.7Krati 0.4.5 
to 0.4.6LevelDBJNI 1.2 to 1.3Lucene 3.6.0 to 
3.6.1Mina 2.0.4 to 2.0.7MongoDB Java Driver 2.7.3 to 
2.9.1MQTTClient 1.2 to 1.4Netty 3.5.1 to 3.5.11Ognl 
bundle 3.0.4_1 to 3.0.5_1OSGi 4.2.0 to 4.3.0<
 li>Pax Logging 1.5.3 to 1.6.10QPid 0.16 to 0.18Quartz 1.8.5 
to 1.8.6Restlet 2.0.14 to 2.0.15Saxon 9.3.0.11 to 
9.4.0.1Scala 2.9.1 to 2.9.2Shiro 1.2.0 to 1.2.1SLF4J 
1.6.6 to 1.7.2Solr 3.6.0 to 3.6.1Spring Batch 2.1.8 to 
2.1.9Spring Framework 3.1.1 to 3.1.2Spring Integration 2.1.2 
to 2.1.4Spring Security 3.1.0 to 3.1.3SSHD 0.6.0 to 
0.8.0StringTemplate 3.2.1 to 4.0.2TestNG 6.0.1 to 
6.8TWitter4j 2.2.5 to 3.0.3Woodstox 4.1.2 to 
4.1.3XStream 1.4.2 to 1.4.3
 
 
 Important 
changes to consider when upgrading

Modified: websites/production/camel/content/groovy-dsl.html
==
--- websites/production/camel/content/groovy-dsl.html (original)
+++ websites/production/camel/content/groovy-dsl.html Wed Jan  2 14:18:35 2013
@@ -300,7 +300,78 @@ def x = "It is 
 Because GStrings aren't Strings, camel-groovy adds the necessary TypeConverter to automatically turn them into the required 
type.
 
 
-Custom DSL 
extensions
+Custom DSL 
extensions
+
+You can easily define your custom extensions - be it as a Java DSL 
extension for your Groovy routes or for any other class unrelated to Camel. All 
you have to do is to write your extension methods and provide a extension 
module descriptor - the details are described in the http://docs.codehaus.org/display/GROOVY/Creating+an+extension+module"; 
rel="nofollow">Groovy documentation. And as long as you don't require other 
extension methods, you can even use plain Java code to achieve this!
+As an example, let's write two DSL extensions to make commonly used DSL 
methods more concise:
+
+MyExtension.java
+
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.Predicate;
+
+public final class MyExtension {
+private MyExtension() {
+// Utility Class
+}
+
+// Set the id of a route to its consumer URI
+public static RouteDefinition fromId(RouteDefinition 
delegate, String uri) {
+   return 
delegate.from(uri).routeId(uri);
+}
+
+public static RouteDefinition fromId(RouteDefinition 
delegate, Endpoint endpoint) {
+   return 
delegate.from(endpoint).routeId(endpoint.getEndpointUri());
+}
+
+// Make common choice pattern more concise
+
+public static ProcessorDefinition 
fork(ProcessorDefinition delegate, String uri1, String 
uri2, Pred

svn commit: r1427790 - /camel/trunk/parent/pom.xml

Author: davsclaus
Date: Wed Jan  2 13:54:22 2013
New Revision: 1427790

URL: http://svn.apache.org/viewvc?rev=1427790&view=rev
Log:
Upgraded to hawtdispatch 1.13

Modified:
camel/trunk/parent/pom.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1427790&r1=1427789&r2=1427790&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jan  2 13:54:22 2013
@@ -148,7 +148,7 @@
 2.0
 1.9
 1.6
-1.12
+1.13
 2.4
 0.94.2
 0.94.2_1

[CONF] Apache Camel > Camel 2.11.0 Release

Camel 2.11.0 Release
Page edited by Claus Ibsen

Changes (3)

...
* GSon 2.1 to 2.2.2 * Hazelcast 2.0.2 to 2.4
* HBase 0.90.5 to 0.94.2
* HTTP Client 4.1.3 to 4.2.2 * Icu4j 4.0.1 to 4.8.1.1
...
* Spring Security 3.1.0 to 3.1.3 * SSHD 0.6.0 to 0.8.0
* StringTemplate 3.2.1 to 4.0.2
* TestNG 6.0.1 to 6.8
* TWitter4j 2.2.5 to 3.0.3
* Woodstox 4.1.2 to 4.1.3 * XStream 1.4.2 to 1.4.3
...

Full Content

Camel 2.11.0 release (currently in progress)

New and Noteworthy

Welcome to the 2.11.0 release with approximately XXX issues resolved - including new features, improvements, and bug fixes, such as:

svn commit: r1427787 - in /camel/trunk: components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/ components/camel-stringtemplate/src/test/java/org/apache/camel/componen

Author: davsclaus
Date: Wed Jan  2 13:46:01 2013
New Revision: 1427787

URL: http://svn.apache.org/viewvc?rev=1427787&view=rev
Log:
CAMEL-5923: Upgraded to stringtemplate 4.0.2

Modified:

camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java

camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java

camel/trunk/components/camel-stringtemplate/src/test/resources/org/apache/camel/component/stringtemplate/Concurrent.tm

camel/trunk/components/camel-stringtemplate/src/test/resources/org/apache/camel/component/stringtemplate/letter.tm

camel/trunk/components/camel-stringtemplate/src/test/resources/org/apache/camel/component/stringtemplate/template.tm
camel/trunk/parent/pom.xml

Modified: 
camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java?rev=1427787&r1=1427786&r2=1427787&view=diff
==
--- 
camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
 (original)
+++ 
camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
 Wed Jan  2 13:46:01 2013
@@ -19,14 +19,15 @@ package org.apache.camel.component.strin
 import java.io.StringWriter;
 import java.util.Map;
 
-import org.antlr.stringtemplate.AutoIndentWriter;
-import org.antlr.stringtemplate.StringTemplate;
 import org.apache.camel.Component;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
 import org.apache.camel.component.ResourceEndpoint;
 import org.apache.camel.util.ExchangeHelper;
+import org.stringtemplate.v4.AutoIndentWriter;
+import org.stringtemplate.v4.NoIndentWriter;
+import org.stringtemplate.v4.ST;
 
 /**
  * @version 
@@ -57,10 +58,12 @@ public class StringTemplateEndpoint exte
 
 // getResourceAsInputStream also considers the content cache
 String text = 
exchange.getContext().getTypeConverter().mandatoryConvertTo(String.class, 
getResourceAsInputStream());
-StringTemplate template = new StringTemplate(text);
-template.setAttributes(variableMap);
+ST template = new ST(text);
+for (Map.Entry entry : variableMap.entrySet()) {
+template.add(entry.getKey(), entry.getValue());
+}
 log.debug("StringTemplate is writing using attributes: {}", 
variableMap);
-template.write(new AutoIndentWriter(buffer));
+template.write(new NoIndentWriter(buffer));
 
 // now lets output the results to the exchange
 Message out = exchange.getOut();
@@ -69,4 +72,5 @@ public class StringTemplateEndpoint exte
 out.setHeader(StringTemplateConstants.STRINGTEMPLATE_RESOURCE_URI, 
getResourceUri());
 out.setAttachments(exchange.getIn().getAttachments());
 }
+
 }
\ No newline at end of file

Modified: 
camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java?rev=1427787&r1=1427786&r2=1427787&view=diff
==
--- 
camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
 (original)
+++ 
camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateContentCacheTest.java
 Wed Jan  2 13:46:01 2013
@@ -39,7 +39,7 @@ public class StringTemplateContentCacheT
 super.setUp();
 
 // create a tm file in the classpath as this is the tricky reloading 
stuff
-
template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?fileExist=Override",
 "Hello $headers.name$", Exchange.FILE_NAME, "hello.tm");
+
template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?fileExist=Override",
 "Hello ", Exchange.FILE_NAME, "hello.tm");
 }
 
 @Override
@@ -56,7 +56,7 @@ public class StringTemplateContentCacheT
 mock.assertIsSatisfied();
 
 // now change content in the file in the classpath and try again
-
template.sendBodyAndHeader("file://target/test-classes/org/apache/camel/component/stringtemplate?fileExist=Override",
 "Bye $headers.name$", Exchange.FILE_NAME, "hello.tm");
+
template.sendBodyAndHeader("fil

svn commit: r1427783 - /camel/trunk/parent/pom.xml

Author: davsclaus
Date: Wed Jan  2 13:29:50 2013
New Revision: 1427783

URL: http://svn.apache.org/viewvc?rev=1427783&view=rev
Log:
CAMEL-5903: OSGi bundle upgrades

Modified:
camel/trunk/parent/pom.xml

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1427783&r1=1427782&r2=1427783&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Jan  2 13:29:50 2013
@@ -282,7 +282,7 @@
 1.3.2_2
 9.4.0.4_1
 9.4.0.4
-2.9.2_1
+2.9.2_2
 2.9.2
 3.1.0
 1.1
@@ -327,7 +327,7 @@
 3.0.1_1
 3.0.3
 4.0.4
-1.7_5
+1.7_6
 2.0
 1.7
 0.7

svn commit: r844618 - in /websites/production/camel/content: cache/main.pageCache groovy-dsl.html twitter-websocket-example.html twitter.html

2013-01-02 Thread buildbot

Author: buildbot
Date: Wed Jan  2 13:18:17 2013
New Revision: 844618

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/groovy-dsl.html
websites/production/camel/content/twitter-websocket-example.html
websites/production/camel/content/twitter.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/groovy-dsl.html
==
--- websites/production/camel/content/groovy-dsl.html (original)
+++ websites/production/camel/content/groovy-dsl.html Wed Jan  2 13:18:17 2013
@@ -179,8 +179,116 @@ With the Groovy DSL you write your Route
 
 Using 
Closures in your routes
 
+Processor 
Closures
+
+All Java DSL parameters of type org.apache.camel.Processor can be 
replaced by a closure that accepts an object of type 
org.apache.camel.Exchange as only parameter. The return value of the 
closure is disregarded. All closures may also refer to variables not listed in 
their parameter list. Example:
+
+
+
+...
+   private String someValue
+...
+   from('direct:test')
+  .process { Exchange exchange -> println exchange.in.body + someValue }
+  .process { println it.in.body + someValue } // equivalent
+...
+
+
+
+Expression 
Closures
+
+All Java DSL parameters of type org.apache.camel.Expression can be 
replaced by a closure that accepts an object of type 
org.apache.camel.Exchange as only parameter. The return value of the 
closure is the result of the expression. Example:
+
+
+
+...
+   private String someValue
+...
+   from('direct:test')
+  .transform { it.in.body.reverse() + someValue }
+  .setHeader("myHeader") { 
someValue.reverse() }
+...
+
+
+
+
+Predicate 
Closures
+
+All Java DSL parameters of type org.apache.camel.Predicate can be 
replaced by a closure that accepts an object of type 
org.apache.camel.Exchange as only parameter. The return value of the 
closure is translated into a boolean value representing the result of the 
predicate. Example:
+
+
+
+...
+   private String someValue
+
+   // This time, the closure is stored in a variable
+   def predicate = { Exchange e -> e.in.body != someValue }
+...
+   from('direct:test')
+  .filter(predicate)
+...
+
+
+
+
+Aggregation Strategy 
Closures
+
+Java DSL parameters of type 
org.apache.camel.processor.aggregate.AggregationStrategy can be 
replaced by a closure that accepts two objects of type 
org.apache.camel.Exchange representing the two Exchanges to be 
aggregated. The return value of the closure must be the aggregated Exchange. 
Example:
+
+
+
+...
+   private String separator
+...
+   from('direct:test1')
+  .enrich('direct:enrich') { Exchange original, Exchange resource -> 
+ original.in.body += resource.in.body + separator
+ original  // don't forget to return resulting exchange
+  }
+...
+
+
+
+
 Using Groovy 
XML processing
 
+Groovy provides special http://groovy.codehaus.org/Processing+XML"; rel="nofollow">XML processing 
support through its XmlParser, XmlNodePrinter and 
XmlSlurper classes. camel-groovy provides two data formats to use these 
classes directly in your routes. 
+
+Unmarshal XML with 
XmlParser
+
+...
+   from('direct:test1')
+  .unmarshal().gnode() 
+  // message body is now of type 
groovy.util.Node
+...
+
+
+
+By default, XML processing is namespace-aware. You can change this 
by providing a boolean false parameter.
+
+Unmarshal XML with 
XmlSlurper
+
+...
+   from('direct:test1')
+  .unmarshal().gpath(false) // explicitly namespace-unaware
+  // message body is now of type 
groovy.util.slurpersupport.GPathResult
+...
+
+
+
+Currently, marshalling is only supported for groovy.util.Node 
objects.
+
+Marshal XML with 
XmlNodePrinter
+
+...
+   from('direct:test1')
+  // message body must be of type 
groovy.util.Node
+  .marshal().gnode()
+...
+
+
+
+
 Using Groovy 
GStrings
 
 Groovy http://groovy.codehaus.org/Strings+and+GString"; 
rel="nofollow">GStrings are declared inside double-quotes and can contain 
arbitrary Groovy expressions like accessing properties or calling methods, e.g. 


Modified: websites/production/camel/content/twitter-websocket-example.html
==
--- websites/production/camel/content/twitter-websocket-example.html (original)
+++ websites/production/camel/content/twitter-websocket-example.html Wed Jan  2 
13:18:17 2013
@@ -123,7 +123,7 @@ mvn exec:java
 Then open a browser to see live twitter updates in the webpage
 
 
-http://localhost:9090
+http://localhost:9090/index.html
 
 
 

Modified: websites/production/camel/content/twitter.html
==
--- websites/produ

[CONF] Apache Camel > Twitter








Twitter
Page edited by Claus Ibsen


 Changes (12)
 




...
Rather than the endpoints returning a List through one single route exchange, camel-twitter creates one route exchange per returned object.  As an example, if "timeline/home" results in five statuses, the route will be executed five times (one for each Status). {div:class=confluenceTableSmall} 
|| Endpoint || Context || Body Type || Notice || 
| streaming/filter | event, polling | twitter4j.Status | | 
| directmessage | direct, polling | twitter4j.DirectMessage | |
| search | direct, polling | twitter4j.Tweet | | 
| streaming/filter streaming/sample | event, polling | twitter4j.Status | | 
| streaming/sample | event, polling | twitter4j.Status | 
| timeline/home | direct, polling | twitter4j.Status | | 
| timeline/home timeline/mentions | direct, polling | twitter4j.Status | | 
| timeline/public | direct, polling | twitter4j.Status | @deprecated. Use timeline/home or direct/home instead. Removed from *Camel 2.11* onwards. | 
| timeline/mentions timeline/retweetsofme | direct, polling | twitter4j.Status | | 
| timeline/public timeline/user | direct, polling | twitter4j.Status | | 
| timeline/retweetsofme | direct, polling | twitter4j.Status | | timeline/user | direct, polling | twitter4j.Status | 
| trends/daily | *Camel 2.10.1:* direct, polling | twitter4j.Status | @deprecated. Removed from Camel 2.11 onwards. | 
| trends/weekly | *Camel 2.10.1:* direct, polling | twitter4j.Status | @deprecated. Removed from Camel 2.11 onwards. | 
{div}  
...


Full Content

Twitter
Available as of Camel 2.10

The Twitter component enables the most useful features of the Twitter API by encapsulating Twitter4J. It allows direct, polling, or event-driven consumption of timelines, users, trends, and direct messages. Also, it supports producing messages as status updates or direct messages.

Twitter now requires the use of OAuth for all client application authentication.  In order to use camel-twitter with your account, you'll need to create a new application within Twitter at https://dev.twitter.com/apps/new and grant the application access to your account. Finally, generate your access token and secret.

Maven users will need to add the following dependency to their pom.xml for this component:



org.apache.camel
camel-twitter
${camel-version}




URI format



twitter://[endpoint]?[options]



TwitterComponent:

The twitter component can be configured with the Twitter account settings which is mandatory to configure before using.
You can also configure these options directly in the endpoint.



 Option 
 Description 


 consumerKey 
 The consumer key 


 consumerSecret 
 The consumer secret 


 accessToken 
 The access token 


 accessTokenSecret 
 The access token secret 





Consumer Endpoints:
Rather than the endpoints returning a List through one single route exchange, camel-twitter creates one route exchange per returned object.  As an example, if "timeline/home" results in five statuses, the route will be executed five times (one for each Status).



 Endpoint 
 Context 
 Body Type 
 Notice 


 directmessage 
 direct, polling 
 twitter4j.DirectMessage 
 


 search 
 direct, polling 
 twitter4j.Tweet 
 


 streaming/filter 
 event, polling 
 twitter4j.Status 
 


 streaming/sample 
 event, polling 
 twitter4j.Status 
 


 timeline/home 
 direct, polling 
 twitter4j.Status 
 


 timeline/mentions 
 direct, polling 
 twitter4j.Status 
 


 timeline/public 
 direct, polling 
 twitter4j.Status 
 @deprecated. Use timeline/home or direct/home instead. Removed from Camel 2.11 onwards. 


 timeline/retweetsofme 
 direct, polling 
 twitter4j.Status 
 


 timeline/user 
 direct, polling 
 twitter4j.Status 
 


 trends/daily 
 Camel 2.10.1: direct, polling 
 twitter4j.Status 
 @deprecated. Removed from Camel 2.11 onwards. 


 trends/weekly 
 Camel 2.10.1: direct, polling 
 twitter4j.Status 
 @deprecated. Removed from Camel 2.11 onwards. 





Producer Endpoints:



 Endpoint 
 Body Type 


 directmessage 
 String 


 search 
 List 


 timeline/user 
 String 





URI Options



 Name 
 Default Value 
 Description 


 type 
 direct 
 direct, event, or polling 


 delay 
 60 
 in seconds 


 consumerKey 
 null 
 Consumer Key. Can also be configured on the TwitterComponent level instead. 


 consumerSecret 
 null 
 Consumer Secret. Can also be configured on the TwitterComponent level instead. 


 accessToken 
 null 
 Access Token. Can also be configured on the TwitterComponent level instead. 


 accessTokenSecret 
 null 
 Access Token Secret. Can also be configured

svn commit: r1427776 - in /camel/trunk: components/camel-twitter/ components/camel-twitter/src/main/java/org/apache/camel/component/twitter/ components/camel-twitter/src/main/java/org/apache/camel/com

Author: davsclaus
Date: Wed Jan  2 13:00:38 2013
New Revision: 1427776

URL: http://svn.apache.org/viewvc?rev=1427776&view=rev
Log:
CAMEL-5921: Upgraded to twitter4j 3.0.x in camel-twitter. This requires some 
code changes. And some code to be removed that is no longer supported in the 
API.

Removed:

camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/PublicConsumer.java

camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/trends/DailyTrendConsumer.java

camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/trends/WeeklyTrendConsumer.java

camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DailyTrendDirectTest.java

camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DailyTrendPollingTest.java

camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/PublicTimeLineDirectTest.java

camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/PublicTimeLinePollingTest.java

camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/WeeklyTrendDirectTest.java

camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/WeeklyTrendPollingTest.java

camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/mocks/
Modified:
camel/trunk/components/camel-twitter/pom.xml

camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/Twitter4JFactory.java

camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/search/SearchConsumer.java

camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/FilterConsumer.java

camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/SampleConsumer.java

camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/timeline/MentionsConsumer.java

camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/data/ConsumerType.java

camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/producer/SearchProducer.java

camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterConverter.java

camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectTest.java
camel/trunk/parent/pom.xml

Modified: camel/trunk/components/camel-twitter/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/pom.xml?rev=1427776&r1=1427775&r2=1427776&view=diff
==
--- camel/trunk/components/camel-twitter/pom.xml (original)
+++ camel/trunk/components/camel-twitter/pom.xml Wed Jan  2 13:00:38 2013
@@ -66,11 +66,6 @@
  slf4j-log4j12
  test
   
-  
- org.easymock
- easymock
- test
-  
 



Modified: 
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/Twitter4JFactory.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/Twitter4JFactory.java?rev=1427776&r1=1427775&r2=1427776&view=diff
==
--- 
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/Twitter4JFactory.java
 (original)
+++ 
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/Twitter4JFactory.java
 Wed Jan  2 13:00:38 2013
@@ -25,15 +25,11 @@ import org.apache.camel.component.twitte
 import org.apache.camel.component.twitter.consumer.streaming.SampleConsumer;
 import org.apache.camel.component.twitter.consumer.timeline.HomeConsumer;
 import org.apache.camel.component.twitter.consumer.timeline.MentionsConsumer;
-import org.apache.camel.component.twitter.consumer.timeline.PublicConsumer;
 import org.apache.camel.component.twitter.consumer.timeline.RetweetsConsumer;
 import org.apache.camel.component.twitter.consumer.timeline.UserConsumer;
-import org.apache.camel.component.twitter.consumer.trends.DailyTrendConsumer;
-import org.apache.camel.component.twitter.consumer.trends.WeeklyTrendConsumer;
 import org.apache.camel.component.twitter.data.ConsumerType;
 import org.apache.camel.component.twitter.data.StreamingType;
 import org.apache.camel.component.twitter.data.TimelineType;
-import org.apache.camel.component.twitter.data.TrendsType;
 import org.apache.camel.component.twitter.producer.DirectMessageProducer;
 import org.apache.camel.component.twitter.producer.SearchProducer;
 import org.apache.camel.com

svn commit: r1427771 - in /camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket: CamelTwitterWebSocketMain.java TwitterWebSocketRoute.java

Author: davsclaus
Date: Wed Jan  2 12:40:08 2013
New Revision: 1427771

URL: http://svn.apache.org/viewvc?rev=1427771&view=rev
Log:
Polished

Modified:

camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/CamelTwitterWebSocketMain.java

camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/TwitterWebSocketRoute.java

Modified: 
camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/CamelTwitterWebSocketMain.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/CamelTwitterWebSocketMain.java?rev=1427771&r1=1427770&r2=1427771&view=diff
==
--- 
camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/CamelTwitterWebSocketMain.java
 (original)
+++ 
camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/CamelTwitterWebSocketMain.java
 Wed Jan  2 12:40:08 2013
@@ -42,7 +42,7 @@ public final class CamelTwitterWebSocket
 public static void main(String[] args) throws Exception {
 System.out.println("\n\n\n\n");
 System.out.println("===");
-System.out.println("Open your web browser on http://localhost:9090";);
+System.out.println("Open your web browser on 
http://localhost:9090/index.html";);
 System.out.println("Press ctrl+c to stop this example");
 System.out.println("===");
 System.out.println("\n\n\n\n");

Modified: 
camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/TwitterWebSocketRoute.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/TwitterWebSocketRoute.java?rev=1427771&r1=1427770&r2=1427771&view=diff
==
--- 
camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/TwitterWebSocketRoute.java
 (original)
+++ 
camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/TwitterWebSocketRoute.java
 Wed Jan  2 12:40:08 2013
@@ -107,6 +107,7 @@ public class TwitterWebSocketRoute exten
 
 // poll twitter search for new tweets
 fromF("twitter://search?type=polling&delay=%s&keywords=%s", delay, 
searchTerm)
+.to("log:tweet")
 // and push tweets to all web socket subscribers on camel-tweet
 .to("websocket:camel-tweet?sendToAll=true");
 }

[CONF] Apache Camel > Groovy DSL








Groovy DSL
Page edited by Christian Ohr


 Changes (1)
 




...
h4. Using Closures in your routes  
h5. Processor Closures  All Java DSL parameters of type {{org.apache.camel.Processor}} can be replaced by a closure that accepts an object of type {{org.apache.camel.Exchange}} as only parameter. The return value of the closure is disregarded. All closures may also refer to variables not listed in their parameter list. Example:  {code:java} ...private String someValue ...from('direct:test')   .process { Exchange exchange -> println exchange.in.body + someValue }   .process { println it.in.body + someValue } // equivalent ... {code}  h5. _expression_ Closures  All Java DSL parameters of type {{org.apache.camel._expression_}} can be replaced by a closure that accepts an object of type {{org.apache.camel.Exchange}} as only parameter. The return value of the closure is the result of the _expression_. Example:  {code:java} ...private String someValue ...from('direct:test')   .transform { it.in.body.reverse() + someValue }   .setHeader("myHeader") { someValue.reverse() } ... {code}   h5. Predicate Closures  All Java DSL parameters of type {{org.apache.camel.Predicate}} can be replaced by a closure that accepts an object of type {{org.apache.camel.Exchange}} as only parameter. The return value of the closure is translated into a boolean value representing the result of the predicate. Example:  {code:java} ...private String someValue ...from('direct:test')   .filter { it.in.body != someValue } ... {code}   h5. Aggregation Strategy Closures  Java DSL parameters of type {{org.apache.camel.processor.aggregate.AggregationStrategy}} can be replaced by a closure that accepts two objects of type {{org.apache.camel.Exchange}} representing the two Exchanges to be aggregated. The return value of the closure must be the aggregated Exchange. Example:  {code:java} ...private String separator ...from('direct:test1')   .enrich('direct:enrich') { Exchange original, Exchange resource ->   original.in.body += resource.in.body + separator  original  // don't forget to return resulting exchange   } ... {code}   
h4. Using Groovy XML processing  
...


Full Content

About the Groovy DSL

The Groovy DSL implementation is built on top of the existing Java-based DSL, but it additionally allows to use Groovy language features in your routes, particularly Closures acting as Processor, _expression_, Predicate, or Aggregation Strategy.
With the Groovy DSL you write your RouteBuilder classes entirely in Groovy, while the scripting component allows to embed small scripts into Java routes. The Groovy DSL requires Groovy 2.0 or newer and is available as of Camel 2.11.

Introduction

Because Groovy is syntactically very similar to Java, you can write your Groovy routes just like Java routes. The same Java DSL classes are being used, with the exception that some of the DSL classes get extended with a bunch of new methods at runtime. This is achieved by turning camel-groovy into a Groovy Extension Module that defines extension methods on existing classes.

The majority of the extension methods allow Closures to be used as parameters e.g. for expressions, predicates, processors. The following example reverses a string in the message body and then prints the value to System.out: 

MyRouteBuilder.groovy

...
   from('direct:test')
  .transform { it.in.body.reverse() }
  .process { println it.in.body }
...



The corresponding route in Java would look something like this:

MyRouteBuilder.java

...
   from("direct:test")
  .transform(new _expression_() {
 @Override
 public Object evaluate(Exchange e) {
return new StringBuffer(e.getIn().getBody().toString()).reverse().toString();
 }
  })
  .process(new Processor() {
 @Override
 public void process(Exchange e) {
   System.out.println(e.getIn().getBody());
 }
  });
...






Developing with the Groovy DSL

To be able to use the Groovy DSL in your camel routes you need to add the a dependency on camel-groovy which implements the Groovy DSL.

If you use Maven you can just add the following to your pom.xml, substituting the version number for the latest & greatest release (see the download page for the latest versions).




  org.apache.camel
  camel-groovy
  2.11.0




Additionally you need to make sure that the Groovy classes will be compiled. You can either use gmaven for this or, particularly with mixed projects containing Java and Groovy code, you might want to use the Groovy Eclipse compiler:



  
maven-compiler-plugin

  groovy-eclipse-compiler


  
or

svn commit: r1427718 - in /camel/trunk: components/camel-guice/pom.xml parent/pom.xml