camel git commit: documented the dependency to libsnappyjava.dylib for the camel-infinispan features

2015-03-10 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/master 6a75adf57 - 9532383bf


documented the dependency to libsnappyjava.dylib for the camel-infinispan 
features


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

Branch: refs/heads/master
Commit: 9532383bf1a9019ba47e725b4b047399bab6753d
Parents: 6a75adf
Author: Christian Mueller cmuel...@apache.org
Authored: Tue Mar 10 10:34:46 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Tue Mar 10 10:34:46 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/9532383b/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 5f94ce9..7ca8560 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -697,7 +697,7 @@
 bundlemvn:org.apache.camel/camel-ical/${project.version}/bundle
   /feature
   feature name='camel-infinispan' version='${project.version}' 
resolver='(obr)' start-level='50'
-detailsThe camel-infinispan feature can only run on a SUN JVM. You need 
to add the package sun.misc to the java platform packages in the 
etc/jre.properties file. /details
+detailsThe camel-infinispan feature can only run on a SUN JVM. You need 
to add the package sun.misc to the java platform packages in the 
etc/jre.properties file. It also needs libsnappyjava.dylib in 
java.library.path/details
featuretransaction/feature
 bundle 
dependency='true'mvn:org.infinispan/infinispan-core/${infinispan-version}/bundle
 bundle 
dependency='true'mvn:org.infinispan/infinispan-commons/${infinispan-version}/bundle



svn commit: r8234 - /release/camel/apache-camel/2.15.0/

2015-03-10 Thread ningjiang
Author: ningjiang
Date: Tue Mar 10 14:19:24 2015
New Revision: 8234

Log:
Apache Camel 2.15.0 release distro placeholder.

Added:
release/camel/apache-camel/2.15.0/



svn commit: r943183 [2/2] - /websites/production/camel/content/manual/camel-manual-2.15.0.html

2015-03-10 Thread ningjiang

Added: websites/production/camel/content/manual/camel-manual-2.15.0.html
==
--- websites/production/camel/content/manual/camel-manual-2.15.0.html (added)
+++ websites/production/camel/content/manual/camel-manual-2.15.0.html Tue Mar 
10 14:38:19 2015
@@ -0,0 +1,29884 @@
+html
+head
+link href=http://camel.apache.org/styles/camel-manual.css; rel=stylesheet 
type=text/css /
+style type=text/css
+@page :left {
+@top-left {
+content: Apache Camel 2.15.0 Developer's 
Manual;
+}
+}
+/style
+
+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/shBrushSql.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 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushPlain.js' 
type='text/javascript'/script
+
+script type=text/javascript
+SyntaxHighlighter.defaults['toolbar'] = false;
+SyntaxHighlighter.all();
+/script
+/head
+bodydiv class=wiki-content maincontentdiv class=titlepage 
id=titlepage
+h1 id=BookInOnePage-ApacheCamelApache Camel/h1
+h2 id=BookInOnePage-UserGuideUser Guide/h2
+p
+/ph3Version 2.15.0/h3
+br clear=none
+Copyright 2007-2014, Apache Software Foundation/div
+div class=toc id=toc
+h1 id=BookInOnePage-TableofContentsTable of Contents/h1
+
+p
+/pul class=tocli class=frontmattera shape=rect href=#tocTable 
of Contents/a/lili class=chaptera shape=rect 
href=#chapter-introductionIntroduction/a/lili class=chaptera 
shape=rect href=#chapter-quickstartQuickstart/a/lili 
class=chaptera shape=rect href=#chapter-getting-startedGetting 
Started/a/lili class=chaptera shape=rect 
href=#chapter-architectureArchitecture/a/lili class=chaptera 
shape=rect href=#chapter-enterprise-integration-patternsEnterprise 
Integration Patterns/a/lili class=chaptera shape=rect 
href=#chapter-cook-bookCook Book/a/lili class=chaptera shape=rect 
href=#chapter-tutorialsTutorials/a/lili class=chaptera shape=rect 
href=#chapter-languages-supported-AppendixLanguage Appendix/a/lili 
class=chaptera shape=rect href=#chapter-dataformat-AppendixDataFormat 
Appendix/a/lili class=chaptera shape=rect href=#chapter-pattern-app
 endixPattern Appendix/a/lili class=chaptera shape=rect 
href=#chapter-component-appendixComponent Appendix/a/lili 
class=endmattera shape=rect href=#indexIndex/a/li/ul
+/div
+div class=chapter page-reset id=chapter-introduction
+h1 id=BookInOnePage-IntroductionIntroduction/h1
+
+Apache Camel #8482; is a versatile open-source integration framework based on 
known a shape=rect href=enterprise-integration-patterns.htmlEnterprise 
Integration Patterns/a.
+
+pCamel empowers you to define routing and mediation rules in a variety of 
domain-specific languages, including a Java-based a shape=rect 
href=dsl.htmlFluent API/a, a shape=rect href=spring.htmlSpring/a 
or a shape=rect href=using-osgi-blueprint-with-camel.htmlBlueprint/a a 
shape=rect href=xml-configuration.htmlXML Configuration/a files, and a 
a shape=rect href=scala-dsl.htmlScala DSL/a. This means you get smart 
completion of routing rules in your IDE, whether in a Java, Scala or XML 
editor./p
+
+pApache Camel uses a shape=rect href=uris.htmlURIs/a to work 
directly with any kind of a shape=rect href=transport.htmlTransport/a 
or messaging model such as a shape=rect href=http.htmlHTTP/a, a 
shape=rect href=activemq.htmlActiveMQ/a, a shape=rect 
href=jms.htmlJMS/a, a shape=rect href=jbi.htmlJBI/a, SCA, a 
shape=rect href=mina.htmlMINA/a or a shape=rect 
href=cxf.htmlCXF/a, as well as pluggable a shape=rect 
href=components.htmlComponents/a and a shape=rect 
href=data-format.htmlData Format/a options. Apache Camel is a small 
library with minimal a shape=rect 
href=what-are-the-dependencies.htmldependencies/a for easy embedding in 
any Java application. Apache Camel lets you work with the same a shape=rect 
href=exchange.htmlAPI/a regardless which kind of a 

