git commit: polished the jar wrapping a bit to have better names and the version number

2013-10-06 Thread cmueller
Updated Branches:
  refs/heads/master bbd8c2f59 - 439c32e0e


polished the jar wrapping a bit to have better names and the version number


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/439c32e0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/439c32e0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/439c32e0

Branch: refs/heads/master
Commit: 439c32e0e6c6fd8a6e259b0f1783de4770d4dba3
Parents: bbd8c2f
Author: cmueller cmuel...@apache.org
Authored: Sun Oct 6 11:56:36 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Oct 6 11:56:36 2013 +0200

--
 .../features/src/main/resources/features.xml| 32 ++--
 1 file changed, 16 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/439c32e0/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index a50dd91..e7f59ed 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -293,22 +293,22 @@
 bundle 
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}/bundle
 bundle 
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avalon-framework/${avalon-bundle-version}/bundle
 bundle 
dependency=truemvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlgraphics-commons/${xmlgraphics-commons-bundle-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-svg-dom/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-anim/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-css/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-dom/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-parser/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-util/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-bridge/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-script/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-js/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-xml/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-awt-util/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-gvt/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-transcoder/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-svggen/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-extension/${xmlgraphics-batik-version}/bundle
-bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-ext/${xmlgraphics-batik-version}/bundle
+bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-svg-dom/${xmlgraphics-batik-version}$Bundle-SymbolicName=org.apache.xmlgraphics.batik-svg-domamp;Bundle-Version=${xmlgraphics-batik-version}/bundle
+bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-anim/${xmlgraphics-batik-version}$Bundle-SymbolicName=org.apache.xmlgraphics.batik-animamp;Bundle-Version=${xmlgraphics-batik-version}/bundle
+bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-css/${xmlgraphics-batik-version}$Bundle-SymbolicName=org.apache.xmlgraphics.batik-cssamp;Bundle-Version=${xmlgraphics-batik-version}/bundle
+bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-dom/${xmlgraphics-batik-version}$Bundle-SymbolicName=org.apache.xmlgraphics.batik-domamp;Bundle-Version=${xmlgraphics-batik-version}/bundle
+bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-parser/${xmlgraphics-batik-version}$Bundle-SymbolicName=org.apache.xmlgraphics.batik-parseramp;Bundle-Version=${xmlgraphics-batik-version}/bundle
+bundle 
dependency=truewrap:mvn:org.apache.xmlgraphics/batik-util/${xmlgraphics-batik-version}$Bundle-SymbolicName=org.apache.xmlgraphics.batik-utilamp;Bundle-Version=${xmlgraphics-batik-version}/bundle
+bundle 

[CONF] Apache Camel Languages Supported

2013-10-06 Thread Claus Ibsen (Confluence)







Languages Supported
Page edited by Claus Ibsen


 Changes (1)
 




...
* the unified [EL] from JSP and JSF * [Header] 
* [JSonPath] 
* [JXPath] * [Mvel] 
...


Full Content


	Bean Language for using Java for expressions
	Constant
	the unified EL from JSP and JSF
	Header
	JSonPath
	JXPath
	Mvel
	OGNL
	Ref Language
	Property
	Scripting Languages such as
	
		BeanShell
		_javascript_
		Groovy
		Python
		PHP
		Ruby
	
	
	Simple
	
		File Language
	
	
	Spring _expression_ Language
	SQL
	Tokenizer
	XPath
	XQuery
	VTDXML



Most of these languages is also supported used as Annotation Based _expression_ Language.




Stop watching space
|
Change email notification preferences

View Online
|
View Changes









svn commit: r881420 - in /websites/production/camel/content: architecture.html book-architecture.html book-in-one-page.html cache/main.pageCache expression.html languages-supported.html languages.html

2013-10-06 Thread buildbot
Author: buildbot
Date: Sun Oct  6 10:19:10 2013
New Revision: 881420

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/architecture.html
websites/production/camel/content/book-architecture.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/expression.html
websites/production/camel/content/languages-supported.html
websites/production/camel/content/languages.html
websites/production/camel/content/predicate.html
websites/production/camel/content/what-languages-are-supported.html

Modified: websites/production/camel/content/architecture.html
==
--- websites/production/camel/content/architecture.html (original)
+++ websites/production/camel/content/architecture.html Sun Oct  6 10:19:10 2013
@@ -85,7 +85,7 @@
 
 pThe a shape=rect href=dsl.html title=DSLDSL/a makes heavy use of 
pluggable a shape=rect href=languages.html title=LanguagesLanguages/a 
to create an a shape=rect href=expression.html 
title=ExpressionExpression/a or a shape=rect href=predicate.html 
title=PredicatePredicate/a to make a truly powerful DSL which is 
extensible to the most suitable language depending on your needs. The following 
languages are supported/p
 
-ullia shape=rect href=bean-language.html title=Bean LanguageBean 
Language/a for using Java for expressions/lilia shape=rect 
href=constant.html title=ConstantConstant/a/lilithe unified a 
shape=rect href=el.html title=ELEL/a from JSP and JSF/lilia 
shape=rect href=header.html title=HeaderHeader/a/lilia 
shape=rect href=jxpath.html title=JXPathJXPath/a/lilia 
shape=rect href=mvel.html title=MvelMvel/a/lilia shape=rect 
href=ognl.html title=OGNLOGNL/a/lilia shape=rect 
href=ref-language.html title=Ref LanguageRef Language/a/lilia 
shape=rect href=property.html title=PropertyProperty/a/lilia 
shape=rect href=scripting-languages.html title=Scripting 
LanguagesScripting Languages/a such as
+ullia shape=rect href=bean-language.html title=Bean LanguageBean 
Language/a for using Java for expressions/lilia shape=rect 
href=constant.html title=ConstantConstant/a/lilithe unified a 
shape=rect href=el.html title=ELEL/a from JSP and JSF/lilia 
shape=rect href=header.html title=HeaderHeader/a/lilispan 
class=error[JSonPath]/span/lilia shape=rect href=jxpath.html 
title=JXPathJXPath/a/lilia shape=rect href=mvel.html 
title=MvelMvel/a/lilia shape=rect href=ognl.html 
title=OGNLOGNL/a/lilia shape=rect href=ref-language.html 
title=Ref LanguageRef Language/a/lilia shape=rect 
href=property.html title=PropertyProperty/a/lilia shape=rect 
href=scripting-languages.html title=Scripting LanguagesScripting 
Languages/a such as
ullia shape=rect href=beanshell.html 
title=BeanShellBeanShell/a/lilia shape=rect href=javascript.html 
title=JavaScriptJavaScript/a/lilia shape=rect href=groovy.html 
title=GroovyGroovy/a/lilia shape=rect href=python.html 
title=PythonPython/a/lilia shape=rect href=php.html 
title=PHPPHP/a/lilia shape=rect href=ruby.html 
title=RubyRuby/a/li/ul
/lilia shape=rect href=simple.html title=SimpleSimple/a
ullia shape=rect href=file-language.html title=File 
LanguageFile Language/a/li/ul

Modified: websites/production/camel/content/book-architecture.html
==
--- websites/production/camel/content/book-architecture.html (original)
+++ websites/production/camel/content/book-architecture.html Sun Oct  6 
10:19:10 2013
@@ -96,7 +96,7 @@
 
 pThe a shape=rect href=dsl.html title=DSLDSL/a makes heavy use of 
pluggable a shape=rect href=languages.html title=LanguagesLanguages/a 
to create an a shape=rect href=expression.html 
title=ExpressionExpression/a or a shape=rect href=predicate.html 
title=PredicatePredicate/a to make a truly powerful DSL which is 
extensible to the most suitable language depending on your needs. The following 
languages are supported/p
 
-ullia shape=rect href=bean-language.html title=Bean LanguageBean 
Language/a for using Java for expressions/lilia shape=rect 
href=constant.html title=ConstantConstant/a/lilithe unified a 
shape=rect href=el.html title=ELEL/a from JSP and JSF/lilia 
shape=rect href=header.html title=HeaderHeader/a/lilia 
shape=rect href=jxpath.html title=JXPathJXPath/a/lilia 
shape=rect href=mvel.html title=MvelMvel/a/lilia shape=rect 
href=ognl.html title=OGNLOGNL/a/lilia shape=rect 
href=ref-language.html title=Ref LanguageRef Language/a/lilia 
shape=rect href=property.html title=PropertyProperty/a/lilia 
shape=rect href=scripting-languages.html title=Scripting 
LanguagesScripting Languages/a such as
+ullia shape=rect href=bean-language.html title=Bean LanguageBean 
Language/a for using Java for expressions/lilia shape=rect 
href=constant.html title=ConstantConstant/a/lilithe unified a 
shape=rect href=el.html 

[CONF] Apache Camel JSonPath

2013-10-06 Thread Claus Ibsen (Confluence)







JSonPath
Page  added by Claus Ibsen

 

 JSonPath
Available as of Camel 2.13

Camel supports JSonPath to allow using _expression_ or Predicate on json messages.



from("queue:books.new")
  .choice()
.when().jsonPath("$.store.book[?(@.price  10)]")
  .to("jms:queue:book.cheap")
.when().jsonPath("$.store.book[?(@.price  30)]")
  .to("jms:queue:book.average")
.otherwise()
  .to("jms:queue:book.expensive")



Using XML configuration

If you prefer to configure your routes in your Spring XML file then you can use JSonPath expressions as follows



  camelContext id="camel" xmlns="http://camel.apache.org/schema/spring"
route
  from uri="direct:start"/
  choice
when
  jsonpath$.store.book[?(@.price lt; 10)]/jsonpath
  to uri="mock:cheap"/
/when
when
  jsonpath$.store.book[?(@.price lt; 30)]/jsonpath
  to uri="mock:average"/
/when
otherwise
  to uri="mock:expensive"/
/otherwise
  /choice
/route
  /camelContext



Syntax

See the JSonPath project page for further examples.


JSonPath injection 

You can use Bean Integration to invoke a method on a bean and use various languages such as JSonPath to extract a value from the message and bind it to a method parameter.

For example



public class Foo {
	
@Consume(uri = "activemq:queue:books.new")
public void doSomething(@JSonPath("$.store.book[*].author") String author, @Body String json) {
  // process the inbound message here
}
}



Dependencies

To use JSonPath in your camel routes you need to add the a dependency on camel-jsonpath which implements the JSonPath language. 

If you use maven you could 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).