svn commit: r943184 [3/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

2015-03-10 Thread ningjiang
Added: 
websites/production/camel/content/schema/cxf/camel-cxf-2.14.2-blueprint.xsd
==
--- websites/production/camel/content/schema/cxf/camel-cxf-2.14.2-blueprint.xsd 
(added)
+++ websites/production/camel/content/schema/cxf/camel-cxf-2.14.2-blueprint.xsd 
Tue Mar 10 14:41:55 2015
@@ -0,0 +1,178 @@
+?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.
+--
+xsd:schema xmlns=http://camel.apache.org/schema/blueprint/cxf;
+xmlns:xsd=http://www.w3.org/2001/XMLSchema;
+xmlns:beans=http://www.osgi.org/xmlns/blueprint/v1.0.0;
+xmlns:cxf-beans=http://cxf.apache.org/configuration/beans;
+xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+targetNamespace=http://camel.apache.org/schema/blueprint/cxf;
+elementFormDefault=qualified
+attributeFormDefault=unqualified
+xsi:schemaLocation=http://www.osgi.org/xmlns/blueprint/v1.0.0 
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd;
+
+  xsd:import namespace=http://www.osgi.org/xmlns/blueprint/v1.0.0; 
schemaLocation=http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd/
+  xsd:import namespace=http://cxf.apache.org/configuration/beans; 
schemaLocation=http://cxf.apache.org/schemas/configuration/cxf-beans.xsd/
+
+  xsd:element name=cxfEndpoint
+xsd:complexType
+  xsd:complexContent
+xsd:extension base=beans:Tcomponent
+  xsd:all
+xsd:element name=binding type=xsd:anyType minOccurs=0/
+xsd:element name=dataBinding type=xsd:anyType minOccurs=0/
+xsd:element name=features type=xsd:anyType minOccurs=0/
+xsd:element name=inInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=inFaultInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=outInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=outFaultInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=handlers type=xsd:anyType minOccurs=0/
+xsd:element name=properties type=beans:Tmap minOccurs=0/
+xsd:element name=schemaLocations type=schemasType 
minOccurs=0/
+xsd:element name=serviceBean type=xsd:anyType minOccurs=0/
+xsd:element name=serviceFactory type=xsd:anyType 
minOccurs=0/
+  /xsd:all
+  !-- xsd:attributeGroup ref=cxf-beans:beanAttributes/--
+  xsd:attribute name=address type=xsd:string/
+  xsd:attribute name=bindingId type=xsd:string/
+  xsd:attribute name=bus type=xsd:string/
+  xsd:attribute name=serviceClass type=xsd:string/
+  xsd:attribute name=transportId type=xsd:string/
+  xsd:attribute name=wsdlURL type=xsd:string/
+  xsd:attribute name=endpointName type=xsd:QName/
+  xsd:attribute name=serviceName type=xsd:QName/
+  xsd:attribute name=loggingFeatureEnabled type=xsd:boolean/
+  xsd:attribute name=loggingSizeLimit type=xsd:integer /
+  xsd:attribute name=continuationTimeout type=xsd:long /
+  xsd:attribute name=publishedEndpointUrl type=xsd:string /
+/xsd:extension
+  /xsd:complexContent
+/xsd:complexType
+  /xsd:element
+
+  xsd:element name=rsServer
+xsd:complexType
+  xsd:complexContent
+xsd:extension base=beans:Tcomponent
+  xsd:all
+xsd:element name=executor type=xsd:anyType minOccurs=0/
+xsd:element name=features type=xsd:anyType minOccurs=0/
+xsd:element name=binding type=xsd:anyType minOccurs=0/
+xsd:element name=inInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=inFaultInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=invoker type=xsd:anyType minOccurs=0/
+xsd:element name=outInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=outFaultInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=properties type=beans:Tmap minOccurs=0/
+xsd:element name=serviceBeans type=xsd:anyType minOccurs=0/
+xsd:element name=modelBeans type=xsd:anyType minOccurs=0/

svn commit: r943185 [1/2] - /websites/production/camel/content/manual/camel-manual-2.14.2.html

2015-03-10 Thread ningjiang
Author: ningjiang
Date: Tue Mar 10 14:42:27 2015
New Revision: 943185

Log:
Uploading released manuals for camel-2.14.2

Added:
websites/production/camel/content/manual/camel-manual-2.14.2.html



svn commit: r8238 - /release/camel/apache-camel/2.14.2/

2015-03-10 Thread ningjiang
Author: ningjiang
Date: Tue Mar 10 14:26:08 2015
New Revision: 8238

Log:
Apache Camel 2.14.2 released artifacts.

Added:
release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip   (with props)
release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip.asc
release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip.md5
release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip.sha1
release/camel/apache-camel/2.14.2/apache-camel-2.14.2.pom
release/camel/apache-camel/2.14.2/apache-camel-2.14.2.pom.asc
release/camel/apache-camel/2.14.2/apache-camel-2.14.2.pom.md5
release/camel/apache-camel/2.14.2/apache-camel-2.14.2.pom.sha1
release/camel/apache-camel/2.14.2/apache-camel-2.14.2.tar.gz   (with props)
release/camel/apache-camel/2.14.2/apache-camel-2.14.2.tar.gz.asc
release/camel/apache-camel/2.14.2/apache-camel-2.14.2.tar.gz.md5
release/camel/apache-camel/2.14.2/apache-camel-2.14.2.tar.gz.sha1
release/camel/apache-camel/2.14.2/apache-camel-2.14.2.zip   (with props)
release/camel/apache-camel/2.14.2/apache-camel-2.14.2.zip.asc
release/camel/apache-camel/2.14.2/apache-camel-2.14.2.zip.md5
release/camel/apache-camel/2.14.2/apache-camel-2.14.2.zip.sha1

Added: release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip
==
Binary file - no diff available.

Propchange: release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip
--
svn:mime-type = application/octet-stream

Added: release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip.asc
==
--- release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip.asc (added)
+++ release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip.asc Tue Mar 
10 14:26:08 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJU9biOAAoJEPBYilUU0N7pZKwP/260DJm0NTr2BXG1dHAzi7Qr
+wI0NNswYeH7AY8XznpB9GlHfJi1mn2AOVXrH9QnZs98XEpeMAxalGqgOyGUb/V3a
+VWzVdIAxQjRX/iNGEdkUB2r06umVx67jXpwoSXwohQtfuewJ6ljepyUrYA6tFNWY
+rK9f0yG8O47Atnr2Yhy/6wU1T/8K6sY9aOmYfsYd37A8SBQha4pXk10kawUlAmXa
+9FlEdAvn5QFR+6pNacgSWTH90hGz96BO1hKR9nfeJTgVVhfPOQA+jN9raM9tuHJL
+LRqj+g3YFz6iwaoLeoBLOeODINdcrW4BMN3ESoT+9QNDFDAZIixGQoKcYNelu9nb
+amoRxvsYJkolBdVRJ7R108/RFYGU/TVwy1tcSNc6dqL8ttZKOzClPLqHcn5y6mA2
+uivjfulWQmwbRoJLDKaCY0KdcGK5x8HlSpnp07vT+6gEwuKoWfRmlXbpVmOAD4rr
+m5TdhPSsxo/IMd5KPlkbw3h7e3ku+qfImzItBWRFd5T+YylAFgmPk9LSr03cDwT0
+0llbq5lgs3upI8DYjGFtbPvBofwXP2x8EZHho1AQYzpNAZ+m8yE2n5ybY8ysiRLU
+XNbj+Pn4wQCLylJ8YFmydVHaPN/8VMwJ+r1bFIhZAzdeI1lq6B8mHHjAHI0jrnrD
+tTNwW6hQsj705Whq/tVs
+=o1BE
+-END PGP SIGNATURE-

Added: release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip.md5
==
--- release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip.md5 (added)
+++ release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip.md5 Tue Mar 
10 14:26:08 2015
@@ -0,0 +1 @@
+735ea4d482264013240a51b2d37202a0
\ No newline at end of file

Added: release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip.sha1
==
--- release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip.sha1 (added)
+++ release/camel/apache-camel/2.14.2/apache-camel-2.14.2-src.zip.sha1 Tue Mar 
10 14:26:08 2015
@@ -0,0 +1 @@
+b0e0509760503d49763d2b0235541c58fd08d9ae
\ No newline at end of file

Added: release/camel/apache-camel/2.14.2/apache-camel-2.14.2.pom
==
--- release/camel/apache-camel/2.14.2/apache-camel-2.14.2.pom (added)
+++ release/camel/apache-camel/2.14.2/apache-camel-2.14.2.pom Tue Mar 10 
14:26:08 2015
@@ -0,0 +1,937 @@
+?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;
+
+  

svn commit: r943182 [1/7] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

2015-03-10 Thread ningjiang
Author: ningjiang
Date: Tue Mar 10 14:37:17 2015
New Revision: 943182

Log:
Uploading released schemas for camel-2.15.0

Added:

websites/production/camel/content/schema/blueprint/camel-blueprint-2.15.0.xsd
websites/production/camel/content/schema/cxf/camel-cxf-2.15.0-blueprint.xsd
websites/production/camel/content/schema/cxf/camel-cxf-2.15.0-spring.xsd

websites/production/camel/content/schema/spring-security/camel-spring-security-2.15.0.xsd
websites/production/camel/content/schema/spring/camel-spring-2.15.0.xsd

websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.15.0.xsd
Modified:
websites/production/camel/content/schema/blueprint/camel-blueprint.xsd
websites/production/camel/content/schema/spring/camel-spring.xsd



svn commit: r943182 [6/7] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

2015-03-10 Thread ningjiang
Modified: websites/production/camel/content/schema/spring/camel-spring.xsd
==
--- websites/production/camel/content/schema/spring/camel-spring.xsd (original)
+++ websites/production/camel/content/schema/spring/camel-spring.xsd Tue Mar 10 
14:37:17 2015
@@ -1,341 +1,982 @@
-?xml version=1.0 encoding=UTF-8 standalone=yes?
-xs:schema elementFormDefault=qualified version=1.0 
targetNamespace=http://camel.apache.org/schema/spring; 
xmlns:tns=http://camel.apache.org/schema/spring; 
xmlns:xs=http://www.w3.org/2001/XMLSchema;
+?xml version=1.0 encoding=UTF-8?xs:schema 
xmlns:xs=http://www.w3.org/2001/XMLSchema; 
xmlns:tns=http://camel.apache.org/schema/spring; 
elementFormDefault=qualified 
targetNamespace=http://camel.apache.org/schema/spring; version=1.0
 
-  xs:element name=aggregate type=tns:aggregateDefinition/
-
-  xs:element name=aop type=tns:aopDefinition/
-
-  xs:element name=avro type=tns:avroDataFormat/
-
-  xs:element name=barcode type=tns:barcodeDataFormat/
-
-  xs:element name=base64 type=tns:base64DataFormat/
-
-  xs:element name=batchResequencerConfig type=tns:batchResequencerConfig/
-
-  xs:element name=bean type=tns:beanDefinition/
+  xs:element name=aggregate type=tns:aggregateDefinition
+xs:annotation
+  xs:documentation xml:lang=enAggregates many messages into a single 
message/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=aop type=tns:aopDefinition
+xs:annotation
+  xs:documentation xml:lang=enDoes processing before and/or after the 
route is completed/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=avro type=tns:avroDataFormat
+xs:annotation
+  xs:documentation xml:lang=enAvro data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=barcode type=tns:barcodeDataFormat
+xs:annotation
+  xs:documentation xml:lang=enBarcode data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=base64 type=tns:base64DataFormat
+xs:annotation
+  xs:documentation xml:lang=enBase64 data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=batch-config type=tns:batchResequencerConfig
+xs:annotation
+  xs:documentation xml:lang=enConfigures batch-processing resequence 
eip./xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=bean type=tns:beanDefinition
+xs:annotation
+  xs:documentation xml:lang=enCalls a java bean/xs:documentation
+/xs:annotation
+  /xs:element
 
   xs:element name=beanPostProcessor type=tns:camelBeanPostProcessor/
 
-  xs:element name=beanio type=tns:beanioDataFormat/
-
-  xs:element name=bindy type=tns:bindyDataFormat/
+  xs:element name=beanio type=tns:beanioDataFormat
+xs:annotation
+  xs:documentation xml:lang=enBeanIO data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=bindy type=tns:bindyDataFormat
+xs:annotation
+  xs:documentation xml:lang=enBindy data format/xs:documentation
+/xs:annotation
+  /xs:element
 
   xs:element name=camelContext type=tns:camelContextFactoryBean/
 
-  xs:element name=castor type=tns:castorDataFormat/
-
-  xs:element name=choice type=tns:choiceDefinition/
-
-  xs:element name=circuitBreaker 
type=tns:circuitBreakerLoadBalancerDefinition/
-
-  xs:element name=constant type=tns:constantExpression/
+  xs:element name=castor type=tns:castorDataFormat
+xs:annotation
+  xs:documentation xml:lang=enCastor data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=choice type=tns:choiceDefinition
+xs:annotation
+  xs:documentation xml:lang=enRoutes messages based on a series of 
predicates/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=circuitBreaker 
type=tns:circuitBreakerLoadBalancerDefinition
+xs:annotation
+  xs:documentation xml:lang=enCircuit break load 
balancer/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=constant type=tns:constantExpression
+xs:annotation
+  xs:documentation xml:lang=enFor expressions and predicates using a 
constant/xs:documentation
+/xs:annotation
+  /xs:element
 
   xs:element name=consumerTemplate 
type=tns:camelConsumerTemplateFactoryBean/
 
-  xs:element name=contextScan type=tns:contextScanDefinition/
-
-  xs:element name=convertBodyTo type=tns:convertBodyDefinition/
-
-  xs:element name=crypto type=tns:cryptoDataFormat/
-
-  xs:element name=csv type=tns:csvDataFormat/
-
-  xs:element name=customDataFormat type=tns:customDataFormat/
-
-  xs:element name=customLoadBalancer 
type=tns:customLoadBalancerDefinition/
-
-  xs:element name=dataFormats type=tns:dataFormatsDefinition/
-
-  xs:element name=delay type=tns:delayDefinition/
-
-  xs:element name=delete type=tns:deleteVerbDefinition/
-
-  xs:element name=description type=tns:descriptionDefinition/
-
-  xs:element name=doCatch 

svn commit: r943182 [5/7] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

2015-03-10 Thread ningjiang
Added: websites/production/camel/content/schema/spring/camel-spring-2.15.0.xsd
==
--- websites/production/camel/content/schema/spring/camel-spring-2.15.0.xsd 
(added)
+++ websites/production/camel/content/schema/spring/camel-spring-2.15.0.xsd Tue 
Mar 10 14:37:17 2015
@@ -0,0 +1,6176 @@
+?xml version=1.0 encoding=UTF-8?xs:schema 
xmlns:xs=http://www.w3.org/2001/XMLSchema; 
xmlns:tns=http://camel.apache.org/schema/spring; 
elementFormDefault=qualified 
targetNamespace=http://camel.apache.org/schema/spring; version=1.0
+
+  xs:element name=aggregate type=tns:aggregateDefinition
+xs:annotation
+  xs:documentation xml:lang=enAggregates many messages into a single 
message/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=aop type=tns:aopDefinition
+xs:annotation
+  xs:documentation xml:lang=enDoes processing before and/or after the 
route is completed/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=avro type=tns:avroDataFormat
+xs:annotation
+  xs:documentation xml:lang=enAvro data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=barcode type=tns:barcodeDataFormat
+xs:annotation
+  xs:documentation xml:lang=enBarcode data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=base64 type=tns:base64DataFormat
+xs:annotation
+  xs:documentation xml:lang=enBase64 data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=batch-config type=tns:batchResequencerConfig
+xs:annotation
+  xs:documentation xml:lang=enConfigures batch-processing resequence 
eip./xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=bean type=tns:beanDefinition
+xs:annotation
+  xs:documentation xml:lang=enCalls a java bean/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=beanPostProcessor type=tns:camelBeanPostProcessor/
+
+  xs:element name=beanio type=tns:beanioDataFormat
+xs:annotation
+  xs:documentation xml:lang=enBeanIO data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=bindy type=tns:bindyDataFormat
+xs:annotation
+  xs:documentation xml:lang=enBindy data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=camelContext type=tns:camelContextFactoryBean/
+
+  xs:element name=castor type=tns:castorDataFormat
+xs:annotation
+  xs:documentation xml:lang=enCastor data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=choice type=tns:choiceDefinition
+xs:annotation
+  xs:documentation xml:lang=enRoutes messages based on a series of 
predicates/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=circuitBreaker 
type=tns:circuitBreakerLoadBalancerDefinition
+xs:annotation
+  xs:documentation xml:lang=enCircuit break load 
balancer/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=constant type=tns:constantExpression
+xs:annotation
+  xs:documentation xml:lang=enFor expressions and predicates using a 
constant/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=consumerTemplate 
type=tns:camelConsumerTemplateFactoryBean/
+
+  xs:element name=contextScan type=tns:contextScanDefinition
+xs:annotation
+  xs:documentation xml:lang=enScans for Java 
org.apache.camel.builder.RouteBuilder instances in the context 
org.apache.camel.spi.Registry./xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=convertBodyTo type=tns:convertBodyDefinition
+xs:annotation
+  xs:documentation xml:lang=enConverts the message body to another 
type/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=crypto type=tns:cryptoDataFormat
+xs:annotation
+  xs:documentation xml:lang=enCrypto data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=csv type=tns:csvDataFormat
+xs:annotation
+  xs:documentation xml:lang=enCSV data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=customDataFormat type=tns:customDataFormat
+xs:annotation
+  xs:documentation xml:lang=enCustom data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=customLoadBalancer 
type=tns:customLoadBalancerDefinition
+xs:annotation
+  xs:documentation xml:lang=enCustom load balancer/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=dataFormats type=tns:dataFormatsDefinition
+xs:annotation
+  xs:documentation xml:lang=enTo configure data 
formats/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=delay type=tns:delayDefinition
+xs:annotation
+  xs:documentation xml:lang=enDelays processing for a specified length 
of time/xs:documentation
+/xs:annotation
+  /xs:element
+
+  

svn commit: r943176 - in /websites/production/camel/content/maven: ./ camel-2.15.0/ camel-2.15.0/camel-ahc-ws/ camel-2.15.0/camel-ahc-ws/apidocs/ camel-2.15.0/camel-ahc-ws/apidocs/META-INF/ camel-2.15

2015-03-10 Thread ningjiang
Author: ningjiang
Date: Tue Mar 10 14:12:19 2015
New Revision: 943176

Log:
Added camel-2.15.0 javadoc


[This commit notification would consist of 2636 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]


svn commit: r943184 [4/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

2015-03-10 Thread ningjiang
Added: websites/production/camel/content/schema/spring/camel-spring-2.14.2.xsd
==
--- websites/production/camel/content/schema/spring/camel-spring-2.14.2.xsd 
(added)
+++ websites/production/camel/content/schema/spring/camel-spring-2.14.2.xsd Tue 
Mar 10 14:41:55 2015
@@ -0,0 +1,3516 @@
+?xml version=1.0 encoding=UTF-8 standalone=yes?
+xs:schema elementFormDefault=qualified version=1.0 
targetNamespace=http://camel.apache.org/schema/spring; 
xmlns:tns=http://camel.apache.org/schema/spring; 
xmlns:xs=http://www.w3.org/2001/XMLSchema;
+
+  xs:element name=aggregate type=tns:aggregateDefinition/
+
+  xs:element name=aop type=tns:aopDefinition/
+
+  xs:element name=avro type=tns:avroDataFormat/
+
+  xs:element name=barcode type=tns:barcodeDataFormat/
+
+  xs:element name=base64 type=tns:base64DataFormat/
+
+  xs:element name=batchResequencerConfig type=tns:batchResequencerConfig/
+
+  xs:element name=bean type=tns:beanDefinition/
+
+  xs:element name=beanPostProcessor type=tns:camelBeanPostProcessor/
+
+  xs:element name=beanio type=tns:beanioDataFormat/
+
+  xs:element name=bindy type=tns:bindyDataFormat/
+
+  xs:element name=camelContext type=tns:camelContextFactoryBean/
+
+  xs:element name=castor type=tns:castorDataFormat/
+
+  xs:element name=choice type=tns:choiceDefinition/
+
+  xs:element name=circuitBreaker 
type=tns:circuitBreakerLoadBalancerDefinition/
+
+  xs:element name=constant type=tns:constantExpression/
+
+  xs:element name=consumerTemplate 
type=tns:camelConsumerTemplateFactoryBean/
+
+  xs:element name=contextScan type=tns:contextScanDefinition/
+
+  xs:element name=convertBodyTo type=tns:convertBodyDefinition/
+
+  xs:element name=crypto type=tns:cryptoDataFormat/
+
+  xs:element name=csv type=tns:csvDataFormat/
+
+  xs:element name=customDataFormat type=tns:customDataFormat/
+
+  xs:element name=customLoadBalancer 
type=tns:customLoadBalancerDefinition/
+
+  xs:element name=dataFormats type=tns:dataFormatsDefinition/
+
+  xs:element name=delay type=tns:delayDefinition/
+
+  xs:element name=delete type=tns:deleteVerbDefinition/
+
+  xs:element name=description type=tns:descriptionDefinition/
+
+  xs:element name=doCatch type=tns:catchDefinition/
+
+  xs:element name=doFinally type=tns:finallyDefinition/
+
+  xs:element name=doTry type=tns:tryDefinition/
+
+  xs:element name=dynamicRouter type=tns:dynamicRouterDefinition/
+
+  xs:element name=el type=tns:elExpression/
+
+  xs:element name=endpoint type=tns:camelEndpointFactoryBean/
+
+  xs:element name=enrich type=tns:enrichDefinition/
+
+  xs:element name=errorHandler type=tns:errorHandlerDefinition/
+
+  xs:element name=export type=tns:camelServiceExporterDefinition/
+
+  xs:element name=expression type=tns:expressionSubElementDefinition/
+
+  xs:element name=expressionDefinition type=tns:expression/
+
+  xs:element name=failover type=tns:failoverLoadBalancerDefinition/
+
+  xs:element name=filter type=tns:filterDefinition/
+
+  xs:element name=flatpack type=tns:flatpackDataFormat/
+
+  xs:element name=from type=tns:fromDefinition/
+
+  xs:element name=get type=tns:getVerbDefinition/
+
+  xs:element name=groovy type=tns:groovyExpression/
+
+  xs:element name=gzip type=tns:gzipDataFormat/
+
+  xs:element name=head type=tns:headVerbDefinition/
+
+  xs:element name=header type=tns:headerExpression/
+
+  xs:element name=hl7 type=tns:hl7DataFormat/
+
+  xs:element name=idempotentConsumer 
type=tns:idempotentConsumerDefinition/
+
+  xs:element name=inOnly type=tns:inOnlyDefinition/
+
+  xs:element name=inOut type=tns:inOutDefinition/
+
+  xs:element name=intercept type=tns:interceptDefinition/
+
+  xs:element name=interceptFrom type=tns:interceptFromDefinition/
+
+  xs:element name=interceptToEndpoint 
type=tns:interceptSendToEndpointDefinition/
+
+  xs:element name=javaScript type=tns:javaScriptExpression/
+
+  xs:element name=jaxb type=tns:jaxbDataFormat/
+
+  xs:element name=jibx type=tns:jibxDataFormat/
+
+  xs:element name=jmxAgent type=tns:camelJMXAgentDefinition/
+
+  xs:element name=json type=tns:jsonDataFormat/
+
+  xs:element name=jsonpath type=tns:jsonPathExpression/
+
+  xs:element name=jxpath type=tns:jxPathExpression/
+
+  xs:element name=keyStoreParameters 
type=tns:keyStoreParametersFactoryBean/
+
+  xs:element name=language type=tns:languageExpression/
+
+  xs:element name=loadBalance type=tns:loadBalanceDefinition/
+
+  xs:element name=log type=tns:logDefinition/
+
+  xs:element name=loop type=tns:loopDefinition/
+
+  xs:element name=marshal type=tns:marshalDefinition/
+
+  xs:element name=method type=tns:methodCallExpression/
+
+  xs:element name=multicast type=tns:multicastDefinition/
+
+  xs:element name=mvel type=tns:mvelExpression/
+
+  xs:element name=ognl type=tns:ognlExpression/
+
+  xs:element name=onCompletion type=tns:onCompletionDefinition/
+
+  xs:element name=onException type=tns:onExceptionDefinition/
+
+  xs:element 

svn commit: r8236 - /release/camel/apache-camel/2.14.2/

2015-03-10 Thread ningjiang
Author: ningjiang
Date: Tue Mar 10 14:24:14 2015
New Revision: 8236

Log:
Apache Camel 2.14.2 release distro placeholder.

Added:
release/camel/apache-camel/2.14.2/



svn commit: r943182 [7/7] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

2015-03-10 Thread ningjiang
Added: 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.15.0.xsd
==
--- 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.15.0.xsd
 (added)
+++ 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.15.0.xsd
 Tue Mar 10 14:37:17 2015
@@ -0,0 +1,65 @@
+?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.
+--
+xsd:schema xmlns=http://camel.apache.org/schema/spring/integration;
+  xmlns:xsd=http://www.w3.org/2001/XMLSchema;
+  xmlns:beans=http://www.springframework.org/schema/beans;
+  xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+  xmlns:camel-spring=http://camel.apache.org/schema/spring;
+  targetNamespace=http://camel.apache.org/schema/spring/integration;
+  elementFormDefault=qualified
+  attributeFormDefault=unqualified
+
+  xsd:import namespace=http://www.springframework.org/schema/beans; 
schemaLocation=http://www.springframework.org/schema/beans/spring-beans.xsd/
+  xsd:import namespace=http://camel.apache.org/schema/spring; 
schemaLocation=http://camel.apache.org/schema/spring/camel-spring.xsd/
+
+  xsd:complexType name=camelEndpointType
+   xsd:sequence
+   xsd:element ref=camel-spring:camelContext minOccurs=0 /
+   xsd:element name=camelContextRef type=xsd:string 
minOccurs=0 /
+   /xsd:sequence
+   xsd:attribute name=id type=xsd:ID use=required /
+   xsd:attribute name=camelEndpointUri type=xsd:string /
+   xsd:attribute name=replyChannel type=xsd:string /
+   xsd:attribute name=expectReply type=xsd:boolean default=true/
+  /xsd:complexType
+
+  xsd:element name=camelSource
+ xsd:complexType
+xsd:annotation
+   xsd:documentation
+ Defines a camel-source for handling the Camel context message 
in Spring Integration message bus.
+   /xsd:documentation
+   /xsd:annotation
+xsd:complexContent
+  xsd:extension base=camelEndpointType
+   xsd:attribute name=requestChannel type=xsd:string 
use=required /   
+ /xsd:extension
+   /xsd:complexContent
+ /xsd:complexType
+  /xsd:element
+
+  xsd:element name=camelTarget type=camelEndpointType
+xsd:annotation
+   xsd:documentation
+ Defines a camel-target to feed Spring Integration message to 
the Camel context.
+   /xsd:documentation
+   /xsd:annotation
+  /xsd:element
+/xsd:schema




svn commit: r8239 - /release/camel/apache-camel/2.13.4/

2015-03-10 Thread ningjiang
Author: ningjiang
Date: Tue Mar 10 14:27:41 2015
New Revision: 8239

Log:
Apache Camel 2.13.4 release distro placeholder.

Added:
release/camel/apache-camel/2.13.4/



svn commit: r943182 [2/7] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

2015-03-10 Thread ningjiang

Added: 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.15.0.xsd
==
--- 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.15.0.xsd 
(added)
+++ 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.15.0.xsd 
Tue Mar 10 14:37:17 2015
@@ -0,0 +1,6177 @@
+?xml version=1.0 encoding=UTF-8?xs:schema 
xmlns:xs=http://www.w3.org/2001/XMLSchema; 
xmlns:tns=http://camel.apache.org/schema/blueprint; 
elementFormDefault=qualified 
targetNamespace=http://camel.apache.org/schema/blueprint; version=1.0
+
+  xs:element name=aggregate type=tns:aggregateDefinition
+xs:annotation
+  xs:documentation xml:lang=enAggregates many messages into a single 
message/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=aop type=tns:aopDefinition
+xs:annotation
+  xs:documentation xml:lang=enDoes processing before and/or after the 
route is completed/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=avro type=tns:avroDataFormat
+xs:annotation
+  xs:documentation xml:lang=enAvro data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=barcode type=tns:barcodeDataFormat
+xs:annotation
+  xs:documentation xml:lang=enBarcode data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=base64 type=tns:base64DataFormat
+xs:annotation
+  xs:documentation xml:lang=enBase64 data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=batch-config type=tns:batchResequencerConfig
+xs:annotation
+  xs:documentation xml:lang=enConfigures batch-processing resequence 
eip./xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=bean type=tns:beanDefinition
+xs:annotation
+  xs:documentation xml:lang=enCalls a java bean/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=beanio type=tns:beanioDataFormat
+xs:annotation
+  xs:documentation xml:lang=enBeanIO data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=bindy type=tns:bindyDataFormat
+xs:annotation
+  xs:documentation xml:lang=enBindy data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=camelContext type=tns:camelContextFactoryBean/
+
+  xs:element name=castor type=tns:castorDataFormat
+xs:annotation
+  xs:documentation xml:lang=enCastor data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=choice type=tns:choiceDefinition
+xs:annotation
+  xs:documentation xml:lang=enRoutes messages based on a series of 
predicates/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=circuitBreaker 
type=tns:circuitBreakerLoadBalancerDefinition
+xs:annotation
+  xs:documentation xml:lang=enCircuit break load 
balancer/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=constant type=tns:constantExpression
+xs:annotation
+  xs:documentation xml:lang=enFor expressions and predicates using a 
constant/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=consumerTemplate 
type=tns:camelConsumerTemplateFactoryBean/
+
+  xs:element name=contextScan type=tns:contextScanDefinition
+xs:annotation
+  xs:documentation xml:lang=enScans for Java 
org.apache.camel.builder.RouteBuilder instances in the context 
org.apache.camel.spi.Registry./xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=convertBodyTo type=tns:convertBodyDefinition
+xs:annotation
+  xs:documentation xml:lang=enConverts the message body to another 
type/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=crypto type=tns:cryptoDataFormat
+xs:annotation
+  xs:documentation xml:lang=enCrypto data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=csv type=tns:csvDataFormat
+xs:annotation
+  xs:documentation xml:lang=enCSV data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=customDataFormat type=tns:customDataFormat
+xs:annotation
+  xs:documentation xml:lang=enCustom data format/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=customLoadBalancer 
type=tns:customLoadBalancerDefinition
+xs:annotation
+  xs:documentation xml:lang=enCustom load balancer/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=dataFormats type=tns:dataFormatsDefinition
+xs:annotation
+  xs:documentation xml:lang=enTo configure data 
formats/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=delay type=tns:delayDefinition
+xs:annotation
+  xs:documentation xml:lang=enDelays processing for a specified length 
of time/xs:documentation
+/xs:annotation
+  /xs:element
+
+  xs:element name=delete 

svn commit: r943185 [2/2] - /websites/production/camel/content/manual/camel-manual-2.14.2.html

2015-03-10 Thread ningjiang

Added: websites/production/camel/content/manual/camel-manual-2.14.2.html
==
--- websites/production/camel/content/manual/camel-manual-2.14.2.html (added)
+++ websites/production/camel/content/manual/camel-manual-2.14.2.html Tue Mar 
10 14:42:27 2015
@@ -0,0 +1,29868 @@
+html
+head
+link href=http://camel.apache.org/styles/camel-manual.css; rel=stylesheet 
type=text/css /
+style type=text/css
+@page :left {
+@top-left {
+content: Apache Camel 2.14.2 Developer's 
Manual;
+}
+}
+/style
+
+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/shBrushSql.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 
src='http://camel.apache.org/styles/highlighter/scripts/shBrushPlain.js' 
type='text/javascript'/script
+
+script type=text/javascript
+SyntaxHighlighter.defaults['toolbar'] = false;
+SyntaxHighlighter.all();
+/script
+/head
+bodydiv class=wiki-content maincontentdiv class=titlepage 
id=titlepage
+h1 id=BookInOnePage-ApacheCamelApache Camel/h1
+h2 id=BookInOnePage-UserGuideUser Guide/h2
+p
+/ph3Version 2.14.2/h3
+br clear=none
+Copyright 2007-2014, Apache Software Foundation/div
+div class=toc id=toc
+h1 id=BookInOnePage-TableofContentsTable of Contents/h1
+
+p
+/pul class=tocli class=frontmattera shape=rect href=#tocTable 
of Contents/a/lili class=chaptera shape=rect 
href=#chapter-introductionIntroduction/a/lili class=chaptera 
shape=rect href=#chapter-quickstartQuickstart/a/lili 
class=chaptera shape=rect href=#chapter-getting-startedGetting 
Started/a/lili class=chaptera shape=rect 
href=#chapter-architectureArchitecture/a/lili class=chaptera 
shape=rect href=#chapter-enterprise-integration-patternsEnterprise 
Integration Patterns/a/lili class=chaptera shape=rect 
href=#chapter-cook-bookCook Book/a/lili class=chaptera shape=rect 
href=#chapter-tutorialsTutorials/a/lili class=chaptera shape=rect 
href=#chapter-languages-supported-AppendixLanguage Appendix/a/lili 
class=chaptera shape=rect href=#chapter-dataformat-AppendixDataFormat 
Appendix/a/lili class=chaptera shape=rect href=#chapter-pattern-app
 endixPattern Appendix/a/lili class=chaptera shape=rect 
href=#chapter-component-appendixComponent Appendix/a/lili 
class=endmattera shape=rect href=#indexIndex/a/li/ul
+/div
+div class=chapter page-reset id=chapter-introduction
+h1 id=BookInOnePage-IntroductionIntroduction/h1
+
+Apache Camel #8482; is a versatile open-source integration framework based on 
known a shape=rect href=enterprise-integration-patterns.htmlEnterprise 
Integration Patterns/a.
+
+pCamel empowers you to define routing and mediation rules in a variety of 
domain-specific languages, including a Java-based a shape=rect 
href=dsl.htmlFluent API/a, a shape=rect href=spring.htmlSpring/a 
or a shape=rect href=using-osgi-blueprint-with-camel.htmlBlueprint/a a 
shape=rect href=xml-configuration.htmlXML Configuration/a files, and a 
a shape=rect href=scala-dsl.htmlScala DSL/a. This means you get smart 
completion of routing rules in your IDE, whether in a Java, Scala or XML 
editor./p
+
+pApache Camel uses a shape=rect href=uris.htmlURIs/a to work 
directly with any kind of a shape=rect href=transport.htmlTransport/a 
or messaging model such as a shape=rect href=http.htmlHTTP/a, a 
shape=rect href=activemq.htmlActiveMQ/a, a shape=rect 
href=jms.htmlJMS/a, a shape=rect href=jbi.htmlJBI/a, SCA, a 
shape=rect href=mina.htmlMINA/a or a shape=rect 
href=cxf.htmlCXF/a, as well as pluggable a shape=rect 
href=components.htmlComponents/a and a shape=rect 
href=data-format.htmlData Format/a options. Apache Camel is a small 
library with minimal a shape=rect 
href=what-are-the-dependencies.htmldependencies/a for easy embedding in 
any Java application. Apache Camel lets you work with the same a shape=rect 
href=exchange.htmlAPI/a regardless which kind of a 

svn commit: r943183 [1/2] - /websites/production/camel/content/manual/camel-manual-2.15.0.html

2015-03-10 Thread ningjiang
Author: ningjiang
Date: Tue Mar 10 14:38:19 2015
New Revision: 943183

Log:
Uploading released manuals for camel-2.15.0

Added:
websites/production/camel/content/manual/camel-manual-2.15.0.html



svn commit: r943266 - in /websites/production/camel/content: cache/main.pageCache xml-reference.html

2015-03-10 Thread buildbot
Author: buildbot
Date: Wed Mar 11 03:21:43 2015
New Revision: 943266

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/xml-reference.html

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

Modified: websites/production/camel/content/xml-reference.html
==
--- websites/production/camel/content/xml-reference.html (original)
+++ websites/production/camel/content/xml-reference.html Wed Mar 11 03:21:43 
2015
@@ -84,7 +84,7 @@
tbody
 tr
 td valign=top width=100%

[... 6 lines stripped ...]



[1/2] camel git commit: [CAMEL-8468] Usage of camel-xstream depends on TCCL

2015-03-10 Thread ningjiang
Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x d05bd3552 - 55633081a
  refs/heads/camel-2.15.x 3170993f9 - 3dab2d812


[CAMEL-8468] Usage of camel-xstream depends on TCCL


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

Branch: refs/heads/camel-2.15.x
Commit: 3dab2d812baabc72efd06cc4820d222bd5afea98
Parents: 3170993
Author: Thomas Diesler thomas.dies...@jboss.com
Authored: Tue Mar 10 09:40:44 2015 +0100
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Mar 11 09:49:06 2015 +0800

--
 .../xstream/AbstractXStreamWrapper.java | 45 
 .../dataformat/xstream/JsonDataFormat.java  | 12 +++---
 2 files changed, 42 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3dab2d81/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
--
diff --git 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
index a3f5fab..b4e6423 100644
--- 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
+++ 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
@@ -31,6 +31,8 @@ import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+
+import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.converter.jaxp.StaxConverter;
 import org.apache.camel.spi.ClassResolver;
@@ -42,7 +44,7 @@ import org.apache.camel.util.ObjectHelper;
  * ({@link DataFormat}) interface which leverage the XStream library for XML 
or JSON's marshaling and unmarshaling
  */
 public abstract class AbstractXStreamWrapper implements DataFormat {
-
+
 private XStream xstream;
 private HierarchicalStreamDriver xstreamDriver;
 private StaxConverter staxConverter;
@@ -54,7 +56,7 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 
 public AbstractXStreamWrapper() {
 }
-
+
 public AbstractXStreamWrapper(XStream xstream) {
 this.xstream = xstream;
 }
@@ -73,11 +75,32 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 return xstream;
 }
 
+/**
+ * Resolves the XStream instance to be used by this data format. If 
XStream is not explicitly set, new instance will
+ * be created and cached.
+ *
+ * @param context to be used during a configuration of the XStream instance
+ * @return XStream instance used by this data format.
+ */
+public XStream getXStream(CamelContext context) {
+if (xstream == null) {
+xstream = createXStream(context.getClassResolver(), 
context.getApplicationContextClassLoader());
+}
+return xstream;
+}
+
 public void setXStream(XStream xstream) {
 this.xstream = xstream;
 }
 
+/**
+ * @deprecated Use {@link #createXStream(ClassResolver, ClassLoader)}
+ */
 protected XStream createXStream(ClassResolver resolver) {
+return createXStream(resolver, null);
+}
+
+protected XStream createXStream(ClassResolver resolver, ClassLoader 
classLoader) {
 if (xstreamDriver != null) {
 xstream = new XStream(xstreamDriver);
 } else {
@@ -88,6 +111,10 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 xstream.setMode(getModeFromString(mode));
 }
 
+if (classLoader != null) {
+xstream.setClassLoader(classLoader);
+}
+
 try {
 if (this.implicitCollections != null) {
 for (EntryString, String[] entry : 
this.implicitCollections.entrySet()) {
@@ -141,14 +168,14 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 xstream.registerConverter(converter);
 }
 }
-
+
 } catch (Exception e) {
 throw new RuntimeException(Unable to build XStream instance, e);
 }
 
 return xstream;
-} 
-
+}
+
 protected int getModeFromString(String modeString) {
 int result;
 if (NO_REFERENCES.equalsIgnoreCase(modeString)) {
@@ -219,11 +246,11 @@ public abstract class 

[2/2] camel git commit: [CAMEL-8468] Usage of camel-xstream depends on TCCL

2015-03-10 Thread ningjiang
[CAMEL-8468] Usage of camel-xstream depends on TCCL


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

Branch: refs/heads/camel-2.14.x
Commit: 55633081adf66ffa99cab39edf0f0b1818a59fb0
Parents: d05bd35
Author: Thomas Diesler thomas.dies...@jboss.com
Authored: Tue Mar 10 09:40:44 2015 +0100
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Mar 11 09:49:38 2015 +0800

--
 .../xstream/AbstractXStreamWrapper.java | 45 
 .../dataformat/xstream/JsonDataFormat.java  | 12 +++---
 2 files changed, 42 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/55633081/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
--
diff --git 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
index a3f5fab..b4e6423 100644
--- 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
+++ 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
@@ -31,6 +31,8 @@ import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+
+import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.converter.jaxp.StaxConverter;
 import org.apache.camel.spi.ClassResolver;
@@ -42,7 +44,7 @@ import org.apache.camel.util.ObjectHelper;
  * ({@link DataFormat}) interface which leverage the XStream library for XML 
or JSON's marshaling and unmarshaling
  */
 public abstract class AbstractXStreamWrapper implements DataFormat {
-
+
 private XStream xstream;
 private HierarchicalStreamDriver xstreamDriver;
 private StaxConverter staxConverter;
@@ -54,7 +56,7 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 
 public AbstractXStreamWrapper() {
 }
-
+
 public AbstractXStreamWrapper(XStream xstream) {
 this.xstream = xstream;
 }
@@ -73,11 +75,32 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 return xstream;
 }
 
+/**
+ * Resolves the XStream instance to be used by this data format. If 
XStream is not explicitly set, new instance will
+ * be created and cached.
+ *
+ * @param context to be used during a configuration of the XStream instance
+ * @return XStream instance used by this data format.
+ */
+public XStream getXStream(CamelContext context) {
+if (xstream == null) {
+xstream = createXStream(context.getClassResolver(), 
context.getApplicationContextClassLoader());
+}
+return xstream;
+}
+
 public void setXStream(XStream xstream) {
 this.xstream = xstream;
 }
 
+/**
+ * @deprecated Use {@link #createXStream(ClassResolver, ClassLoader)}
+ */
 protected XStream createXStream(ClassResolver resolver) {
+return createXStream(resolver, null);
+}
+
+protected XStream createXStream(ClassResolver resolver, ClassLoader 
classLoader) {
 if (xstreamDriver != null) {
 xstream = new XStream(xstreamDriver);
 } else {
@@ -88,6 +111,10 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 xstream.setMode(getModeFromString(mode));
 }
 
+if (classLoader != null) {
+xstream.setClassLoader(classLoader);
+}
+
 try {
 if (this.implicitCollections != null) {
 for (EntryString, String[] entry : 
this.implicitCollections.entrySet()) {
@@ -141,14 +168,14 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 xstream.registerConverter(converter);
 }
 }
-
+
 } catch (Exception e) {
 throw new RuntimeException(Unable to build XStream instance, e);
 }
 
 return xstream;
-} 
-
+}
+
 protected int getModeFromString(String modeString) {
 int result;
 if (NO_REFERENCES.equalsIgnoreCase(modeString)) {
@@ -219,11 +246,11 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 public void setXstreamDriver(HierarchicalStreamDriver xstreamDriver) {
 this.xstreamDriver 

svn commit: r943184 [2/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

2015-03-10 Thread ningjiang

Added: 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.14.2.xsd
==
--- 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.14.2.xsd 
(added)
+++ 
websites/production/camel/content/schema/blueprint/camel-blueprint-2.14.2.xsd 
Tue Mar 10 14:41:55 2015
@@ -0,0 +1,3517 @@
+?xml version=1.0 encoding=UTF-8 standalone=yes?
+xs:schema elementFormDefault=qualified version=1.0 
targetNamespace=http://camel.apache.org/schema/blueprint; 
xmlns:tns=http://camel.apache.org/schema/blueprint; 
xmlns:xs=http://www.w3.org/2001/XMLSchema;
+
+  xs:element name=aggregate type=tns:aggregateDefinition/
+
+  xs:element name=aop type=tns:aopDefinition/
+
+  xs:element name=avro type=tns:avroDataFormat/
+
+  xs:element name=barcode type=tns:barcodeDataFormat/
+
+  xs:element name=base64 type=tns:base64DataFormat/
+
+  xs:element name=batchResequencerConfig type=tns:batchResequencerConfig/
+
+  xs:element name=bean type=tns:beanDefinition/
+
+  xs:element name=beanio type=tns:beanioDataFormat/
+
+  xs:element name=bindy type=tns:bindyDataFormat/
+
+  xs:element name=camelContext type=tns:camelContextFactoryBean/
+
+  xs:element name=castor type=tns:castorDataFormat/
+
+  xs:element name=choice type=tns:choiceDefinition/
+
+  xs:element name=circuitBreaker 
type=tns:circuitBreakerLoadBalancerDefinition/
+
+  xs:element name=constant type=tns:constantExpression/
+
+  xs:element name=consumerTemplate 
type=tns:camelConsumerTemplateFactoryBean/
+
+  xs:element name=contextScan type=tns:contextScanDefinition/
+
+  xs:element name=convertBodyTo type=tns:convertBodyDefinition/
+
+  xs:element name=crypto type=tns:cryptoDataFormat/
+
+  xs:element name=csv type=tns:csvDataFormat/
+
+  xs:element name=customDataFormat type=tns:customDataFormat/
+
+  xs:element name=customLoadBalancer 
type=tns:customLoadBalancerDefinition/
+
+  xs:element name=dataFormats type=tns:dataFormatsDefinition/
+
+  xs:element name=delay type=tns:delayDefinition/
+
+  xs:element name=delete type=tns:deleteVerbDefinition/
+
+  xs:element name=description type=tns:descriptionDefinition/
+
+  xs:element name=doCatch type=tns:catchDefinition/
+
+  xs:element name=doFinally type=tns:finallyDefinition/
+
+  xs:element name=doTry type=tns:tryDefinition/
+
+  xs:element name=dynamicRouter type=tns:dynamicRouterDefinition/
+
+  xs:element name=el type=tns:elExpression/
+
+  xs:element name=endpoint type=tns:camelEndpointFactoryBean/
+
+  xs:element name=enrich type=tns:enrichDefinition/
+
+  xs:element name=errorHandler type=tns:camelErrorHandlerFactoryBean/
+
+  xs:element name=export type=tns:camelServiceExporterDefinition/
+
+  xs:element name=expression type=tns:expressionSubElementDefinition/
+
+  xs:element name=expressionDefinition type=tns:expression/
+
+  xs:element name=failover type=tns:failoverLoadBalancerDefinition/
+
+  xs:element name=filter type=tns:filterDefinition/
+
+  xs:element name=flatpack type=tns:flatpackDataFormat/
+
+  xs:element name=from type=tns:fromDefinition/
+
+  xs:element name=get type=tns:getVerbDefinition/
+
+  xs:element name=groovy type=tns:groovyExpression/
+
+  xs:element name=gzip type=tns:gzipDataFormat/
+
+  xs:element name=head type=tns:headVerbDefinition/
+
+  xs:element name=header type=tns:headerExpression/
+
+  xs:element name=hl7 type=tns:hl7DataFormat/
+
+  xs:element name=idempotentConsumer 
type=tns:idempotentConsumerDefinition/
+
+  xs:element name=inOnly type=tns:inOnlyDefinition/
+
+  xs:element name=inOut type=tns:inOutDefinition/
+
+  xs:element name=intercept type=tns:interceptDefinition/
+
+  xs:element name=interceptFrom type=tns:interceptFromDefinition/
+
+  xs:element name=interceptToEndpoint 
type=tns:interceptSendToEndpointDefinition/
+
+  xs:element name=javaScript type=tns:javaScriptExpression/
+
+  xs:element name=jaxb type=tns:jaxbDataFormat/
+
+  xs:element name=jibx type=tns:jibxDataFormat/
+
+  xs:element name=jmxAgent type=tns:camelJMXAgentDefinition/
+
+  xs:element name=json type=tns:jsonDataFormat/
+
+  xs:element name=jsonpath type=tns:jsonPathExpression/
+
+  xs:element name=jxpath type=tns:jxPathExpression/
+
+  xs:element name=keyStoreParameters 
type=tns:keyStoreParametersFactoryBean/
+
+  xs:element name=language type=tns:languageExpression/
+
+  xs:element name=loadBalance type=tns:loadBalanceDefinition/
+
+  xs:element name=log type=tns:logDefinition/
+
+  xs:element name=loop type=tns:loopDefinition/
+
+  xs:element name=marshal type=tns:marshalDefinition/
+
+  xs:element name=method type=tns:methodCallExpression/
+
+  xs:element name=multicast type=tns:multicastDefinition/
+
+  xs:element name=mvel type=tns:mvelExpression/
+
+  xs:element name=ognl type=tns:ognlExpression/
+
+  xs:element name=onCompletion type=tns:onCompletionDefinition/
+
+  xs:element name=onException type=tns:onExceptionDefinition/
+
+  xs:element name=optimisticLockRetryPolicy 

svn commit: r943184 [1/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

2015-03-10 Thread ningjiang
Author: ningjiang
Date: Tue Mar 10 14:41:55 2015
New Revision: 943184

Log:
Uploading released schemas for camel-2.14.2

Added:

websites/production/camel/content/schema/blueprint/camel-blueprint-2.14.2.xsd
websites/production/camel/content/schema/cxf/camel-cxf-2.14.2-blueprint.xsd
websites/production/camel/content/schema/cxf/camel-cxf-2.14.2-spring.xsd

websites/production/camel/content/schema/spring-security/camel-spring-security-2.14.2.xsd
websites/production/camel/content/schema/spring/camel-spring-2.14.2.xsd

websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.14.2.xsd



camel git commit: [CAMEL-8468] Usage of camel-xstream depends on TCCL

2015-03-10 Thread ningjiang
Repository: camel
Updated Branches:
  refs/heads/master 08e4143c7 - 88f7a86b7


[CAMEL-8468] Usage of camel-xstream depends on TCCL


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

Branch: refs/heads/master
Commit: 88f7a86b70f25b2899d2b42a4d07d04892a67fdc
Parents: 08e4143
Author: Thomas Diesler thomas.dies...@jboss.com
Authored: Tue Mar 10 09:40:44 2015 +0100
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed Mar 11 09:42:19 2015 +0800

--
 .../xstream/AbstractXStreamWrapper.java | 45 
 .../dataformat/xstream/JsonDataFormat.java  | 12 +++---
 2 files changed, 42 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/88f7a86b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
--
diff --git 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
index a3f5fab..b4e6423 100644
--- 
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
+++ 
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
@@ -31,6 +31,8 @@ import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+
+import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.converter.jaxp.StaxConverter;
 import org.apache.camel.spi.ClassResolver;
@@ -42,7 +44,7 @@ import org.apache.camel.util.ObjectHelper;
  * ({@link DataFormat}) interface which leverage the XStream library for XML 
or JSON's marshaling and unmarshaling
  */
 public abstract class AbstractXStreamWrapper implements DataFormat {
-
+
 private XStream xstream;
 private HierarchicalStreamDriver xstreamDriver;
 private StaxConverter staxConverter;
@@ -54,7 +56,7 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 
 public AbstractXStreamWrapper() {
 }
-
+
 public AbstractXStreamWrapper(XStream xstream) {
 this.xstream = xstream;
 }
@@ -73,11 +75,32 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 return xstream;
 }
 
+/**
+ * Resolves the XStream instance to be used by this data format. If 
XStream is not explicitly set, new instance will
+ * be created and cached.
+ *
+ * @param context to be used during a configuration of the XStream instance
+ * @return XStream instance used by this data format.
+ */
+public XStream getXStream(CamelContext context) {
+if (xstream == null) {
+xstream = createXStream(context.getClassResolver(), 
context.getApplicationContextClassLoader());
+}
+return xstream;
+}
+
 public void setXStream(XStream xstream) {
 this.xstream = xstream;
 }
 
+/**
+ * @deprecated Use {@link #createXStream(ClassResolver, ClassLoader)}
+ */
 protected XStream createXStream(ClassResolver resolver) {
+return createXStream(resolver, null);
+}
+
+protected XStream createXStream(ClassResolver resolver, ClassLoader 
classLoader) {
 if (xstreamDriver != null) {
 xstream = new XStream(xstreamDriver);
 } else {
@@ -88,6 +111,10 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 xstream.setMode(getModeFromString(mode));
 }
 
+if (classLoader != null) {
+xstream.setClassLoader(classLoader);
+}
+
 try {
 if (this.implicitCollections != null) {
 for (EntryString, String[] entry : 
this.implicitCollections.entrySet()) {
@@ -141,14 +168,14 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 xstream.registerConverter(converter);
 }
 }
-
+
 } catch (Exception e) {
 throw new RuntimeException(Unable to build XStream instance, e);
 }
 
 return xstream;
-} 
-
+}
+
 protected int getModeFromString(String modeString) {
 int result;
 if (NO_REFERENCES.equalsIgnoreCase(modeString)) {
@@ -219,11 +246,11 @@ public abstract class AbstractXStreamWrapper implements 
DataFormat {
 public void 

svn commit: r943262 - in /websites/production/camel/content: ./ 2015/ 2015/03/ 2015/03/11/ cache/

2015-03-10 Thread buildbot
Author: buildbot
Date: Wed Mar 11 02:19:35 2015
New Revision: 943262

Log:
Production update by buildbot for camel

Added:
websites/production/camel/content/2015/
websites/production/camel/content/2015/03/
websites/production/camel/content/2015/03/11/
websites/production/camel/content/2015/03/11/apache-camel-2134-released.html
websites/production/camel/content/2015/03/11/apache-camel-2142.html
websites/production/camel/content/2015/03/11/apache-camel-2150-released.html
Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/index.html
websites/production/camel/content/manual-downloads.html
websites/production/camel/content/manual.html
websites/production/camel/content/news.html

Added: 
websites/production/camel/content/2015/03/11/apache-camel-2134-released.html
==
--- 
websites/production/camel/content/2015/03/11/apache-camel-2134-released.html 
(added)
+++ 
websites/production/camel/content/2015/03/11/apache-camel-2134-released.html 
Wed Mar 11 02:19:35 2015
@@ -0,0 +1,147 @@
+!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=//camel.apache.org/styles/site.css rel=stylesheet 
type=text/css
+link href=//camel.apache.org/styles/type-settings.css rel=stylesheet 
type=text/css
+script src=//camel.apache.org/styles/prototype.js 
type=text/javascript/script
+script src=//camel.apache.org/styles/rico.js 
type=text/javascript/script
+script src=//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]--
+
+
+
+title
+Apache Camel: Apache Camel 2.13.4 released
+/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
+  div id=site-breadcrumbs
+!-- Breadcrumbs --
+a href=../../../index.htmlApache 
Camel/anbsp;gt;nbsp;2015nbsp;gt;nbsp;03nbsp;gt;nbsp;11nbsp;gt;nbsp;a
 href=apache-camel-2134-released.htmlApache Camel 2.13.4 released/a
+  /div
+  !-- Quicklinks --
+div id=site-quicklinkspa shape=rect href=download.htmlDownload/a 
| a shape=rect href=javadoc.htmlJavaDoc/a | a shape=rect 
href=source.htmlSource/a | a shape=rect 
href=discussion-forums.htmlForums/a | a shape=rect 
href=support.htmlSupport/a/p/div
+  !-- Quicklinks --
+/div
+
+   table border=0
+   tbody
+tr
+td valign=top width=100%
+div class=wiki-content maincontentpThe Camel community announces the 
immediate availability of the new patch release Camel 2.13.4. This release 
contains a total of 81 fixes applied in the past 3 months by the community on 
the Camel 2.13.x maintenance branch./ppThe artifacts are published and 
ready for you to#160;a shape=rect class=external-link 
href=http://camel.apache.org/download.html;download/a#160;either from the 
Apache mirrors or from the Central Maven repository. For more details please 
take a look at the#160;a shape=rect class=external-link 

svn commit: r943184 [5/5] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

2015-03-10 Thread ningjiang
Added: 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.14.2.xsd
==
--- 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.14.2.xsd
 (added)
+++ 
websites/production/camel/content/schema/spring/integration/camel-spring-integration-2.14.2.xsd
 Tue Mar 10 14:41:55 2015
@@ -0,0 +1,65 @@
+?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.
+--
+xsd:schema xmlns=http://camel.apache.org/schema/spring/integration;
+  xmlns:xsd=http://www.w3.org/2001/XMLSchema;
+  xmlns:beans=http://www.springframework.org/schema/beans;
+  xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+  xmlns:camel-spring=http://camel.apache.org/schema/spring;
+  targetNamespace=http://camel.apache.org/schema/spring/integration;
+  elementFormDefault=qualified
+  attributeFormDefault=unqualified
+
+  xsd:import namespace=http://www.springframework.org/schema/beans; 
schemaLocation=http://www.springframework.org/schema/beans/spring-beans.xsd/
+  xsd:import namespace=http://camel.apache.org/schema/spring; 
schemaLocation=http://camel.apache.org/schema/spring/camel-spring.xsd/
+
+  xsd:complexType name=camelEndpointType
+   xsd:sequence
+   xsd:element ref=camel-spring:camelContext minOccurs=0 /
+   xsd:element name=camelContextRef type=xsd:string 
minOccurs=0 /
+   /xsd:sequence
+   xsd:attribute name=id type=xsd:ID use=required /
+   xsd:attribute name=camelEndpointUri type=xsd:string /
+   xsd:attribute name=replyChannel type=xsd:string /
+   xsd:attribute name=expectReply type=xsd:boolean default=true/
+  /xsd:complexType
+
+  xsd:element name=camelSource
+ xsd:complexType
+xsd:annotation
+   xsd:documentation
+ Defines a camel-source for handling the Camel context message 
in Spring Integration message bus.
+   /xsd:documentation
+   /xsd:annotation
+xsd:complexContent
+  xsd:extension base=camelEndpointType
+   xsd:attribute name=requestChannel type=xsd:string 
use=required /   
+ /xsd:extension
+   /xsd:complexContent
+ /xsd:complexType
+  /xsd:element
+
+  xsd:element name=camelTarget type=camelEndpointType
+xsd:annotation
+   xsd:documentation
+ Defines a camel-target to feed Spring Integration message to 
the Camel context.
+   /xsd:documentation
+   /xsd:annotation
+  /xsd:element
+/xsd:schema




svn commit: r8235 - /release/camel/apache-camel/2.15.0/

2015-03-10 Thread ningjiang
Author: ningjiang
Date: Tue Mar 10 14:21:58 2015
New Revision: 8235

Log:
Apache Camel 2.15.0 released artifacts.

Added:
release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip   (with props)
release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip.asc
release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip.md5
release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip.sha1
release/camel/apache-camel/2.15.0/apache-camel-2.15.0.pom
release/camel/apache-camel/2.15.0/apache-camel-2.15.0.pom.asc
release/camel/apache-camel/2.15.0/apache-camel-2.15.0.pom.md5
release/camel/apache-camel/2.15.0/apache-camel-2.15.0.pom.sha1
release/camel/apache-camel/2.15.0/apache-camel-2.15.0.tar.gz   (with props)
release/camel/apache-camel/2.15.0/apache-camel-2.15.0.tar.gz.asc
release/camel/apache-camel/2.15.0/apache-camel-2.15.0.tar.gz.md5
release/camel/apache-camel/2.15.0/apache-camel-2.15.0.tar.gz.sha1
release/camel/apache-camel/2.15.0/apache-camel-2.15.0.zip   (with props)
release/camel/apache-camel/2.15.0/apache-camel-2.15.0.zip.asc
release/camel/apache-camel/2.15.0/apache-camel-2.15.0.zip.md5
release/camel/apache-camel/2.15.0/apache-camel-2.15.0.zip.sha1

Added: release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip
==
Binary file - no diff available.

Propchange: release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip
--
svn:mime-type = application/octet-stream

Added: release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip.asc
==
--- release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip.asc (added)
+++ release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip.asc Tue Mar 
10 14:21:58 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJU+qUiAAoJEPBYilUU0N7pHeQQAKo8kyP0fhx+jzVWSNP6Xlla
+9FvOffbz92u674v/nUWwd0TLYpRMNVwC2B3SuBxJ8zKf6aS9ydZ2vvGZBENXxf4T
+eNOTfT5UOFBiwnJAcPW9JSZcoTtD5Cs/0AzzkTNwCYeE+9XNcymCcFZU/kNiPDMu
+nRa4QKHJvJm2cmAnGvOE2Z0Lj/6EpGghBfH8TuxgjimzJQXaF2PiuWpn4re3GqFf
+BJ5kW0NBUojPy6HOAR+qWI/RowgWJJ8SxCRJs1osWNfeNGySXTztX3eHpAVEwoGM
+SeGOrojN4n6RdZtP7DzYMDQNxWn9iNMNbTcEDwTMk4LDGLDkI/t95En4zpaAN0w+
+ea5vRgDZeA//mmRh3qSm2LJSFZXyRIFX2rHSAxTYstegrwAhqQFme83zmYkZknDX
+Lyz/9ae/tRJhzcqMwoe3EgRfPhznyB9VuojrDcwsxapEa2E5VpGQ46JWGEsakxNH
+RDxEQ9RHG9MLWUSU9D/RvYFDrlthkUXSxQd//MgT1UDfsZ8yDYRp33AwcWH4Eyqf
+jbHVDdGpjddzqDgzOtNYEEa+r0GxxuhotqqmMNFfeYyEIcSw01s6QjDmpJT86j9t
+WKIjZGU9VrUlej3err1j+65RTky2MVXU+g1vH3tEkIZNYPyKC2L1JNHqHFeLcCL6
+8t7VcTB58XIFjS9uDx7R
+=t/2a
+-END PGP SIGNATURE-

Added: release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip.md5
==
--- release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip.md5 (added)
+++ release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip.md5 Tue Mar 
10 14:21:58 2015
@@ -0,0 +1 @@
+fdcdfb3a6dfdc90913c84191ad24ccc0
\ No newline at end of file

Added: release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip.sha1
==
--- release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip.sha1 (added)
+++ release/camel/apache-camel/2.15.0/apache-camel-2.15.0-src.zip.sha1 Tue Mar 
10 14:21:58 2015
@@ -0,0 +1 @@
+c5949f9fa90848a067059a1bed97520b530c3153
\ No newline at end of file

Added: release/camel/apache-camel/2.15.0/apache-camel-2.15.0.pom
==
--- release/camel/apache-camel/2.15.0/apache-camel-2.15.0.pom (added)
+++ release/camel/apache-camel/2.15.0/apache-camel-2.15.0.pom Tue Mar 10 
14:21:58 2015
@@ -0,0 +1,998 @@
+?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;
+
+  

svn commit: r943188 [1/2] - in /websites/production/camel/content: cache/main.pageCache camel-2134-release.html camel-2142-release.html community.html download-archives.html download.html

2015-03-10 Thread buildbot
Author: buildbot
Date: Tue Mar 10 15:18:50 2015
New Revision: 943188

Log:
Production update by buildbot for camel

Added:
websites/production/camel/content/camel-2134-release.html
websites/production/camel/content/camel-2142-release.html
Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/community.html
websites/production/camel/content/download-archives.html
websites/production/camel/content/download.html

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

Added: websites/production/camel/content/camel-2134-release.html
==
--- websites/production/camel/content/camel-2134-release.html (added)
+++ websites/production/camel/content/camel-2134-release.html Tue Mar 10 
15:18:50 2015
@@ -0,0 +1,176 @@
+!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=//camel.apache.org/styles/site.css rel=stylesheet 
type=text/css
+link href=//camel.apache.org/styles/type-settings.css rel=stylesheet 
type=text/css
+script src=//camel.apache.org/styles/prototype.js 
type=text/javascript/script
+script src=//camel.apache.org/styles/rico.js 
type=text/javascript/script
+script src=//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='//camel.apache.org/styles/highlighter/styles/shCoreCamel.css' 
rel='stylesheet' type='text/css' /
+  link href='//camel.apache.org/styles/highlighter/styles/shThemeCamel.css' 
rel='stylesheet' type='text/css' /
+  script src='//camel.apache.org/styles/highlighter/scripts/shCore.js' 
type='text/javascript'/script
+  script src='//camel.apache.org/styles/highlighter/scripts/shBrushJava.js' 
type='text/javascript'/script
+  script src='//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: Camel 2.13.4 Release
+/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
+  div id=site-breadcrumbs
+!-- Breadcrumbs --
+a href=index.htmlApache Camel/anbsp;gt;nbsp;a 
href=community.htmlCommunity/anbsp;gt;nbsp;a 
href=download.htmlDownload/anbsp;gt;nbsp;a 
href=camel-2134-release.htmlCamel 2.13.4 Release/a
+  /div
+  !-- Quicklinks --
+div id=site-quicklinkspa shape=rect href=download.htmlDownload/a 
| a shape=rect href=javadoc.htmlJavaDoc/a | a shape=rect 
href=source.htmlSource/a | a shape=rect 
href=discussion-forums.htmlForums/a | a shape=rect 
href=support.htmlSupport/a/p/div
+  !-- Quicklinks --
+/div
+
+   table border=0
+   tbody
+tr
+td valign=top width=100%
+div class=wiki-content maincontenth1 
id=Camel2.13.4Release-Camel2.13.4releaseCamel 2.13.4 release/h1div 

camel git commit: Upgrading BouncyCastle

2015-03-10 Thread coheigea
Repository: camel
Updated Branches:
  refs/heads/master 9532383bf - 0b567c303


Upgrading BouncyCastle


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

Branch: refs/heads/master
Commit: 0b567c303a001efec95e95c1d222a74014283b42
Parents: 9532383
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Mar 10 14:36:14 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Tue Mar 10 14:36:14 2015 +

--
 .../crypto/DefaultPGPPublicKeyAccessor.java |  5 +++-
 .../crypto/DefaultPGPSecretKeyAccessor.java |  5 +++-
 .../converter/crypto/PGPDataFormatUtil.java | 24 ++--
 .../crypto/PGPKeyAccessDataFormat.java  |  7 +++---
 .../converter/crypto/PGPDataFormatTest.java |  7 --
 .../component/scp/ScpServerTestSupport.java |  5 ++--
 parent/pom.xml  |  2 +-
 7 files changed, 37 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0b567c30/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccessor.java
--
diff --git 
a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccessor.java
 
b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccessor.java
index a1911fb..d88f087 100644
--- 
a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccessor.java
+++ 
b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccessor.java
@@ -28,6 +28,7 @@ import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
 import org.bouncycastle.openpgp.PGPUtil;
+import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
 
 /**
  * Caches a public key ring.
@@ -40,7 +41,9 @@ public class DefaultPGPPublicKeyAccessor implements 
PGPPublicKeyAccessor {
 
 public DefaultPGPPublicKeyAccessor(byte[] publicKeyRing) throws 
IOException, PGPException {
 ObjectHelper.notNull(publicKeyRing, publicKeyRing);
-pgpPublicKeyRing = new 
PGPPublicKeyRingCollection(PGPUtil.getDecoderStream(new 
ByteArrayInputStream(publicKeyRing)));
+pgpPublicKeyRing = 
+new PGPPublicKeyRingCollection(PGPUtil.getDecoderStream(new 
ByteArrayInputStream(publicKeyRing)),
+   new BcKeyFingerprintCalculator());
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/0b567c30/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
--
diff --git 
a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
 
b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
index 06e0185..cd1e14a 100644
--- 
a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
+++ 
b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccessor.java
@@ -30,6 +30,7 @@ import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPPrivateKey;
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
 import org.bouncycastle.openpgp.PGPUtil;
+import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
 
 /**
  * Caches a Secret Keyring. Assumes that the password for all private keys is
@@ -64,7 +65,9 @@ public class DefaultPGPSecretKeyAccessor implements 
PGPSecretKeyAccessor {
 ObjectHelper.notNull(secretKeyRing, secretKeyRing);
 ObjectHelper.notEmpty(password, password);
 ObjectHelper.notEmpty(provider, provider);
-pgpSecretKeyring = new 
PGPSecretKeyRingCollection(PGPUtil.getDecoderStream(new 
ByteArrayInputStream(secretKeyRing)));
+pgpSecretKeyring = 
+new PGPSecretKeyRingCollection(PGPUtil.getDecoderStream(new 
ByteArrayInputStream(secretKeyRing)),
+   new BcKeyFingerprintCalculator());
 this.password = password;
 this.provider = provider;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/0b567c30/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
--
diff --git 

svn commit: r943182 [4/7] - in /websites/production/camel/content/schema: blueprint/ cxf/ spring-security/ spring/ spring/integration/

2015-03-10 Thread ningjiang
Added: 
websites/production/camel/content/schema/cxf/camel-cxf-2.15.0-blueprint.xsd
==
--- websites/production/camel/content/schema/cxf/camel-cxf-2.15.0-blueprint.xsd 
(added)
+++ websites/production/camel/content/schema/cxf/camel-cxf-2.15.0-blueprint.xsd 
Tue Mar 10 14:37:17 2015
@@ -0,0 +1,178 @@
+?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.
+--
+xsd:schema xmlns=http://camel.apache.org/schema/blueprint/cxf;
+xmlns:xsd=http://www.w3.org/2001/XMLSchema;
+xmlns:beans=http://www.osgi.org/xmlns/blueprint/v1.0.0;
+xmlns:cxf-beans=http://cxf.apache.org/configuration/beans;
+xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+targetNamespace=http://camel.apache.org/schema/blueprint/cxf;
+elementFormDefault=qualified
+attributeFormDefault=unqualified
+xsi:schemaLocation=http://www.osgi.org/xmlns/blueprint/v1.0.0 
http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd;
+
+  xsd:import namespace=http://www.osgi.org/xmlns/blueprint/v1.0.0; 
schemaLocation=http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd/
+  xsd:import namespace=http://cxf.apache.org/configuration/beans; 
schemaLocation=http://cxf.apache.org/schemas/configuration/cxf-beans.xsd/
+
+  xsd:element name=cxfEndpoint
+xsd:complexType
+  xsd:complexContent
+xsd:extension base=beans:Tcomponent
+  xsd:all
+xsd:element name=binding type=xsd:anyType minOccurs=0/
+xsd:element name=dataBinding type=xsd:anyType minOccurs=0/
+xsd:element name=features type=xsd:anyType minOccurs=0/
+xsd:element name=inInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=inFaultInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=outInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=outFaultInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=handlers type=xsd:anyType minOccurs=0/
+xsd:element name=properties type=beans:Tmap minOccurs=0/
+xsd:element name=schemaLocations type=schemasType 
minOccurs=0/
+xsd:element name=serviceBean type=xsd:anyType minOccurs=0/
+xsd:element name=serviceFactory type=xsd:anyType 
minOccurs=0/
+  /xsd:all
+  !-- xsd:attributeGroup ref=cxf-beans:beanAttributes/--
+  xsd:attribute name=address type=xsd:string/
+  xsd:attribute name=bindingId type=xsd:string/
+  xsd:attribute name=bus type=xsd:string/
+  xsd:attribute name=serviceClass type=xsd:string/
+  xsd:attribute name=transportId type=xsd:string/
+  xsd:attribute name=wsdlURL type=xsd:string/
+  xsd:attribute name=endpointName type=xsd:QName/
+  xsd:attribute name=serviceName type=xsd:QName/
+  xsd:attribute name=loggingFeatureEnabled type=xsd:boolean/
+  xsd:attribute name=loggingSizeLimit type=xsd:integer /
+  xsd:attribute name=continuationTimeout type=xsd:long /
+  xsd:attribute name=publishedEndpointUrl type=xsd:string /
+/xsd:extension
+  /xsd:complexContent
+/xsd:complexType
+  /xsd:element
+
+  xsd:element name=rsServer
+xsd:complexType
+  xsd:complexContent
+xsd:extension base=beans:Tcomponent
+  xsd:all
+xsd:element name=executor type=xsd:anyType minOccurs=0/
+xsd:element name=features type=xsd:anyType minOccurs=0/
+xsd:element name=binding type=xsd:anyType minOccurs=0/
+xsd:element name=inInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=inFaultInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=invoker type=xsd:anyType minOccurs=0/
+xsd:element name=outInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=outFaultInterceptors type=xsd:anyType 
minOccurs=0/
+xsd:element name=properties type=beans:Tmap minOccurs=0/
+xsd:element name=serviceBeans type=xsd:anyType minOccurs=0/
+xsd:element name=modelBeans type=xsd:anyType minOccurs=0/

svn commit: r943188 [2/2] - in /websites/production/camel/content: cache/main.pageCache camel-2134-release.html camel-2142-release.html community.html download-archives.html download.html

2015-03-10 Thread buildbot
Modified: websites/production/camel/content/download.html
==
--- websites/production/camel/content/download.html (original)
+++ websites/production/camel/content/download.html Tue Mar 10 15:18:50 2015
@@ -84,25 +84,25 @@
tbody
 tr
 td valign=top width=100%
-div class=wiki-content maincontenth2 id=Download-LatestReleasesLatest 
Releases/h2div class=sectionColumnWrapperdiv class=sectionMacrodiv 
class=sectionMacroRowdiv class=columnMacro 
style=width:20%;min-width:20%;max-width:20%;div 
style=padding-right:20px;float:left;pimg class=confluence-embedded-image 
confluence-external-resource 
src=http://camel.apache.org/images/camel-box-small.png; 
data-image-src=http://camel.apache.org/images/camel-box-small.png;/p/div/divdiv
 class=columnMacro style=width:80%;min-width:80%;max-width:80%;div 
style=min-height:200pxpGrab these releases while they are 
hot!/pullispanThe latest release for Camel 2.14.x is a shape=rect 
href=camel-2141-release.htmlCamel 2.14.1 Release/a./span/liliThe 
latest release for Camel 2.13.x is a shape=rect 
href=camel-2133-release.htmlCamel 2.13.3 Release/a./liliThe latest 
release for Camel 2.12.x is a shape=rect href=camel-2125-release.
 htmlCamel 2.12.5 Release/a. (This is last planned release for 2.12.x which 
now is no longer maintained)/liliCamel versions 2.11.x and older are no 
longer actively developed./li/ul/div/div/div/div/divh2 
id=Download-OlderReleasesOlder Releases/h2pSee a shape=rect 
href=download-archives.htmlDownload Archives/a/ph2 
id=Download-GettingthelatestdistributionsGetting the latest 
distributions/h2div class=aui-message hint shadowed information-macro
+div class=wiki-content maincontenth2 id=Download-LatestReleasesLatest 
Releases/h2div class=sectionColumnWrapperdiv class=sectionMacrodiv 
class=sectionMacroRowdiv class=columnMacro 
style=width:20%;min-width:20%;max-width:20%;div 
style=padding-right:20px;float:left;pimg class=confluence-embedded-image 
confluence-external-resource 
src=http://camel.apache.org/images/camel-box-small.png; 
data-image-src=http://camel.apache.org/images/camel-box-small.png;/p/div/divdiv
 class=columnMacro style=width:80%;min-width:80%;max-width:80%;div 
style=min-height:200pxpGrab these releases while they are 
hot!/pulliThe latest release for Camel 2.15.x is a shape=rect 
href=camel-2150-release.htmlCamel 2.15.0 Release/a.spanbr 
clear=none/span/lilispanThe latest release for Camel 2.14.x is a 
shape=rect href=camel-2141-release.htmlCamel 2.14.2 
Release/a./span/liliThe latest release for Camel 2.13.x is a shape=r
 ect href=camel-2133-release.htmlCamel 2.13.4 Release/a. span(This is 
last planned release for 2.13.x which now is no longer 
maintained)/span/liliCamel versions 2.12.x spanand older are no longer 
actively developed./span/li/ul/div/div/div/div/divh2 
id=Download-OlderReleasesOlder Releases/h2pSee a shape=rect 
href=download-archives.htmlDownload Archives/a/ph2 
id=Download-GettingthelatestdistributionsGetting the latest 
distributions/h2div class=aui-message hint shadowed information-macro
 p class=titleThe URLs below use redirection/p
 span class=aui-icon icon-hintIcon/span
 div class=message-content
 pThe above URLs use the Apache Mirror system to 
redirect you to a suitable mirror for your download. Some users have 
experienced issues with some versions of browsers (e.g. some Safari browsers). 
If the download doesn't seem to work for you from the above URL then try using 
a shape=rect class=external-link 
href=http://www.mozilla.com/en-US/firefox/; rel=nofollowMozilla 
Firefox/a/p
 /div
 /div
-h3 id=Download-BinaryDistributionBinary Distribution/h3div 
class=table-wraptable class=confluenceTabletbodytrth colspan=1 
rowspan=1 class=confluenceThpDescription/p/thth colspan=1 
rowspan=1 class=confluenceThpDownload Link/p/thth colspan=1 
rowspan=1 class=confluenceThpPGP Signature file of download/p/thth 
colspan=1 rowspan=1 class=confluenceThpMD5 Checksum file of 
download/p/thth colspan=1 rowspan=1 class=confluenceThpSHA1 
Checksum file of download/p/th/trtrtd colspan=1 rowspan=1 
class=confluenceTdpWindows Distribution (2.14.x branch)/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpa shape=rect 
class=external-link 
href=http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.14.1/apache-camel-2.14.1.zip;apache-camel-2.14.1.zip/aa
 shape=rect class=external-link 
href=http://www.apache.org/dyn/closer.cgi/camel/apache-camel/2.11.3/apache-camel-2.11.3.zip;/a
 /p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect 
 class=external-link 
 href=http://www.apache.org/dist/camel/apache-camel/2.14.1/apache-camel-2.14.1.zip.asc;apache-camel-2.14.1.zip.asc/aa
  shape=rect class=external-link 
 href=http://www.apache.org/dist/camel/apache-camel/2.11.3/apache-camel-2.11.3.zip.asc;/a/p/tdtd
  colspan=1 

camel git commit: CAMEL-8469: Added custom ParamConverterProvider to handle Enum query params in LinkedIn component, also moved enum params to xsd

2015-03-10 Thread dhirajsb
Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x e20750cc0 - 3170993f9


CAMEL-8469: Added custom ParamConverterProvider to handle Enum query params in 
LinkedIn component, also moved enum params to xsd


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

Branch: refs/heads/camel-2.15.x
Commit: 3170993f98cf58fe9eaafe3155277b8e5e0e91c5
Parents: e20750c
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Tue Mar 10 11:55:31 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Tue Mar 10 12:06:05 2015 -0700

--
 .../api/EnumQueryParamConverterProvider.java| 73 
 .../src/main/resources/linkedin-api-schema.xjb  | 35 +-
 .../src/main/resources/linkedin-api-schema.xsd  | 36 ++
 .../src/main/resources/linkedin-api-wadl.xml| 48 +++--
 .../api/AbstractResourceIntegrationTest.java|  2 +-
 .../api/PeopleResourceIntegrationTest.java  | 25 +++
 .../component/linkedin/LinkedInEndpoint.java|  3 +-
 .../CompaniesResourceIntegrationTest.java   | 10 +--
 8 files changed, 184 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3170993f/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/EnumQueryParamConverterProvider.java
--
diff --git 
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/EnumQueryParamConverterProvider.java
 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/EnumQueryParamConverterProvider.java
new file mode 100644
index 000..8d3cee3
--- /dev/null
+++ 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/EnumQueryParamConverterProvider.java
@@ -0,0 +1,73 @@
+/**
+ * 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.component.linkedin.api;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import javax.ws.rs.ext.ParamConverter;
+import javax.ws.rs.ext.ParamConverterProvider;
+import javax.ws.rs.ext.Provider;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Converter provider for Enum Query params.
+ */
+@Provider
+public class EnumQueryParamConverterProviderT extends EnumT implements 
ParamConverterProvider {
+private static final Logger LOG = 
LoggerFactory.getLogger(EnumQueryParamConverterProvider.class);
+
+@Override
+public T ParamConverterT getConverter(ClassT rawType, Type 
genericType, Annotation[] annotations) {
+if (rawType.isEnum()) {
+try {
+final Method valueMethod = rawType.getMethod(value, null);
+final Method fromValueMethod = rawType.getMethod(fromValue, 
String.class);
+
+return new ParamConverterT() {
+@Override
+public T fromString(String value) {
+try {
+return (T) fromValueMethod.invoke(null, value);
+} catch (IllegalAccessException e) {
+throw new IllegalArgumentException(e);
+} catch (InvocationTargetException e) {
+throw new IllegalArgumentException(e);
+}
+}
+
+@Override
+public String toString(T value) {
+try {
+return (String) valueMethod.invoke(value);
+} catch (IllegalAccessException e) {
+throw new IllegalArgumentException(e);
+} catch (InvocationTargetException e) {
+   

camel git commit: Fixes CAMEL-8471: Port [AMQ-5652] IdGenerator not optimal in port restricted environments.

2015-03-10 Thread chirino
Repository: camel
Updated Branches:
  refs/heads/master 379195278 - 08e4143c7


Fixes CAMEL-8471: Port [AMQ-5652] IdGenerator not optimal in port restricted 
environments.


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

Branch: refs/heads/master
Commit: 08e4143c7caef627f1be41bcd44d2912643d48e8
Parents: 3791952
Author: Hiram Chirino hi...@hiramchirino.com
Authored: Tue Mar 10 15:37:12 2015 -0400
Committer: Hiram Chirino hi...@hiramchirino.com
Committed: Tue Mar 10 15:37:34 2015 -0400

--
 .../camel/impl/ActiveMQUuidGenerator.java   | 25 +++-
 1 file changed, 19 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/08e4143c/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java 
b/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
index c75d2d3..6817ad5 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ActiveMQUuidGenerator.java
@@ -39,7 +39,10 @@ import org.slf4j.LoggerFactory;
 public class ActiveMQUuidGenerator implements UuidGenerator {
 
 // use same JVM property name as ActiveMQ
+public static final String PROPERTY_IDGENERATOR_HOSTNAME = 
activemq.idgenerator.hostname;
+public static final String PROPERTY_IDGENERATOR_LOCALPORT = 
activemq.idgenerator.localport;
 public static final String PROPERTY_IDGENERATOR_PORT = 
activemq.idgenerator.port;
+
 private static final Logger LOG = 
LoggerFactory.getLogger(ActiveMQUuidGenerator.class);
 private static final String UNIQUE_STUB;
 private static int instanceCount;
@@ -61,15 +64,25 @@ public class ActiveMQUuidGenerator implements UuidGenerator 
{
 }
 
 if (canAccessSystemProps) {
+hostName = System.getProperty(PROPERTY_IDGENERATOR_HOSTNAME);
+int localPort = 
Integer.parseInt(System.getProperty(PROPERTY_IDGENERATOR_LOCALPORT, 0));
+
 int idGeneratorPort = 0;
 ServerSocket ss = null;
 try {
-idGeneratorPort = 
Integer.parseInt(System.getProperty(PROPERTY_IDGENERATOR_PORT, 0));
-LOG.trace(Using port {}, idGeneratorPort);
-hostName = InetAddressUtil.getLocalHostName();
-ss = new ServerSocket(idGeneratorPort);
-stub = - + ss.getLocalPort() + - + 
System.currentTimeMillis() + -;
-Thread.sleep(100);
+if (hostName == null) {
+hostName = InetAddressUtil.getLocalHostName();
+}
+if (localPort == 0) {
+idGeneratorPort = 
Integer.parseInt(System.getProperty(PROPERTY_IDGENERATOR_PORT, 0));
+LOG.trace(Using port {}, idGeneratorPort);
+ss = new ServerSocket(idGeneratorPort);
+localPort = ss.getLocalPort();
+stub = - + localPort + - + System.currentTimeMillis() 
+ -;
+Thread.sleep(100);
+} else {
+stub = - + localPort + - + System.currentTimeMillis() 
+ -;
+}
 } catch (Exception e) {
 if (LOG.isTraceEnabled()) {
 LOG.trace(Cannot generate unique stub by using DNS and 
binding to local port:  + idGeneratorPort, e);



camel git commit: CAMEL-8469: Added custom ParamConverterProvider to handle Enum query params in LinkedIn component, also moved enum params to xsd

2015-03-10 Thread dhirajsb
Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 93cd9da54 - d05bd3552


CAMEL-8469: Added custom ParamConverterProvider to handle Enum query params in 
LinkedIn component, also moved enum params to xsd


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

Branch: refs/heads/camel-2.14.x
Commit: d05bd3552c49f1fcbc6b77f2b4f741b6ff4a9c32
Parents: 93cd9da
Author: Dhiraj Bokde dhira...@yahoo.com
Authored: Tue Mar 10 11:55:31 2015 -0700
Committer: Dhiraj Bokde dhira...@yahoo.com
Committed: Tue Mar 10 12:06:30 2015 -0700

--
 .../api/EnumQueryParamConverterProvider.java| 73 
 .../src/main/resources/linkedin-api-schema.xjb  | 35 +-
 .../src/main/resources/linkedin-api-schema.xsd  | 36 ++
 .../src/main/resources/linkedin-api-wadl.xml| 48 +++--
 .../api/AbstractResourceIntegrationTest.java|  2 +-
 .../api/PeopleResourceIntegrationTest.java  | 25 +++
 .../component/linkedin/LinkedInEndpoint.java|  3 +-
 .../CompaniesResourceIntegrationTest.java   | 10 +--
 8 files changed, 184 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d05bd355/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/EnumQueryParamConverterProvider.java
--
diff --git 
a/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/EnumQueryParamConverterProvider.java
 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/EnumQueryParamConverterProvider.java
new file mode 100644
index 000..8d3cee3
--- /dev/null
+++ 
b/components/camel-linkedin/camel-linkedin-api/src/main/java/org/apache/camel/component/linkedin/api/EnumQueryParamConverterProvider.java
@@ -0,0 +1,73 @@
+/**
+ * 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.component.linkedin.api;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import javax.ws.rs.ext.ParamConverter;
+import javax.ws.rs.ext.ParamConverterProvider;
+import javax.ws.rs.ext.Provider;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Converter provider for Enum Query params.
+ */
+@Provider
+public class EnumQueryParamConverterProviderT extends EnumT implements 
ParamConverterProvider {
+private static final Logger LOG = 
LoggerFactory.getLogger(EnumQueryParamConverterProvider.class);
+
+@Override
+public T ParamConverterT getConverter(ClassT rawType, Type 
genericType, Annotation[] annotations) {
+if (rawType.isEnum()) {
+try {
+final Method valueMethod = rawType.getMethod(value, null);
+final Method fromValueMethod = rawType.getMethod(fromValue, 
String.class);
+
+return new ParamConverterT() {
+@Override
+public T fromString(String value) {
+try {
+return (T) fromValueMethod.invoke(null, value);
+} catch (IllegalAccessException e) {
+throw new IllegalArgumentException(e);
+} catch (InvocationTargetException e) {
+throw new IllegalArgumentException(e);
+}
+}
+
+@Override
+public String toString(T value) {
+try {
+return (String) valueMethod.invoke(value);
+} catch (IllegalAccessException e) {
+throw new IllegalArgumentException(e);
+} catch (InvocationTargetException e) {
+