dependency
  groupIdorg.apache.camel/groupId
  artifactIdcamel-jsonpath/artifactId
  versionx.x.x/version
/dependency




   
Stop watching space
|
Change email notification preferences

   View Online
   








[CONF] Apache Camel Camel 2.13.0 Release

2013-10-06 Thread Claus Ibsen (Confluence)







Camel 2.13.0 Release
Page edited by Claus Ibsen


 Changes (1)
 




...
h3. New [Languages]  
* [JSonPath] - To perform [_expression_] and [Predicate] on json payloads.  
h3. New [Examples]  
...


Full Content

Camel 2.13.0 release (currently in progress)




New and Noteworthy

Welcome to the 2.13.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)


	When using multiple OSGi Blueprint cm:property-placeholder's then Camel now favors using non-default placeholders, or the last property-placeholder defined in the Blueprint XML file. This allows for example to define default properties in one placeholder, and override these values in other placeholders.
	FTP consumer allow to download a single named file without using the FTP LIST command. This allows to download a known file from a FTP server even when the user account does not have permission to do FTP LIST command.
	FTP consumer allow to ignore file not found or insufficient file permission errors.
	Data Format using marshal now leverages Stream caching out of the box if enabled, which allows to marshal big streams and spool to disk, instead of being pure in-memory based.
	Improved using Bean when the bean is looked up in the Registry, when using concurrent processing in the route.
	Added cache option to beanRef and bean in the DSL. This avoids looking up the Bean from the Registry on each usage; this can safely be done for singleton beans.
	Configuring Data Formats in XML attributes now supports reference lookup using the # syntax, eg jaxb xmlStreamWriterWrapper="#myWriterWrapper" ..
	JDBC component now also support outputType to specify the expected output as either a List or single Object. As well allow to map to a bean using a BeanRowMapper to control the mapping of ROW names to bean properties.
	Both Quartz as well as Quartz2 based ScheduledRoutePolicy has been improved to better support cluster setups (e.g. to not schedule jobs being already scheduled through another node inside a given cluster).
	Reduced the work the Aggregate EIP does while holding a lock during aggregation, which can lead to improved performance in some use-cases.
	JndiRegistry now implements all the find methods.
	VM component now supports multipleConsumers=true across deployment units.



Fixed Issues


	Fixed an ArrayIndexOutOfBoundsException with Message History when using SEDA
	Fixed requestTimeout on Netty not triggering when we have received message.
	Fixed Parameter Binding Annotations on boolean types to evaluate as Predicate instead of _expression_
	Fixed using File consumer with delete=truereadLock=fileLock not being able to delete the file on Windows.
	Fixed Throttler to honor time slots after period expires (eg so it works consistently and as expected).
	Fixed getting JMSXUserID property when consuming from ActiveMQ
	Fixed interceptFrom to support property placeholders
	Fixed a race condition in initializing SSLContext in Netty and Netty HTTP



New Enterprise Integration Patterns

New Components


	camel-infinispan
	camel-splunk



New DSL

New Annotations

New Data Formats

New Languages


	JSonPath - To perform _expression_ and Predicate on json payloads.



New Examples

New Tutorials

API changes

Known Issues

Dependency Upgrades


	CXF 2.7.6 to 2.7.7
	EHCache 2.7.2 to 2.7.4
	Elasticsearch 0.20.6 to 0.90.3
	FOP 1.0 to 1.1
	Guave 14.0.1 to 15.0
	Hazelcast 2.6 to 3.0.2
	Jetty 7.6.9 to 8.1.12
	Joda time 2.1 to 2.3
	Lucene 3.6.0 to 4.4.0
	MongoDB Java Driver 2.11.2 to 2.11.3
	Quartz 2.2.0 to 2.2.1
	Restlet 2.0.15 to 2.1.4
	Saxon 9.5.0.2 to 9.5.1-2
	Servlet API 2.5 to 3.0
	SolrJ 3.6.2 to 4.4.0
	Spring Batch 2.2.1.RELEASE to 2.2.2.RELEASE
	Spring Redis 1.0.4.RELEASE to 1.1.0.RELEASE
	TestNG 6.8.5 to 6.8.7



Internal changes

	Add RouteAware API to inject Route for Service's in routes, for example the Consumer's of the routes.
	IOHelper.gerCharsetName will now lookup key Exchange.CHARSET_NAME in header first and then fallback to property.



Changes that may affect end users

	Components depending on Servlet API has been upgrade from Servlet API 2.5 to 3.0
	Jetty upgraded from 7.6.x to 8.1.x
	Hazelcast Component uses Object instead of String as the key.



Important changes to consider when upgrading

	If using groupedExchanges option on Aggregate EIP then the Exchanges is now stored on the message body as well. The old way of storing as a property is considered deprecated. See more details at Aggregate.



Getting the Distributions

Binary Distributions




 Description 
 Download Link 
 PGP Signature file of download 


 Windows Distribution 
 apache-camel-2.13.0.zip 
 apache-camel-2.13.0.zip.asc 


 Unix/Linux/Cygwin Distribution 
 apache-camel-2.13.0.tar.gz 
 

[3/3] git commit: CAMEL-6238: camel-jsonpath component.

2013-10-06 Thread davsclaus
CAMEL-6238: camel-jsonpath component.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/969d8814
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/969d8814
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/969d8814

Branch: refs/heads/master
Commit: 969d88146d282c1ddaa6c7f8c9fb2ecc79379850
Parents: 794ee2c
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 12:41:10 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 12:42:30 2013 +0200

--
 apache-camel/pom.xml|  4 ++
 .../src/main/descriptors/common-bin.xml |  1 +
 .../org/apache/camel/jsonpath/JSonPath.java | 40 
 parent/pom.xml  |  6 +++
 .../features/src/main/resources/features.xml|  5 +++
 5 files changed, 56 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/969d8814/apache-camel/pom.xml
--
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index f7c05c0..18c4d4a 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -313,6 +313,10 @@
 /dependency
 dependency
   groupIdorg.apache.camel/groupId
+  artifactIdcamel-jsonpath/artifactId
+/dependency
+dependency
+  groupIdorg.apache.camel/groupId
   artifactIdcamel-juel/artifactId
 /dependency
 dependency

http://git-wip-us.apache.org/repos/asf/camel/blob/969d8814/apache-camel/src/main/descriptors/common-bin.xml
--
diff --git a/apache-camel/src/main/descriptors/common-bin.xml 
b/apache-camel/src/main/descriptors/common-bin.xml
index db1a9c6..8083d23 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -91,6 +91,7 @@
 includeorg.apache.camel:camel-josql/include
 includeorg.apache.camel:camel-jpa/include
 includeorg.apache.camel:camel-jsch/include
+includeorg.apache.camel:camel-jsonpath/include
 includeorg.apache.camel:camel-jt400/include
 includeorg.apache.camel:camel-juel/include
 includeorg.apache.camel:camel-jxpath/include

http://git-wip-us.apache.org/repos/asf/camel/blob/969d8814/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
--
diff --git 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
new file mode 100644
index 000..601d64c
--- /dev/null
+++ 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
@@ -0,0 +1,40 @@
+/**
+ * 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.
+ */
+package org.apache.camel.jsonpath;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.camel.language.LanguageAnnotation;
+
+/**
+ * An annotation used to inject a a 
href=http://commons.apache.org/jsonpath/;JSon Path/a
+ * expression into a method parameter when using
+ * a href=http://camel.apache.org/bean-integration.html;Bean Integration/a
+ *
+ * @version
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
+@LanguageAnnotation(language = jsonpath)
+public @interface JSonPath {
+String value();
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/969d8814/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5f5c049..8c7ddb0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -236,6 +236,7 @@
 jsonlib-bundle-version2.4_1/jsonlib-bundle-version
 jsonlib-version2.4/jsonlib-version
 

[2/3] git commit: CAMEL-6238: camel-jsonpath component.

2013-10-06 Thread davsclaus
CAMEL-6238: camel-jsonpath component.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/794ee2c8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/794ee2c8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/794ee2c8

Branch: refs/heads/master
Commit: 794ee2c8fe529a7c694c3079e1e9945c986e5c5c
Parents: 293b85c
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 11:53:16 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 12:42:30 2013 +0200

--
 .../apache/camel/builder/ExpressionClause.java  | 12 
 .../camel/builder/ExpressionClauseSupport.java  | 12 
 .../model/language/JsonPathExpression.java  | 42 +
 .../org/apache/camel/model/language/jaxb.index  |  1 +
 components/camel-jsonpath/pom.xml   |  4 +-
 .../apache/camel/jsonpath/JSonPathEngine.java   | 37 +++
 .../camel/jsonpath/JsonPathExpression.java  | 38 
 .../apache/camel/jsonpath/JsonPathLanguage.java | 35 ---
 .../apache/camel/jsonpath/JsonPathCBRTest.java  |  4 +-
 .../camel/jsonpath/JsonPathTransformTest.java   |  2 +-
 .../camel/jsonpath/SpringJsonPathCBRTest.java   | 65 
 .../jsonpath/SpringJsonPathTransformTest.java   | 46 ++
 .../camel/jsonpath/SpringJsonPathCBTTest.xml| 43 +
 .../jsonpath/SpringJsonPathTransformTest.xml| 34 ++
 14 files changed, 324 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java 
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 2e42ded..07ab027 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -277,6 +277,18 @@ public class ExpressionClauseT extends 
ExpressionDefinition {
 }
 
 /**
+ * Evaluates a a
+ * href=http://camel.apache.org/jsonpath.html;JSon Path
+ * expression/a
+ *
+ * @param text the expression to be evaluated
+ * @return the builder to continue processing the DSL
+ */
+public T jsonPath(String text) {
+return delegate.jsonPath(text);
+}
+
+/**
  * Evaluates a a href=http://commons.apache.org/jxpath/;JXPath 
expression/a
  * 
  * @param text the expression to be evaluated

http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
 
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index b970806..64955c2 100644
--- 
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++ 
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -28,6 +28,7 @@ import org.apache.camel.model.language.GroovyExpression;
 import org.apache.camel.model.language.HeaderExpression;
 import org.apache.camel.model.language.JXPathExpression;
 import org.apache.camel.model.language.JavaScriptExpression;
+import org.apache.camel.model.language.JsonPathExpression;
 import org.apache.camel.model.language.LanguageExpression;
 import org.apache.camel.model.language.MethodCallExpression;
 import org.apache.camel.model.language.MvelExpression;
@@ -312,6 +313,17 @@ public class ExpressionClauseSupportT {
 }
 
 /**
+ * Evaluates a a href=http://camel.apache.org/jsonpath.html;JSon Path
+ * expression/a
+ *
+ * @param text the expression to be evaluated
+ * @return the builder to continue processing the DSL
+ */
+public T jsonPath(String text) {
+return expression(new JsonPathExpression(text));
+}
+
+/**
  * Evaluates a a href=http://commons.apache.org/jxpath/;JXPath 
expression/a
  *
  * @param text the expression to be evaluated

http://git-wip-us.apache.org/repos/asf/camel/blob/794ee2c8/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
 
b/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
new file mode 100644
index 000..31c32e2
--- /dev/null
+++ 
b/camel-core/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software 

[1/3] git commit: CAMEL-6238: camel-jsonpath component.

2013-10-06 Thread davsclaus
Updated Branches:
  refs/heads/master 439c32e0e - 969d88146


CAMEL-6238: camel-jsonpath component.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/293b85c6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/293b85c6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/293b85c6

Branch: refs/heads/master
Commit: 293b85c6e2508e6e4217f576b8d513cd44193f57
Parents: 439c32e
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 11:26:44 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 12:42:29 2013 +0200

--
 components/camel-jsonpath/pom.xml   |  63 ++
 .../camel/jsonpath/JsonPathExpression.java  |  38 
 .../apache/camel/jsonpath/JsonPathLanguage.java |  64 ++
 .../src/main/resources/META-INF/LICENSE.txt | 203 +++
 .../src/main/resources/META-INF/NOTICE.txt  |  11 +
 .../services/org/apache/camel/language/jsonpath |  18 ++
 .../apache/camel/jsonpath/JsonPathCBRTest.java  |  77 +++
 .../camel/jsonpath/JsonPathLanguageTest.java|  67 ++
 .../camel/jsonpath/JsonPathTransformTest.java   |  53 +
 .../src/test/resources/average.json |  16 ++
 .../src/test/resources/books.json   |  22 ++
 .../src/test/resources/cheap.json   |  15 ++
 .../src/test/resources/expensive.json   |  16 ++
 .../src/test/resources/log4j.properties |  36 
 components/pom.xml  |   3 +-
 parent/pom.xml  |   1 +
 16 files changed, 702 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/camel-jsonpath/pom.xml
--
diff --git a/components/camel-jsonpath/pom.xml 
b/components/camel-jsonpath/pom.xml
new file mode 100644
index 000..670f266
--- /dev/null
+++ b/components/camel-jsonpath/pom.xml
@@ -0,0 +1,63 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+  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.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+
+  modelVersion4.0.0/modelVersion
+
+  parent
+groupIdorg.apache.camel/groupId
+artifactIdcomponents/artifactId
+version2.12.2-SNAPSHOT/version
+  /parent
+
+  artifactIdcamel-jsonpath/artifactId
+  packagingbundle/packaging
+  nameCamel :: JSon Path/name
+  descriptionCamel JSON Path Language/description
+
+  properties
+camel.osgi.export.pkgorg.apache.camel.jsonpath.*/camel.osgi.export.pkg
+
camel.osgi.export.serviceorg.apache.camel.spi.LanguageResolver;language=jsonpath/camel.osgi.export.service
+  /properties
+
+  dependencies
+dependency
+  groupIdorg.apache.camel/groupId
+  artifactIdcamel-core/artifactId
+/dependency
+ dependency
+  groupIdcom.jayway.jsonpath/groupId
+  artifactIdjson-path/artifactId
+  version${json-path-version}/version
+/dependency
+
+!-- testing --
+dependency
+  groupIdorg.apache.camel/groupId
+  artifactIdcamel-test/artifactId
+  scopetest/scope
+/dependency
+dependency
+  groupIdorg.slf4j/groupId
+  artifactIdslf4j-log4j12/artifactId
+  scopetest/scope
+/dependency
+
+  /dependencies
+
+/project

http://git-wip-us.apache.org/repos/asf/camel/blob/293b85c6/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
--
diff --git 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
new file mode 100644
index 000..8d39e7c
--- /dev/null
+++ 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathExpression.java
@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * 

svn commit: r881428 - in /websites/production/camel/content: cache/main.pageCache camel-2130-release.html jsonpath.html

2013-10-06 Thread buildbot
Author: buildbot
Date: Sun Oct  6 11:18:43 2013
New Revision: 881428

Log:
Production update by buildbot for camel

Added:
websites/production/camel/content/jsonpath.html
Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2130-release.html

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

Modified: websites/production/camel/content/camel-2130-release.html
==
--- websites/production/camel/content/camel-2130-release.html (original)
+++ websites/production/camel/content/camel-2130-release.html Sun Oct  6 
11:18:43 2013
@@ -117,6 +117,9 @@
 
 h3a shape=rect name=Camel2.13.0Release-NewLanguages/aNew a 
shape=rect href=languages.html title=LanguagesLanguages/a/h3
 
+ullia shape=rect href=jsonpath.html title=JSonPathJSonPath/a - 
To perform a shape=rect href=expression.html 
title=ExpressionExpression/a and a shape=rect href=predicate.html 
title=PredicatePredicate/a on json payloads./li/ul
+
+
 h3a shape=rect name=Camel2.13.0Release-NewExamples/aNew a 
shape=rect href=examples.html title=ExamplesExamples/a/h3
 
 h3a shape=rect name=Camel2.13.0Release-NewTutorials/aNew a 
shape=rect href=tutorials.html title=TutorialsTutorials/a/h3

Added: websites/production/camel/content/jsonpath.html
==
--- websites/production/camel/content/jsonpath.html (added)
+++ websites/production/camel/content/jsonpath.html Sun Oct  6 11:18:43 2013
@@ -0,0 +1,268 @@
+!DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+!--
+
+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.
+--
+html
+head
+link href=http://camel.apache.org/styles/site.css; rel=stylesheet 
type=text/css
+link href=http://camel.apache.org/styles/type-settings.css; 
rel=stylesheet type=text/css
+script src=http://camel.apache.org/styles/prototype.js; 
type=text/javascript/script
+script src=http://camel.apache.org/styles/rico.js; 
type=text/javascript/script
+script src=http://camel.apache.org/styles/site.js; 
type=text/javascript/script
+
+meta http-equiv=Content-type content=text/html;charset=UTF-8
+
+style type=text/css
+  .maincontent { overflow:hidden; }
+/style
+!--[if IE]
+style type=text/css
+  .maincontent { width:100%; }
+/style
+![endif]--
+
+
+  link 
href='http://camel.apache.org/styles/highlighter/styles/shCoreCamel.css' 
rel='stylesheet' type='text/css' /
+  link 
href='http://camel.apache.org/styles/highlighter/styles/shThemeCamel.css' 
rel='stylesheet' type='text/css' /
+  script src='http://camel.apache.org/styles/highlighter/scripts/shCore.js' 
type='text/javascript'/script
+  script 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushJava.js' 
type='text/javascript'/script
+  script 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushXml.js' 
type='text/javascript'/script
+  
+  script type=text/javascript
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  /script
+
+title
+Apache Camel: JSonPath
+/title
+/head
+body
+div class=white_box
+div class=header
+  div class=header_l
+div class=header_r
+/div
+  /div
+/div
+div class=content
+  div class=content_l
+div class=content_r
+  div
+  !-- Banner --
+div id=banner-contentdiv id=asf_logo
+   div id=activemq_logo style=height:108px; background:transparent 
url(banner.data/apache-camel-7.png) no-repeat scroll left top;
+a shape=rect style=float:left; 
width:310px;display:block;text-indent:-5000px;text-decoration:none;line-height:140px;
 margin-top:20px; margin-left:18px; href=http://camel.apache.org/;Camel/a
+a shape=rect style=float:right; 
width:180px;display:block;text-indent:-5000px;text-decoration:none;line-height:80px;
 margin-top:45px; margin-right:10px; href=http://www.apache.org;Apache/a
+   /div
+/div/div
+  !-- Banner --
+div class=top_red_bar
+  

git commit: CAMEL-6238: camel-jsonpath component.

2013-10-06 Thread davsclaus
Updated Branches:
  refs/heads/master 969d88146 - 7817d1434


CAMEL-6238: camel-jsonpath component.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7817d143
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7817d143
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7817d143

Branch: refs/heads/master
Commit: 7817d14343e2e7e6a19f3ad82492726224f3e492
Parents: 969d881
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 16:28:46 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 16:28:46 2013 +0200

--
 .../apache/camel/jsonpath/JSonPathEngine.java   | 37 ++--
 .../apache/camel/jsonpath/JsonPathLanguage.java | 20 ++-
 2 files changed, 46 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/7817d143/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
--
diff --git 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
index 48bde5c..745ce0e 100644
--- 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
+++ 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
@@ -16,22 +16,55 @@
  */
 package org.apache.camel.jsonpath;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 
+import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
+import org.apache.camel.Exchange;
+import org.apache.camel.InvalidPayloadException;
+import org.apache.camel.WrappedFile;
 
 public class JSonPathEngine {
 
 private final String expression;
 private final JsonPath path;
+private final Configuration configuration;
 
 public JSonPathEngine(String expression) {
 this.expression = expression;
+this.configuration = Configuration.defaultConfiguration();
 this.path = JsonPath.compile(expression);
 }
 
-public Object read(InputStream json) throws IOException {
-return path.read(json);
+public Object read(Exchange exchange) throws IOException, 
InvalidPayloadException {
+Object json = exchange.getIn().getBody();
+
+if (json instanceof WrappedFile) {
+json = ((WrappedFile) json).getFile();
+}
+
+// the message body type should use the suitable read method
+if (configuration.getProvider().isContainer(json)) {
+return path.read(json);
+} else if (json instanceof String) {
+String str = (String) json;
+return path.read(str);
+} else if (json instanceof InputStream) {
+InputStream is = (InputStream) json;
+return path.read(is);
+} else if (json instanceof File) {
+File file = (File) json;
+return path.read(file);
+} else if (json instanceof URL) {
+URL url = (URL) json;
+return path.read(url);
+}
+
+// fallback as input stream
+InputStream is = exchange.getIn().getMandatoryBody(InputStream.class);
+return path.read(is);
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/7817d143/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
--
diff --git 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
index 9776f77..b53ce36 100644
--- 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
+++ 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
@@ -16,8 +16,6 @@
  */
 package org.apache.camel.jsonpath;
 
-import java.io.InputStream;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.ExpressionEvaluationException;
@@ -25,7 +23,6 @@ import org.apache.camel.ExpressionIllegalSyntaxException;
 import org.apache.camel.Predicate;
 import org.apache.camel.support.ExpressionAdapter;
 import org.apache.camel.support.LanguageSupport;
-import org.apache.camel.util.IOHelper;
 
 public class JsonPathLanguage extends LanguageSupport {
 
@@ -47,6 +44,11 @@ public class JsonPathLanguage extends LanguageSupport {
 throw new ExpressionEvaluationException(this, exchange, e);
 }
 }
+
+@Override
+public String toString() {
+return jsonpath[ + predicate + ];
+}

git commit: CAMEL-6238: camel-jsonpath component.

2013-10-06 Thread davsclaus
Updated Branches:
  refs/heads/master 7817d1434 - c4f236e8e


CAMEL-6238: camel-jsonpath component.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c4f236e8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c4f236e8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c4f236e8

Branch: refs/heads/master
Commit: c4f236e8e382b89f27837aafdb4b28542b86a2c2
Parents: 7817d14
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 16:37:50 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 16:37:50 2013 +0200

--
 components/camel-jsonpath/pom.xml   |  7 +++-
 .../org/apache/camel/jsonpath/JSonPath.java |  2 +-
 .../apache/camel/jsonpath/JSonPathEngine.java   |  4 +-
 .../apache/camel/jsonpath/JsonPathLanguage.java | 10 ++---
 .../camel/itest/karaf/CamelJsonPathTest.java| 40 
 5 files changed, 53 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c4f236e8/components/camel-jsonpath/pom.xml
--
diff --git a/components/camel-jsonpath/pom.xml 
b/components/camel-jsonpath/pom.xml
index 22033a8..a8514cb 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --
-project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
 
   modelVersion4.0.0/modelVersion
 
@@ -31,6 +32,8 @@
   descriptionCamel JSON Path Language/description
 
   properties
+!-- need to import spi as felix-bundle-plugin has a bug and do not 
include this package despite we use in the source code --
+
camel.osgi.import.before.defaultsorg.apache.camel.spi;${camel.osgi.import.strict.version}/camel.osgi.import.before.defaults
 camel.osgi.export.pkgorg.apache.camel.jsonpath.*/camel.osgi.export.pkg
 
camel.osgi.export.serviceorg.apache.camel.spi.LanguageResolver;language=jsonpath/camel.osgi.export.service
   /properties
@@ -40,7 +43,7 @@
   groupIdorg.apache.camel/groupId
   artifactIdcamel-core/artifactId
 /dependency
- dependency
+dependency
   groupIdcom.jayway.jsonpath/groupId
   artifactIdjson-path/artifactId
   version${json-path-version}/version

http://git-wip-us.apache.org/repos/asf/camel/blob/c4f236e8/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
--
diff --git 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
index 601d64c..354875c 100644
--- 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
+++ 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
@@ -35,6 +35,6 @@ import org.apache.camel.language.LanguageAnnotation;
 @Documented
 @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 @LanguageAnnotation(language = jsonpath)
-public @interface JSonPath {
+public @interface JsonPath {
 String value();
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/c4f236e8/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
--
diff --git 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
index 745ce0e..4724199 100644
--- 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
+++ 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
@@ -27,13 +27,13 @@ import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.WrappedFile;
 
-public class JSonPathEngine {
+public class JsonPathEngine {
 
 private final String expression;
 private final JsonPath path;
 private final Configuration configuration;
 
-public JSonPathEngine(String expression) {
+public JsonPathEngine(String expression) {
 this.expression = expression;
 this.configuration = Configuration.defaultConfiguration();
 this.path = JsonPath.compile(expression);


git commit: CAMEL-6238: camel-jsonpath component.

2013-10-06 Thread davsclaus
Updated Branches:
  refs/heads/master c4f236e8e - a1ed6ef3e


CAMEL-6238: camel-jsonpath component.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1ed6ef3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1ed6ef3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1ed6ef3

Branch: refs/heads/master
Commit: a1ed6ef3e33e98224650664979a588c42e02e813
Parents: c4f236e
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 16:46:47 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 16:46:47 2013 +0200

--
 .../main/java/org/apache/camel/builder/ExpressionClause.java   | 6 +++---
 .../java/org/apache/camel/builder/ExpressionClauseSupport.java | 4 ++--
 .../test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java   | 4 ++--
 .../java/org/apache/camel/jsonpath/JsonPathTransformTest.java  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a1ed6ef3/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java 
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 07ab027..81fd32f 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -278,14 +278,14 @@ public class ExpressionClauseT extends 
ExpressionDefinition {
 
 /**
  * Evaluates a a
- * href=http://camel.apache.org/jsonpath.html;JSon Path
+ * href=http://camel.apache.org/jsonpath.html;Json Path
  * expression/a
  *
  * @param text the expression to be evaluated
  * @return the builder to continue processing the DSL
  */
-public T jsonPath(String text) {
-return delegate.jsonPath(text);
+public T jsonpath(String text) {
+return delegate.jsonpath(text);
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/a1ed6ef3/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
 
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index 64955c2..763b8e2 100644
--- 
a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++ 
b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -313,13 +313,13 @@ public class ExpressionClauseSupportT {
 }
 
 /**
- * Evaluates a a href=http://camel.apache.org/jsonpath.html;JSon Path
+ * Evaluates a a href=http://camel.apache.org/jsonpath.html;Json Path
  * expression/a
  *
  * @param text the expression to be evaluated
  * @return the builder to continue processing the DSL
  */
-public T jsonPath(String text) {
+public T jsonpath(String text) {
 return expression(new JsonPathExpression(text));
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/a1ed6ef3/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
--
diff --git 
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
 
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
index cb9f51c..358c173 100644
--- 
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
+++ 
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
@@ -31,9 +31,9 @@ public class JsonPathCBRTest extends CamelTestSupport {
 public void configure() throws Exception {
 from(direct:start)
 .choice()
-.when().jsonPath($.store.book[?(@.price  10)])
+.when().jsonpath($.store.book[?(@.price  10)])
 .to(mock:cheap)
-.when().jsonPath($.store.book[?(@.price  30)])
+.when().jsonpath($.store.book[?(@.price  30)])
 .to(mock:average)
 .otherwise()
 .to(mock:expensive);

http://git-wip-us.apache.org/repos/asf/camel/blob/a1ed6ef3/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java
--
diff --git 
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java
 

[CONF] Apache Camel JSonPath

2013-10-06 Thread Claus Ibsen (Confluence)







JSonPath
Page edited by Claus Ibsen


 Changes (2)
 




...
from(queue:books.new)   .choice() 
.when().jsonPpath($.store.book[?(@.price  10)]) 
  .to(jms:queue:book.cheap) 
.when().jsonPpath($.store.book[?(@.price  30)]) 
  .to(jms:queue:book.average) .otherwise() 
...


Full Content

JSonPath
Available as of Camel 2.13

Camel supports JSonPath to allow using _expression_ or Predicate on json messages.



from("queue:books.new")
  .choice()
.when().jsonpath("$.store.book[?(@.price  10)]")
  .to("jms:queue:book.cheap")
.when().jsonpath("$.store.book[?(@.price  30)]")
  .to("jms:queue:book.average")
.otherwise()
  .to("jms:queue:book.expensive")



Using XML configuration

If you prefer to configure your routes in your Spring XML file then you can use JSonPath expressions as follows



  camelContext id="camel" xmlns="http://camel.apache.org/schema/spring"
route
  from uri="direct:start"/
  choice
when
  jsonpath$.store.book[?(@.price lt; 10)]/jsonpath
  to uri="mock:cheap"/
/when
when
  jsonpath$.store.book[?(@.price lt; 30)]/jsonpath
  to uri="mock:average"/
/when
otherwise
  to uri="mock:expensive"/
/otherwise
  /choice
/route
  /camelContext



Syntax

See the JSonPath project page for further examples.


JSonPath injection 

You can use Bean Integration to invoke a method on a bean and use various languages such as JSonPath to extract a value from the message and bind it to a method parameter.

For example



public class Foo {
	
@Consume(uri = "activemq:queue:books.new")
public void doSomething(@JSonPath("$.store.book[*].author") String author, @Body String json) {
  // process the inbound message here
}
}



Dependencies

To use JSonPath in your camel routes you need to add the a dependency on camel-jsonpath which implements the JSonPath language. 

If you use maven you could 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).



dependency
  groupIdorg.apache.camel/groupId
  artifactIdcamel-jsonpath/artifactId
  versionx.x.x/version
/dependency





Stop watching space
|
Change email notification preferences

View Online
|
View Changes









svn commit: r881457 - in /websites/production/camel/content: cache/main.pageCache jsonpath.html

2013-10-06 Thread buildbot
Author: buildbot
Date: Sun Oct  6 15:18:40 2013
New Revision: 881457

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/jsonpath.html

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

Modified: websites/production/camel/content/jsonpath.html
==
--- websites/production/camel/content/jsonpath.html (original)
+++ websites/production/camel/content/jsonpath.html Sun Oct  6 15:18:40 2013
@@ -94,9 +94,9 @@
 script class=theme: Default; brush: java; gutter: false 
type=syntaxhighlighter![CDATA[
 from(queue:books.new)
   .choice()
-.when().jsonPath($.store.book[?(@.price lt; 10)])
+.when().jsonpath($.store.book[?(@.price lt; 10)])
   .to(jms:queue:book.cheap)
-.when().jsonPath($.store.book[?(@.price lt; 30)])
+.when().jsonpath($.store.book[?(@.price lt; 30)])
   .to(jms:queue:book.average)
 .otherwise()
   .to(jms:queue:book.expensive)
@@ -146,7 +146,7 @@ from(queue:books.new)
 public class Foo {

 @Consume(uri = activemq:queue:books.new)
-public void doSomething(@JSonPath($.store.book[*].author) String author, 
@Body String json) {
+public void doSomething(@JsonPath($.store.book[*].author) String author, 
@Body String json) {
   // process the inbound message here
 }
 }




[2/2] git commit: Upgrade to beanio 2.0.7

2013-10-06 Thread davsclaus
Upgrade to beanio 2.0.7


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0805dc5b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0805dc5b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0805dc5b

Branch: refs/heads/camel-2.12.x
Commit: 0805dc5b155de48e5c50b067416c7e3dabdda44c
Parents: 64470bf
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 21:13:59 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 21:14:21 2013 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0805dc5b/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 6ffd048..b8e02f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -63,7 +63,7 @@
 aws-java-sdk-version1.5.1/aws-java-sdk-version
 axiom-version1.2.14/axiom-version
 bcel-bundle-version5.2_4/bcel-bundle-version
-beanio-version2.0.6/beanio-version
+beanio-version2.0.7/beanio-version
 bsh-version2.0b5/bsh-version
 bouncycastle-version1.49/bouncycastle-version
 build-helper-maven-plugin-version1.8/build-helper-maven-plugin-version



[1/2] git commit: Upgrade to beanio 2.0.7

2013-10-06 Thread davsclaus
Updated Branches:
  refs/heads/camel-2.12.x 64470bfef - 0805dc5b1
  refs/heads/master a1ed6ef3e - 9f7ed72fd


Upgrade to beanio 2.0.7


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9f7ed72f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9f7ed72f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9f7ed72f

Branch: refs/heads/master
Commit: 9f7ed72fda226e7260ad7e163702aade570a1a40
Parents: a1ed6ef
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 21:13:59 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 21:13:59 2013 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9f7ed72f/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 8c7ddb0..9bc3785 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -64,7 +64,7 @@
 aws-java-sdk-version1.5.1/aws-java-sdk-version
 axiom-version1.2.14/axiom-version
 bcel-bundle-version5.2_4/bcel-bundle-version
-beanio-version2.0.6/beanio-version
+beanio-version2.0.7/beanio-version
 bsh-version2.0b5/bsh-version
 bouncycastle-version1.49/bouncycastle-version
 build-helper-maven-plugin-version1.8/build-helper-maven-plugin-version



[1/2] git commit: Upgraded to MyBatis 3.2.3

2013-10-06 Thread davsclaus
Updated Branches:
  refs/heads/camel-2.12.x 0805dc5b1 - c34111e01
  refs/heads/master 9f7ed72fd - 27cd94763


Upgraded to MyBatis 3.2.3


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/27cd9476
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/27cd9476
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/27cd9476

Branch: refs/heads/master
Commit: 27cd947633830780b5385b05101b628cc6f82b66
Parents: 9f7ed72
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 21:37:27 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 21:37:27 2013 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/27cd9476/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 9bc3785..7bc7538 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -298,7 +298,7 @@
 mustache-java-version0.8.13/mustache-java-version
 mustache-bundle-version0.8.13_1//mustache-bundle-version
 mvel-version2.1.6.Final/mvel-version
-mybatis-version3.2.2/mybatis-version
+mybatis-version3.2.3/mybatis-version
 neethi-bundle-version3.0.1/neethi-bundle-version
 netty3-version3.7.0.Final/netty3-version
 netty-version4.0.8.Final/netty-version



[2/2] git commit: Upgraded to MyBatis 3.2.3

2013-10-06 Thread davsclaus
Upgraded to MyBatis 3.2.3


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c34111e0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c34111e0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c34111e0

Branch: refs/heads/camel-2.12.x
Commit: c34111e01441d470cc6f5f05439b9f6e47da3882
Parents: 0805dc5
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 21:37:27 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 21:37:48 2013 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c34111e0/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index b8e02f4..784cdc3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -294,7 +294,7 @@
 mustache-java-version0.8.13/mustache-java-version
 mustache-bundle-version0.8.13_1//mustache-bundle-version
 mvel-version2.1.6.Final/mvel-version
-mybatis-version3.2.2/mybatis-version
+mybatis-version3.2.3/mybatis-version
 neethi-bundle-version3.0.1/neethi-bundle-version
 netty3-version3.7.0.Final/netty3-version
 netty-version4.0.8.Final/netty-version



[2/2] git commit: Upgraded to mvel 2.1.7

2013-10-06 Thread davsclaus
Upgraded to mvel 2.1.7


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/21a2f7d2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/21a2f7d2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/21a2f7d2

Branch: refs/heads/camel-2.12.x
Commit: 21a2f7d2a849a23b1bf8c6ef1536eb33444bfd28
Parents: c34111e
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 21:43:06 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 21:43:24 2013 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/21a2f7d2/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 784cdc3..525155b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -293,7 +293,7 @@
 msv-version20050913/msv-version
 mustache-java-version0.8.13/mustache-java-version
 mustache-bundle-version0.8.13_1//mustache-bundle-version
-mvel-version2.1.6.Final/mvel-version
+mvel-version2.1.7.Final/mvel-version
 mybatis-version3.2.3/mybatis-version
 neethi-bundle-version3.0.1/neethi-bundle-version
 netty3-version3.7.0.Final/netty3-version



[1/2] git commit: Upgraded to mvel 2.1.7

2013-10-06 Thread davsclaus
Updated Branches:
  refs/heads/camel-2.12.x c34111e01 - 21a2f7d2a
  refs/heads/master 27cd94763 - 5480ec52a


Upgraded to mvel 2.1.7


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5480ec52
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5480ec52
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5480ec52

Branch: refs/heads/master
Commit: 5480ec52a76d2d8ed79a71360368d3878587db4d
Parents: 27cd947
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 21:43:06 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 21:43:06 2013 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5480ec52/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 7bc7538..287ae27 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -297,7 +297,7 @@
 msv-version20050913/msv-version
 mustache-java-version0.8.13/mustache-java-version
 mustache-bundle-version0.8.13_1//mustache-bundle-version
-mvel-version2.1.6.Final/mvel-version
+mvel-version2.1.7.Final/mvel-version
 mybatis-version3.2.3/mybatis-version
 neethi-bundle-version3.0.1/neethi-bundle-version
 netty3-version3.7.0.Final/netty3-version



[1/2] git commit: dependency upgrades

2013-10-06 Thread davsclaus
Updated Branches:
  refs/heads/camel-2.12.x 21a2f7d2a - 575ce3fe2
  refs/heads/master 5480ec52a - 9843f2a36


dependency upgrades


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9843f2a3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9843f2a3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9843f2a3

Branch: refs/heads/master
Commit: 9843f2a362d398910c98e723e8cdddf0d76c911a
Parents: 5480ec5
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 21:55:58 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 21:55:58 2013 +0200

--
 parent/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9843f2a3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 287ae27..fcaf288 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -37,7 +37,7 @@
 abdera-version1.1.3/abdera-version
 !-- Note that activemq dependency is only used for testing! --
 activemq-version5.8.0/activemq-version
-ahc-version1.7.19/ahc-version
+ahc-version1.7.20/ahc-version
 ant-bundle-version1.7.0_6/ant-bundle-version
 antlr-bundle-version3.4_1/antlr-bundle-version
 antlr-runtime-bundle-version3.4_2/antlr-runtime-bundle-version
@@ -49,7 +49,7 @@
 aries-blueprint-proxy-version1.0.0/aries-blueprint-proxy-version
 
aries-blueprint-proxy-impl-version1.0.1/aries-blueprint-proxy-impl-version
 aries-util-version1.1.0/aries-util-version
-
arquillian-junit-container-version1.0.0.CR7/arquillian-junit-container-version
+
arquillian-junit-container-version1.0.4.Final/arquillian-junit-container-version
 
arquillian-weld-ee-embedded-version1.0.0.CR3/arquillian-weld-ee-embedded-version
 asm-bundle-version3.3_2/asm-bundle-version
 asm-version3.1/asm-version
@@ -337,7 +337,7 @@
 rhino-version1.7R2/rhino-version
 rome-bundle-version1.0_3/rome-bundle-version
 rome-version1.0/rome-version
-rxjava-version0.13.2/rxjava-version
+rxjava-version0.14.2/rxjava-version
 saaj-impl-version1.3.2_2/saaj-impl-version
 saxon-bundle-version9.5.1-1_1/saxon-bundle-version
 saxon-version9.5.1-2/saxon-version



[2/2] git commit: dependency upgrades

2013-10-06 Thread davsclaus
dependency upgrades


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/575ce3fe
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/575ce3fe
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/575ce3fe

Branch: refs/heads/camel-2.12.x
Commit: 575ce3fe24b358adf6def731200a35a63c446443
Parents: 21a2f7d
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Oct 6 21:55:58 2013 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Oct 6 21:56:15 2013 +0200

--
 parent/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/575ce3fe/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 525155b..7621c80 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -37,7 +37,7 @@
 abdera-version1.1.3/abdera-version
 !-- Note that activemq dependency is only used for testing! --
 activemq-version5.8.0/activemq-version
-ahc-version1.7.19/ahc-version
+ahc-version1.7.20/ahc-version
 ant-bundle-version1.7.0_6/ant-bundle-version
 antlr-bundle-version3.4_1/antlr-bundle-version
 antlr-runtime-bundle-version3.4_2/antlr-runtime-bundle-version
@@ -49,7 +49,7 @@
 aries-blueprint-proxy-version1.0.0/aries-blueprint-proxy-version
 
aries-blueprint-proxy-impl-version1.0.1/aries-blueprint-proxy-impl-version
 aries-util-version1.1.0/aries-util-version
-
arquillian-junit-container-version1.0.0.CR7/arquillian-junit-container-version
+
arquillian-junit-container-version1.0.4.Final/arquillian-junit-container-version
 
arquillian-weld-ee-embedded-version1.0.0.CR3/arquillian-weld-ee-embedded-version
 asm-bundle-version3.3_2/asm-bundle-version
 asm-version3.1/asm-version
@@ -333,7 +333,7 @@
 rhino-version1.7R2/rhino-version
 rome-bundle-version1.0_3/rome-bundle-version
 rome-version1.0/rome-version
-rxjava-version0.13.2/rxjava-version
+rxjava-version0.14.2/rxjava-version
 saaj-impl-version1.3.2_2/saaj-impl-version
 saxon-bundle-version9.5.1-1_1/saxon-bundle-version
 saxon-version9.5.1-2/saxon-version



git commit: fixed compiler error

2013-10-06 Thread cmueller
Updated Branches:
  refs/heads/master 9843f2a36 - 97de5839c


fixed compiler error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/97de5839
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/97de5839
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/97de5839

Branch: refs/heads/master
Commit: 97de5839c89a87b4d768f46b9719778d0898d53b
Parents: 9843f2a
Author: cmueller cmuel...@apache.org
Authored: Sun Oct 6 22:12:21 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Oct 6 22:12:21 2013 +0200

--
 .../org/apache/camel/jsonpath/JSonPath.java | 40 ---
 .../apache/camel/jsonpath/JSonPathEngine.java   | 70 
 .../org/apache/camel/jsonpath/JsonPath.java | 40 +++
 .../apache/camel/jsonpath/JsonPathEngine.java   | 70 
 4 files changed, 110 insertions(+), 110 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/97de5839/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
--
diff --git 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
deleted file mode 100644
index 354875c..000
--- 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPath.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * 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.
- */
-package org.apache.camel.jsonpath;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.apache.camel.language.LanguageAnnotation;
-
-/**
- * An annotation used to inject a a 
href=http://commons.apache.org/jsonpath/;JSon Path/a
- * expression into a method parameter when using
- * a href=http://camel.apache.org/bean-integration.html;Bean Integration/a
- *
- * @version
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
-@LanguageAnnotation(language = jsonpath)
-public @interface JsonPath {
-String value();
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/97de5839/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
--
diff --git 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
 
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
deleted file mode 100644
index 4724199..000
--- 
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JSonPathEngine.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * 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.
- */
-package org.apache.camel.jsonpath;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import com.jayway.jsonpath.Configuration;
-import com.jayway.jsonpath.JsonPath;
-import org.apache.camel.Exchange;
-import org.apache.camel.InvalidPayloadException;
-import org.apache.camel.WrappedFile;
-
-public class 

git commit: CAMEL-6830: Create camel-ical feature

2013-10-06 Thread cmueller
Updated Branches:
  refs/heads/master 97de5839c - 0f3ff6dee


CAMEL-6830: Create camel-ical feature


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0f3ff6de
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0f3ff6de
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0f3ff6de

Branch: refs/heads/master
Commit: 0f3ff6dee233ce93ae5c222a1d46e4e6ad4c930f
Parents: 97de583
Author: cmueller cmuel...@apache.org
Authored: Sun Oct 6 22:28:43 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Oct 6 22:28:43 2013 +0200

--
 components/camel-ical/pom.xml| 2 +-
 parent/pom.xml   | 2 ++
 platforms/karaf/features/src/main/resources/features.xml | 8 
 3 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0f3ff6de/components/camel-ical/pom.xml
--
diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml
index d5587d9..e907d6f 100644
--- a/components/camel-ical/pom.xml
+++ b/components/camel-ical/pom.xml
@@ -51,7 +51,7 @@
 dependency
   groupIdorg.mnode.ical4j/groupId
   artifactIdical4j/artifactId
-  version1.0.4/version
+  version${ical4j-version}/version
 /dependency
 dependency
   groupIdorg.apache.camel/groupId

http://git-wip-us.apache.org/repos/asf/camel/blob/0f3ff6de/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index fcaf288..c56ce87 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -63,6 +63,7 @@
 aws-java-sdk-bundle-version1.5.1_1/aws-java-sdk-bundle-version
 aws-java-sdk-version1.5.1/aws-java-sdk-version
 axiom-version1.2.14/axiom-version
+backport-util-concurrent-version3.1/backport-util-concurrent-version
 bcel-bundle-version5.2_4/bcel-bundle-version
 beanio-version2.0.7/beanio-version
 bsh-version2.0b5/bsh-version
@@ -182,6 +183,7 @@
 httpclient-version3.1/httpclient-version 
 ibatis-bundle-version2.3.4.726_4/ibatis-bundle-version
 ibatis-version2.3.4.726/ibatis-version
+ical4j-version1.0.5.2/ical4j-version
 infinispan-version6.0.0.Beta2/infinispan-version
 irclib-bundle-version1.10_5/irclib-bundle-version
 irclib-version1.10/irclib-version

http://git-wip-us.apache.org/repos/asf/camel/blob/0f3ff6de/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index c88f011..0d29cf6 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -502,6 +502,14 @@
 bundle 
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}/bundle
 bundlemvn:org.apache.camel/camel-ibatis/${project.version}/bundle
   /feature
+  feature name='camel-ical' version='${project.version}' resolver='(obr)' 
start-level='50'
+bundle 
dependency='true'mvn:commons-lang/commons-lang/${commons-lang-version}/bundle
+bundle 
dependency='true'mvn:commons-codec/commons-codec/${commons-codec-version}/bundle
+bundle 
dependency='true'wrap:mvn:backport-util-concurrent/backport-util-concurrent/${backport-util-concurrent-version}$Bundle-SymbolicName=backport-util-concurrent.backport-util-concurrentamp;Bundle-Version=${backport-util-concurrent-version}/bundle
+bundle 
dependency='true'mvn:org.mnode.ical4j/ical4j/${ical4j-version}/bundle
+feature version='${project.version}'camel-core/feature
+bundlemvn:org.apache.camel/camel-ical/${project.version}/bundle
+  /feature
   feature name='camel-irc' version='${project.version}' resolver='(obr)' 
start-level='50'
 bundle 
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}/bundle
 feature version='${project.version}'camel-core/feature



[CONF] Apache Camel Camel 2.13.0 Release

2013-10-06 Thread Christian Mueller (Confluence)







Camel 2.13.0 Release
Page edited by Christian Mueller


 Changes (1)
 




...
* Guave 14.0.1 to 15.0 * Hazelcast 2.6 to 3.0.2 
* ICal4j 1.0.4 to 1.0.5.2 
* Jetty 7.6.9 to 8.1.12 * Joda time 2.1 to 2.3 
...


Full Content

Camel 2.13.0 release (currently in progress)




New and Noteworthy

Welcome to the 2.13.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)


	When using multiple OSGi Blueprint cm:property-placeholder's then Camel now favors using non-default placeholders, or the last property-placeholder defined in the Blueprint XML file. This allows for example to define default properties in one placeholder, and override these values in other placeholders.
	FTP consumer allow to download a single named file without using the FTP LIST command. This allows to download a known file from a FTP server even when the user account does not have permission to do FTP LIST command.
	FTP consumer allow to ignore file not found or insufficient file permission errors.
	Data Format using marshal now leverages Stream caching out of the box if enabled, which allows to marshal big streams and spool to disk, instead of being pure in-memory based.
	Improved using Bean when the bean is looked up in the Registry, when using concurrent processing in the route.
	Added cache option to beanRef and bean in the DSL. This avoids looking up the Bean from the Registry on each usage; this can safely be done for singleton beans.
	Configuring Data Formats in XML attributes now supports reference lookup using the # syntax, eg jaxb xmlStreamWriterWrapper="#myWriterWrapper" ..
	JDBC component now also support outputType to specify the expected output as either a List or single Object. As well allow to map to a bean using a BeanRowMapper to control the mapping of ROW names to bean properties.
	Both Quartz as well as Quartz2 based ScheduledRoutePolicy has been improved to better support cluster setups (e.g. to not schedule jobs being already scheduled through another node inside a given cluster).
	Reduced the work the Aggregate EIP does while holding a lock during aggregation, which can lead to improved performance in some use-cases.
	JndiRegistry now implements all the find methods.
	VM component now supports multipleConsumers=true across deployment units.



Fixed Issues


	Fixed an ArrayIndexOutOfBoundsException with Message History when using SEDA
	Fixed requestTimeout on Netty not triggering when we have received message.
	Fixed Parameter Binding Annotations on boolean types to evaluate as Predicate instead of _expression_
	Fixed using File consumer with delete=truereadLock=fileLock not being able to delete the file on Windows.
	Fixed Throttler to honor time slots after period expires (eg so it works consistently and as expected).
	Fixed getting JMSXUserID property when consuming from ActiveMQ
	Fixed interceptFrom to support property placeholders
	Fixed a race condition in initializing SSLContext in Netty and Netty HTTP



New Enterprise Integration Patterns

New Components


	camel-infinispan
	camel-splunk



New DSL

New Annotations

New Data Formats

New Languages


	JSonPath - To perform _expression_ and Predicate on json payloads.



New Examples

New Tutorials

API changes

Known Issues

Dependency Upgrades


	CXF 2.7.6 to 2.7.7
	EHCache 2.7.2 to 2.7.4
	Elasticsearch 0.20.6 to 0.90.3
	FOP 1.0 to 1.1
	Guave 14.0.1 to 15.0
	Hazelcast 2.6 to 3.0.2
	ICal4j 1.0.4 to 1.0.5.2
	Jetty 7.6.9 to 8.1.12
	Joda time 2.1 to 2.3
	Lucene 3.6.0 to 4.4.0
	MongoDB Java Driver 2.11.2 to 2.11.3
	Quartz 2.2.0 to 2.2.1
	Restlet 2.0.15 to 2.1.4
	Saxon 9.5.0.2 to 9.5.1-2
	Servlet API 2.5 to 3.0
	SolrJ 3.6.2 to 4.4.0
	Spring Batch 2.2.1.RELEASE to 2.2.2.RELEASE
	Spring Redis 1.0.4.RELEASE to 1.1.0.RELEASE
	TestNG 6.8.5 to 6.8.7



Internal changes

	Add RouteAware API to inject Route for Service's in routes, for example the Consumer's of the routes.
	IOHelper.gerCharsetName will now lookup key Exchange.CHARSET_NAME in header first and then fallback to property.



Changes that may affect end users

	Components depending on Servlet API has been upgrade from Servlet API 2.5 to 3.0
	Jetty upgraded from 7.6.x to 8.1.x
	Hazelcast Component uses Object instead of String as the key.



Important changes to consider when upgrading

	If using groupedExchanges option on Aggregate EIP then the Exchanges is now stored on the message body as well. The old way of storing as a property is considered deprecated. See more details at Aggregate.



Getting the Distributions

Binary Distributions




 Description 
 Download Link 
 PGP Signature file of download 


 Windows Distribution 
 apache-camel-2.13.0.zip 
 apache-camel-2.13.0.zip.asc 


 Unix/Linux/Cygwin 

git commit: CAMEL-6830: Create camel-ical feature

2013-10-06 Thread cmueller
Updated Branches:
  refs/heads/camel-2.12.x 575ce3fe2 - fbe8f52cc


CAMEL-6830: Create camel-ical feature


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fbe8f52c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fbe8f52c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fbe8f52c

Branch: refs/heads/camel-2.12.x
Commit: fbe8f52cc759c1a4b8c7da587156e6a8b5bb871f
Parents: 575ce3f
Author: cmueller cmuel...@apache.org
Authored: Sun Oct 6 22:28:43 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Oct 6 22:39:16 2013 +0200

--
 components/camel-ical/pom.xml| 2 +-
 parent/pom.xml   | 2 ++
 platforms/karaf/features/src/main/resources/features.xml | 8 
 3 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/fbe8f52c/components/camel-ical/pom.xml
--
diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml
index d176b9c..b50d1a4 100644
--- a/components/camel-ical/pom.xml
+++ b/components/camel-ical/pom.xml
@@ -51,7 +51,7 @@
 dependency
   groupIdorg.mnode.ical4j/groupId
   artifactIdical4j/artifactId
-  version1.0.4/version
+  version${ical4j-version}/version
 /dependency
 dependency
   groupIdorg.apache.camel/groupId

http://git-wip-us.apache.org/repos/asf/camel/blob/fbe8f52c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 7621c80..238b272 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -62,6 +62,7 @@
 aws-java-sdk-bundle-version1.5.1_1/aws-java-sdk-bundle-version
 aws-java-sdk-version1.5.1/aws-java-sdk-version
 axiom-version1.2.14/axiom-version
+backport-util-concurrent-version3.1/backport-util-concurrent-version
 bcel-bundle-version5.2_4/bcel-bundle-version
 beanio-version2.0.7/beanio-version
 bsh-version2.0b5/bsh-version
@@ -181,6 +182,7 @@
 httpclient-version3.1/httpclient-version 
 ibatis-bundle-version2.3.4.726_4/ibatis-bundle-version
 ibatis-version2.3.4.726/ibatis-version
+ical4j-version1.0.5.2/ical4j-version
 irclib-bundle-version1.10_5/irclib-bundle-version
 irclib-version1.10/irclib-version
 isorelax-bundle-version20050913_4/isorelax-bundle-version

http://git-wip-us.apache.org/repos/asf/camel/blob/fbe8f52c/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index a8bd47e..872a5bb 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -477,6 +477,14 @@
 bundle 
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}/bundle
 bundlemvn:org.apache.camel/camel-ibatis/${project.version}/bundle
   /feature
+  feature name='camel-ical' version='${project.version}' resolver='(obr)' 
start-level='50'
+bundle 
dependency='true'mvn:commons-lang/commons-lang/${commons-lang-version}/bundle
+bundle 
dependency='true'mvn:commons-codec/commons-codec/${commons-codec-version}/bundle
+bundle 
dependency='true'wrap:mvn:backport-util-concurrent/backport-util-concurrent/${backport-util-concurrent-version}$Bundle-SymbolicName=backport-util-concurrent.backport-util-concurrentamp;Bundle-Version=${backport-util-concurrent-version}/bundle
+bundle 
dependency='true'mvn:org.mnode.ical4j/ical4j/${ical4j-version}/bundle
+feature version='${project.version}'camel-core/feature
+bundlemvn:org.apache.camel/camel-ical/${project.version}/bundle
+  /feature
   feature name='camel-irc' version='${project.version}' resolver='(obr)' 
start-level='50'
 bundle 
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}/bundle
 feature version='${project.version}'camel-core/feature



git commit: CAMEL-6830: Create camel-ical feature

2013-10-06 Thread cmueller
Updated Branches:
  refs/heads/camel-2.11.x 120a2da36 - bd2c3f6d2


CAMEL-6830: Create camel-ical feature


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd2c3f6d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd2c3f6d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd2c3f6d

Branch: refs/heads/camel-2.11.x
Commit: bd2c3f6d25c7ff80d52071b85596385964c4dc46
Parents: 120a2da
Author: cmueller cmuel...@apache.org
Authored: Sun Oct 6 22:28:43 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Oct 6 22:40:27 2013 +0200

--
 components/camel-ical/pom.xml| 2 +-
 parent/pom.xml   | 2 ++
 platforms/karaf/features/src/main/resources/features.xml | 8 
 3 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bd2c3f6d/components/camel-ical/pom.xml
--
diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml
index abe07ec..4ab7ffd 100644
--- a/components/camel-ical/pom.xml
+++ b/components/camel-ical/pom.xml
@@ -51,7 +51,7 @@
 dependency
   groupIdorg.mnode.ical4j/groupId
   artifactIdical4j/artifactId
-  version1.0.4/version
+  version${ical4j-version}/version
 /dependency
 dependency
   groupIdorg.apache.camel/groupId

http://git-wip-us.apache.org/repos/asf/camel/blob/bd2c3f6d/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index e67fdd6..635cc2a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -62,6 +62,7 @@
 aws-java-sdk-bundle-version1.3.27_1/aws-java-sdk-bundle-version
 aws-java-sdk-version1.3.27/aws-java-sdk-version
 axiom-version1.2.14/axiom-version
+backport-util-concurrent-version3.1/backport-util-concurrent-version
 bcel-bundle-version5.2_4/bcel-bundle-version
 bcpg-jdk15on-bundle-version1.47_1/bcpg-jdk15on-bundle-version
 beanio-version2.0.6/beanio-version
@@ -177,6 +178,7 @@
 httpclient-version3.1/httpclient-version 
 ibatis-bundle-version2.3.4.726_4/ibatis-bundle-version
 ibatis-version2.3.4.726/ibatis-version
+ical4j-version1.0.5.2/ical4j-version
 irclib-bundle-version1.10_5/irclib-bundle-version
 irclib-version1.10/irclib-version
 isorelax-bundle-version20050913_4/isorelax-bundle-version

http://git-wip-us.apache.org/repos/asf/camel/blob/bd2c3f6d/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 9730a57..6d556f4 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -449,6 +449,14 @@
 bundle 
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}/bundle
 bundlemvn:org.apache.camel/camel-ibatis/${project.version}/bundle
   /feature
+  feature name='camel-ical' version='${project.version}' resolver='(obr)' 
start-level='50'
+bundle 
dependency='true'mvn:commons-lang/commons-lang/${commons-lang-version}/bundle
+bundle 
dependency='true'mvn:commons-codec/commons-codec/${commons-codec-version}/bundle
+bundle 
dependency='true'wrap:mvn:backport-util-concurrent/backport-util-concurrent/${backport-util-concurrent-version}$Bundle-SymbolicName=backport-util-concurrent.backport-util-concurrentamp;Bundle-Version=${backport-util-concurrent-version}/bundle
+bundle 
dependency='true'mvn:org.mnode.ical4j/ical4j/${ical4j-version}/bundle
+feature version='${project.version}'camel-core/feature
+bundlemvn:org.apache.camel/camel-ical/${project.version}/bundle
+  /feature
   feature name='camel-irc' version='${project.version}' resolver='(obr)' 
start-level='50'
 bundle 
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}/bundle
 feature version='${project.version}'camel-core/feature



git commit: fixed the camel-jsonpath feature

2013-10-06 Thread cmueller
Updated Branches:
  refs/heads/master 0f3ff6dee - f64549a8e


fixed the camel-jsonpath feature


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f64549a8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f64549a8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f64549a8

Branch: refs/heads/master
Commit: f64549a8e15afd7ac4036257a4af316893dd4dfa
Parents: 0f3ff6d
Author: cmueller cmuel...@apache.org
Authored: Sun Oct 6 23:00:42 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Oct 6 23:00:42 2013 +0200

--
 platforms/karaf/features/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f64549a8/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 0d29cf6..1f83ff4 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -616,6 +616,7 @@
 bundlemvn:org.apache.camel/camel-jsch/${project.version}/bundle
   /feature
   feature name='camel-jsonpath' version='${project.version}' resolver='(obr)' 
start-level='50'
+feature version='${project.version}'camel-core/feature
 bundlemvn:com.jayway.jsonpath/json-path/${json-path-version}/bundle
 bundlemvn:net.minidev/json-smart/${json-smart-version}/bundle
 bundlemvn:org.apache.camel/camel-jsonpath/${project.version}/bundle



git commit: upgrade xmlunit 1.4 to 1.5

2013-10-06 Thread cmueller
Updated Branches:
  refs/heads/master f64549a8e - 8240c0076


upgrade xmlunit 1.4 to 1.5


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8240c007
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8240c007
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8240c007

Branch: refs/heads/master
Commit: 8240c0076b05df72b3d42609e0e1d3793cb7f60a
Parents: f64549a
Author: cmueller cmuel...@apache.org
Authored: Sun Oct 6 23:02:52 2013 +0200
Committer: cmueller cmuel...@apache.org
Committed: Sun Oct 6 23:02:52 2013 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8240c007/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index c56ce87..d9079b5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -425,7 +425,7 @@
 xmlrpc-client-bundle-version3.1.3_1/xmlrpc-client-bundle-version
 xmlschema-version2.0/xmlschema-version
 xmlsec-version1.5.5/xmlsec-version
-xmlunit-version1.4/xmlunit-version
+xmlunit-version1.5/xmlunit-version
 xpp3-bundle-version1.1.4c_6/xpp3-bundle-version
 xpp3-version1.1.4c/xpp3-version
 xsdlib-version2013.2/xsdlib-version



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

2013-10-06 Thread buildbot
Author: buildbot
Date: Sun Oct  6 21:18:40 2013
New Revision: 881481

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/camel-2130-release.html
==
--- websites/production/camel/content/camel-2130-release.html (original)
+++ websites/production/camel/content/camel-2130-release.html Sun Oct  6 
21:18:40 2013
@@ -130,7 +130,7 @@
 
 h2a shape=rect 
name=Camel2.13.0Release-DependencyUpgrades/aDependency Upgrades/h2
 
-ulliCXF 2.7.6 to 2.7.7/liliEHCache 2.7.2 to 
2.7.4/liliElasticsearch 0.20.6 to 0.90.3/liliFOP 1.0 to 
1.1/liliGuave 14.0.1 to 15.0/liliHazelcast 2.6 to 3.0.2/liliJetty 
7.6.9 to 8.1.12/liliJoda time 2.1 to 2.3/liliLucene 3.6.0 to 
4.4.0/liliMongoDB Java Driver 2.11.2 to 2.11.3/liliQuartz 2.2.0 to 
2.2.1/liliRestlet 2.0.15 to 2.1.4/liliSaxon 9.5.0.2 to 
9.5.1-2/liliServlet API 2.5 to 3.0/liliSolrJ 3.6.2 to 
4.4.0/liliSpring Batch 2.2.1.RELEASE to 2.2.2.RELEASE/liliSpring Redis 
1.0.4.RELEASE to 1.1.0.RELEASE/liliTestNG 6.8.5 to 6.8.7/li/ul
+ulliCXF 2.7.6 to 2.7.7/liliEHCache 2.7.2 to 
2.7.4/liliElasticsearch 0.20.6 to 0.90.3/liliFOP 1.0 to 
1.1/liliGuave 14.0.1 to 15.0/liliHazelcast 2.6 to 3.0.2/liliICal4j 
1.0.4 to 1.0.5.2/liliJetty 7.6.9 to 8.1.12/liliJoda time 2.1 to 
2.3/liliLucene 3.6.0 to 4.4.0/liliMongoDB Java Driver 2.11.2 to 
2.11.3/liliQuartz 2.2.0 to 2.2.1/liliRestlet 2.0.15 to 
2.1.4/liliSaxon 9.5.0.2 to 9.5.1-2/liliServlet API 2.5 to 
3.0/liliSolrJ 3.6.2 to 4.4.0/liliSpring Batch 2.2.1.RELEASE to 
2.2.2.RELEASE/liliSpring Redis 1.0.4.RELEASE to 
1.1.0.RELEASE/liliTestNG 6.8.5 to 6.8.7/li/ul
 
 
 h2a shape=rect name=Camel2.13.0Release-Internalchanges/aInternal 
changes/h2




git commit: CAMEL-6831 Upgrade Apache HTTP Client 4.2.5 to 4.3 (camel-http4)

2013-10-06 Thread raulk
Updated Branches:
  refs/heads/master 8240c0076 - c0e4330c0


CAMEL-6831 Upgrade Apache HTTP Client 4.2.5 to 4.3 (camel-http4)


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c0e4330c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c0e4330c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c0e4330c

Branch: refs/heads/master
Commit: c0e4330c0ef395a8bca6f01b0f8dfaf5b2f45872
Parents: 8240c00
Author: Raúl Kripalani ra...@apache.org
Authored: Sun Oct 6 22:38:35 2013 +0100
Committer: Raúl Kripalani ra...@apache.org
Committed: Sun Oct 6 22:39:27 2013 +0100

--
 .../http4/HttpNoConnectionRedeliveryTest.java   |  7 +++
 .../component/http4/HttpNoConnectionTest.java   |  7 +++
 .../component/http4/HttpServerTestSupport.java  | 21 +---
 parent/pom.xml  |  4 ++--
 4 files changed, 13 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c0e4330c/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
index c745570..b34ccb3 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionRedeliveryTest.java
@@ -21,12 +21,11 @@ import java.net.ConnectException;
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http4.handler.BasicValidationHandler;
-import org.apache.http.conn.HttpHostConnectException;
 import org.apache.http.localserver.LocalTestServer;
 import org.junit.Test;
 
 /**
- * @version 
+ * @version
  */
 public class HttpNoConnectionRedeliveryTest extends BaseHttpTest {
 
@@ -47,8 +46,8 @@ public class HttpNoConnectionRedeliveryTest extends 
BaseHttpTest {
 Exchange exchange = template.request(direct:start, null);
 assertTrue(exchange.isFailed());
 
-HttpHostConnectException cause = 
assertIsInstanceOf(HttpHostConnectException.class, exchange.getException());
-assertIsInstanceOf(ConnectException.class, cause.getCause());
+ConnectException cause = assertIsInstanceOf(ConnectException.class, 
exchange.getException());
+assertTrue(cause.getMessage().contains(refused));
 
 assertEquals(true, exchange.getIn().getHeader(Exchange.REDELIVERED));
 assertEquals(4, 
exchange.getIn().getHeader(Exchange.REDELIVERY_COUNTER));

http://git-wip-us.apache.org/repos/asf/camel/blob/c0e4330c/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
index fec4f17..f334d2f 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpNoConnectionTest.java
@@ -21,12 +21,11 @@ import java.net.ConnectException;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.component.http4.handler.BasicValidationHandler;
-import org.apache.http.conn.HttpHostConnectException;
 import org.apache.http.localserver.LocalTestServer;
 import org.junit.Test;
 
 /**
- * @version 
+ * @version
  */
 public class HttpNoConnectionTest extends BaseHttpTest {
 
@@ -50,8 +49,8 @@ public class HttpNoConnectionTest extends BaseHttpTest {
 Exchange reply = template.request(url, null);
 Exception e = reply.getException();
 assertNotNull(Should have thrown an exception, e);
-HttpHostConnectException cause = 
assertIsInstanceOf(HttpHostConnectException.class, e);
-assertIsInstanceOf(ConnectException.class, cause.getCause());
+ConnectException cause = assertIsInstanceOf(ConnectException.class, e);
+assertTrue(cause.getMessage().contains(refused));
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/c0e4330c/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
--
diff --git