camel git commit: CAMEL-10082: Fixed inner class name handling in camel-api-component-maven-plugin

2016-06-21 Thread dhirajsb 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 88c605bfa -> 1192cbd2d


CAMEL-10082: Fixed inner class name handling in camel-api-component-maven-plugin


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

Branch: refs/heads/camel-2.17.x
Commit: 1192cbd2de0a961c2480510db2495571b43295e4
Parents: 88c605b
Author: Dhiraj Bokde 
Authored: Tue Jun 21 15:54:21 2016 -0700
Committer: Dhiraj Bokde 
Committed: Tue Jun 21 15:57:27 2016 -0700

--
 .../camel/util/component/ApiMethodParser.java   | 30 +---
 .../util/component/ApiMethodHelperTest.java | 10 +--
 .../ArgumentSubstitutionParserTest.java | 12 +---
 .../apache/camel/util/component/TestProxy.java  | 16 +++
 .../camel-api-component-maven-plugin/pom.xml|  9 ++
 .../apache/camel/component/test/TestProxy.java  | 16 +++
 .../test/resources/test-proxy-signatures.txt|  1 +
 7 files changed, 77 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1192cbd2/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java 
b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
index 5040bd0..a7a1a70 100644
--- 
a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
+++ 
b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
@@ -237,7 +237,7 @@ public abstract class ApiMethodParser {
 }
 
 public static Class forName(String className, ClassLoader classLoader) 
throws ClassNotFoundException {
-Class result;
+Class result = null;
 try {
 // lookup primitive types first
 result = PRIMITIVE_TYPES.get(className);
@@ -249,10 +249,32 @@ public abstract class ApiMethodParser {
 if (className.endsWith("[]")) {
 final int firstDim = className.indexOf('[');
 final int nDimensions = (className.length() - firstDim) / 2;
-return Array.newInstance(forName(className.substring(0, 
firstDim), classLoader), new int[nDimensions]).getClass();
+result = Array.newInstance(forName(className.substring(0, 
firstDim), classLoader), new int[nDimensions]).getClass();
+} else if (className.indexOf('.') != -1) {
+// try replacing last '.' with $ to look for inner classes
+String innerClass = className;
+while (result == null && innerClass.indexOf('.') != -1) {
+int endIndex = innerClass.lastIndexOf('.');
+innerClass = innerClass.substring(0, endIndex) + "$" + 
innerClass.substring(endIndex + 1);
+try {
+result = Class.forName(innerClass, true, classLoader);
+} catch (ClassNotFoundException ignore) {
+// ignore
+}
+}
+}
+if (result == null && !className.startsWith(JAVA_LANG)) {
+// try loading from default Java package java.lang
+try {
+result = forName(JAVA_LANG + className, classLoader);
+} catch (ClassNotFoundException ignore) {
+// ignore
+}
 }
-// try loading from default Java package java.lang
-result = Class.forName(JAVA_LANG + className, true, classLoader);
+}
+
+if (result == null) {
+throw new ClassNotFoundException(className);
 }
 
 return result;

http://git-wip-us.apache.org/repos/asf/camel/blob/1192cbd2/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java
 
b/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java
index 2287993..574c9d4 100644
--- 
a/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java
@@ -60,6 +60,9 @@ public class ApiMethodHelperTest {
 
 methods = apiMethodHelper.getCandidateMethods("greetAll", "nameMap");
 assertEquals("Can't find greetAll(nameMap)", 1, methods.size());
+
+methods =

camel git commit: CAMEL-10082: Fixed inner class name handling in camel-api-component-maven-plugin

2016-06-21 Thread dhirajsb 
Repository: camel
Updated Branches:
  refs/heads/master 532f5a048 -> 201583bce


CAMEL-10082: Fixed inner class name handling in camel-api-component-maven-plugin


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

Branch: refs/heads/master
Commit: 201583bce4bab6dda27b5e107b63af8d23a544f3
Parents: 532f5a0
Author: Dhiraj Bokde 
Authored: Tue Jun 21 15:54:21 2016 -0700
Committer: Dhiraj Bokde 
Committed: Tue Jun 21 15:54:21 2016 -0700

--
 .../camel/util/component/ApiMethodParser.java   | 30 +---
 .../util/component/ApiMethodHelperTest.java | 10 +--
 .../ArgumentSubstitutionParserTest.java | 12 +---
 .../apache/camel/util/component/TestProxy.java  | 16 +++
 .../camel-api-component-maven-plugin/pom.xml|  9 ++
 .../apache/camel/component/test/TestProxy.java  | 16 +++
 .../test/resources/test-proxy-signatures.txt|  1 +
 7 files changed, 77 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/201583bc/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java 
b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
index 5040bd0..a7a1a70 100644
--- 
a/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
+++ 
b/camel-core/src/main/java/org/apache/camel/util/component/ApiMethodParser.java
@@ -237,7 +237,7 @@ public abstract class ApiMethodParser {
 }
 
 public static Class forName(String className, ClassLoader classLoader) 
throws ClassNotFoundException {
-Class result;
+Class result = null;
 try {
 // lookup primitive types first
 result = PRIMITIVE_TYPES.get(className);
@@ -249,10 +249,32 @@ public abstract class ApiMethodParser {
 if (className.endsWith("[]")) {
 final int firstDim = className.indexOf('[');
 final int nDimensions = (className.length() - firstDim) / 2;
-return Array.newInstance(forName(className.substring(0, 
firstDim), classLoader), new int[nDimensions]).getClass();
+result = Array.newInstance(forName(className.substring(0, 
firstDim), classLoader), new int[nDimensions]).getClass();
+} else if (className.indexOf('.') != -1) {
+// try replacing last '.' with $ to look for inner classes
+String innerClass = className;
+while (result == null && innerClass.indexOf('.') != -1) {
+int endIndex = innerClass.lastIndexOf('.');
+innerClass = innerClass.substring(0, endIndex) + "$" + 
innerClass.substring(endIndex + 1);
+try {
+result = Class.forName(innerClass, true, classLoader);
+} catch (ClassNotFoundException ignore) {
+// ignore
+}
+}
+}
+if (result == null && !className.startsWith(JAVA_LANG)) {
+// try loading from default Java package java.lang
+try {
+result = forName(JAVA_LANG + className, classLoader);
+} catch (ClassNotFoundException ignore) {
+// ignore
+}
 }
-// try loading from default Java package java.lang
-result = Class.forName(JAVA_LANG + className, true, classLoader);
+}
+
+if (result == null) {
+throw new ClassNotFoundException(className);
 }
 
 return result;

http://git-wip-us.apache.org/repos/asf/camel/blob/201583bc/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java
 
b/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java
index 2287993..574c9d4 100644
--- 
a/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java
@@ -60,6 +60,9 @@ public class ApiMethodHelperTest {
 
 methods = apiMethodHelper.getCandidateMethods("greetAll", "nameMap");
 assertEquals("Can't find greetAll(nameMap)", 1, methods.size());
+
+methods = apiMethodHelper.getCandidateMethods("greetInnerChild",

camel git commit: CAMEL-10080 CxfPayloadConverter to use a XMLStreamReader based conversion if applicable

2016-06-21 Thread ay 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 0bfc8a263 -> 88c605bfa


CAMEL-10080 CxfPayloadConverter to use a XMLStreamReader based conversion if 
applicable


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

Branch: refs/heads/camel-2.17.x
Commit: 88c605bfae044b7fd9da3e83aeff3148c9f46938
Parents: 0bfc8a2
Author: Akitoshi Yoshida 
Authored: Tue Jun 21 10:16:09 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Jun 21 12:25:19 2016 +0200

--
 .../component/cxf/converter/CxfPayloadConverter.java  | 14 +++---
 .../cxf/converter/CxfPayloadConverterTest.java| 13 +
 2 files changed, 24 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/88c605bf/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
index 74e0d10..196dbce 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
@@ -195,7 +195,16 @@ public final class CxfPayloadConverter {
 if (type.isInstance(s)) {
 return type.cast(s);
 }
-TypeConverter tc = registry.lookup(type, Source.class);
+TypeConverter tc = registry.lookup(type, 
XMLStreamReader.class);
+if (tc != null && (s instanceof StaxSource || s instanceof 
StAXSource)) {
+XMLStreamReader r = (s instanceof StAXSource)
+? ((StAXSource)s).getXMLStreamReader() : 
((StaxSource) s).getXMLStreamReader();
+if (payload.getNsMap() != null) {
+r = new DelegatingXMLStreamReader(r, 
payload.getNsMap());
+}
+return (T)tc.convertTo(type, r);
+}
+tc = registry.lookup(type, Source.class);
 if (tc != null) {
 XMLStreamReader r = null;
 if (payload.getNsMap() != null) {
@@ -208,8 +217,7 @@ public final class CxfPayloadConverter {
 s = new StAXSource(new 
DelegatingXMLStreamReader(r, payload.getNsMap()));
 }
 }
-T t = tc.convertTo(type, s);
-return t;
+return (T)tc.convertTo(type, s);
 }
 }
 TypeConverter tc = registry.lookup(type, NodeList.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/88c605bf/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
--
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
index 5bf636f..8e2d46c 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
@@ -27,6 +27,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stax.StAXSource;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -36,6 +37,7 @@ import org.w3c.dom.NodeList;
 import org.apache.camel.StreamCache;
 import org.apache.camel.component.cxf.CxfPayload;
 import org.apache.camel.test.junit4.ExchangeTestSupport;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -43,6 +45,7 @@ public class CxfPayloadConverterTest extends 
ExchangeTestSupport {
 private Document document;
 private CxfPayload payload;
 private CxfPayload emptyPayload;
+private CxfPayload staxpayload;
 private FileInputStream inputStream;
 
 @Override
@@ -62,8 +65,11 @@ public class CxfPayloadConverterTest extends 
ExchangeTestSupport {
 document.getDocumentElement().normalize();
 List

camel git commit: Upgrade Maven exec plugin to version 1.5.0

2016-06-21 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 13d1255ec -> 532f5a048


Upgrade Maven exec plugin to version 1.5.0


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

Branch: refs/heads/master
Commit: 532f5a0487976d356a53f11fcbc0455b1e32c76c
Parents: 13d1255
Author: Andrea Cosentino 
Authored: Tue Jun 21 11:34:40 2016 +0200
Committer: Andrea Cosentino 
Committed: Tue Jun 21 11:34:40 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/532f5a04/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 155c1ab..6b637d5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -167,7 +167,7 @@
 
 1.50.1
 2.11.0
-1.4.0
+1.5.0
 1.0.6_1
 2.4.4
 2.4.4_1

camel git commit: Update readme for karaf 4 style

2016-06-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 4b9f3a968 -> 13d1255ec


Update readme for karaf 4 style


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

Branch: refs/heads/master
Commit: 13d1255ec54467093aefe4c18f19a50bb736da6b
Parents: 4b9f3a9
Author: Claus Ibsen 
Authored: Tue Jun 21 11:00:09 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jun 21 11:00:09 2016 +0200

--
 examples/camel-example-sql-blueprint/README.md | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/13d1255e/examples/camel-example-sql-blueprint/README.md
--
diff --git a/examples/camel-example-sql-blueprint/README.md 
b/examples/camel-example-sql-blueprint/README.md
index 6227eb0..b7aa857 100644
--- a/examples/camel-example-sql-blueprint/README.md
+++ b/examples/camel-example-sql-blueprint/README.md
@@ -33,23 +33,22 @@ You will need to compile this example first:
 
 To install Apache Camel in Karaf you type in the shell (we use version 
${project.version}):
 
-   features:chooseurl camel ${project.version}
-   features:install camel
+   feature:repo-add camel ${project.version}
+   feature:install camel
 
 First you need to install the following features in Karaf/ServiceMix with:
 
-   features:install camel-blueprint
-   features:install camel-sql
+   feature:install camel-sql
 
 Then you need to install JDBC connection pool and the Derby Database:
 
-   osgi:install -s mvn:commons-pool/commons-pool/1.6
-   osgi:install -s 
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/1.4_3
-   osgi:install -s mvn:org.apache.derby/derby/10.10.1.1
+   install -s mvn:commons-pool/commons-pool/1.6
+   install -s 
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/1.4_3
+   install -s mvn:org.apache.derby/derby/10.10.1.1
 
 Then you can install the Camel example:
 
-   osgi:install -s 
mvn:org.apache.camel/camel-example-sql-blueprint/${project.version}
+   install -s 
mvn:org.apache.camel/camel-example-sql-blueprint/${project.version}
 
 And you can see the application running by tailing the logs

camel git commit: CAMEL-10063: Fix camel karaf commands using some util code from karaf that is not reusable.

2016-06-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master cb954e777 -> 4b9f3a968


CAMEL-10063: Fix camel karaf commands using some util code from karaf that is 
not reusable.


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

Branch: refs/heads/master
Commit: 4b9f3a968386b481ca6849de83e7f5592a0cb5df
Parents: cb954e7
Author: Claus Ibsen 
Authored: Tue Jun 21 10:56:13 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jun 21 10:56:13 2016 +0200

--
 platforms/karaf/commands/pom.xml|   9 +-
 .../internal/KarafStringEscapeUtils.java| 229 +++
 .../karaf/commands/internal/StringEscape.java   |   8 +-
 3 files changed, 233 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4b9f3a96/platforms/karaf/commands/pom.xml
--
diff --git a/platforms/karaf/commands/pom.xml b/platforms/karaf/commands/pom.xml
index a32e014..3701123 100644
--- a/platforms/karaf/commands/pom.xml
+++ b/platforms/karaf/commands/pom.xml
@@ -53,11 +53,6 @@
   ${karaf4-version}
 
 
-  org.apache.karaf
-  org.apache.karaf.util
-  ${karaf-version}
-
-
   org.osgi
   org.osgi.core
   provided
@@ -81,7 +76,6 @@
 true
 
   
-
*;artifactId=org.apache.karaf.util;inline=true
 
   !org.apache.felix.utils.properties,
   org.apache.felix.service.command;version="[0.16,1)",
@@ -92,8 +86,7 @@
   *
 
 
-  org.apache.camel.karaf.commands.internal,
-  org.apache.karaf.util
+  org.apache.camel.karaf.commands.internal
 
   
 

http://git-wip-us.apache.org/repos/asf/camel/blob/4b9f3a96/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/KarafStringEscapeUtils.java
--
diff --git 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/KarafStringEscapeUtils.java
 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/KarafStringEscapeUtils.java
new file mode 100644
index 000..53e17f1
--- /dev/null
+++ 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/KarafStringEscapeUtils.java
@@ -0,0 +1,229 @@
+/**
+ * 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.karaf.commands.internal;
+
+import java.util.Locale;
+
+/**
+ * Util class to manipulate String, especially around escape/unescape.
+ *
+ * This class is a copy of org.apache.karaf.util.StringEscapeUtils.
+ */
+public final class KarafStringEscapeUtils {
+
+/**
+ * Constant for the radix of hex numbers.
+ */
+private static final int HEX_RADIX = 16;
+
+/**
+ * Constant for the length of a unicode literal.
+ */
+private static final int UNICODE_LEN = 4;
+
+private KarafStringEscapeUtils() {
+}
+
+/**
+ * Unescapes any Java literals found in the String to a
+ * Writer. This is a slightly modified version of the
+ * StringEscapeUtils.unescapeJava() function in commons-lang that doesn't
+ * drop escaped separators (i.e '\,').
+ *
+ * @param str the String to unescape, may be null
+ * @return the processed string
+ * @throws IllegalArgumentException if the Writer is null
+ */
+public static String unescapeJava(String str) {
+if (str == null) {
+return null;
+}
+int sz = str.length();
+StringBuffer out = new StringBuffer(sz);
+StringBuffer unicode = new StringBuffer(UNICODE_LEN);
+boolean hadSlash = false;
+boolean inUnicode = false;
+for (int i = 0; i < sz; i++) {
+

[3/5] camel git commit: CAMEL-10062: For specialized Dataformats, provide default value in catalog

2016-06-21 Thread davsclaus 
CAMEL-10062: For specialized Dataformats, provide default value in catalog


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

Branch: refs/heads/master
Commit: cb954e77761e7e1d842ee6e749b42fad62889275
Parents: 4b2e485
Author: Claus Ibsen 
Authored: Tue Jun 21 10:13:49 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jun 21 10:18:33 2016 +0200

--
 .../java/org/apache/camel/model/dataformat/JsonDataFormat.java   | 2 +-
 .../component/gson/springboot/GsonDataFormatConfiguration.java   | 2 +-
 .../jackson/springboot/JacksonDataFormatConfiguration.java   | 2 +-
 .../johnzon/springboot/JohnzonDataFormatConfiguration.java   | 4 ++--
 .../xstream/springboot/JsonDataFormatConfiguration.java  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cb954e77/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
index 6521c7c..2ca8dff 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
@@ -133,7 +133,7 @@ public class JsonDataFormat extends DataFormatDefinition {
 }
 
 /**
- * Which json library to use such.
+ * Which json library to use.
  */
 public void setLibrary(JsonLibrary library) {
 this.library = library;

http://git-wip-us.apache.org/repos/asf/camel/blob/cb954e77/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
--
diff --git 
a/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
 
b/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
index 714dcc3..477e679 100644
--- 
a/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
+++ 
b/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
@@ -38,7 +38,7 @@ public class GsonDataFormatConfiguration {
  */
 private Boolean prettyPrint = false;
 /**
- * Which json library to use such.
+ * Which json library to use.
  */
 private JsonLibrary library = JsonLibrary.Gson;
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/cb954e77/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
--
diff --git 
a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
 
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
index 2647c75..ee32606 100644
--- 
a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
+++ 
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
@@ -38,7 +38,7 @@ public class JacksonDataFormatConfiguration {
  */
 private Boolean prettyPrint = false;
 /**
- * Which json library to use such.
+ * Which json library to use.
  */
 private JsonLibrary library = JsonLibrary.Jackson;
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/cb954e77/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
--
diff --git 
a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
 
b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
index 1e81633..eb01d01 100644
--- 
a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
+++ 
b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
@@ -38,9 +38,9 @@ public class JohnzonDataFormatConfiguration {
  */
 private Boolean

[1/5] camel git commit: CAMEL-10062: For specialized Dataformats, provide default value in catalog

2016-06-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x cdd0704db -> 0bfc8a263
  refs/heads/master da0fc7bff -> cb954e777


CAMEL-10062: For specialized Dataformats, provide default value in catalog


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

Branch: refs/heads/camel-2.17.x
Commit: 0bfc8a263c6e2bf684bf98ff110a5c36c75b30c9
Parents: eb0c7d5
Author: Claus Ibsen 
Authored: Tue Jun 21 10:18:06 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jun 21 10:18:23 2016 +0200

--
 .../java/org/apache/camel/model/dataformat/JsonDataFormat.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0bfc8a26/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
index d501288..0b78d3d 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
@@ -133,9 +133,7 @@ public class JsonDataFormat extends DataFormatDefinition {
 }
 
 /**
- * Which json library to use such.
- * 
- * Is by default xstream
+ * Which json library to use.
  */
 public void setLibrary(JsonLibrary library) {
 this.library = library;

[5/5] camel git commit: CAMEL-10062: For specialized Dataformats, provide default value in catalog

2016-06-21 Thread davsclaus 
CAMEL-10062: For specialized Dataformats, provide default value in catalog


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

Branch: refs/heads/master
Commit: f353c8c50b28716b951e369d8d633c7b03fde72e
Parents: da0fc7b
Author: Claus Ibsen 
Authored: Tue Jun 21 09:52:07 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jun 21 10:18:33 2016 +0200

--
 .../maven/packaging/PackageDataFormatMojo.java  | 48 ++--
 1 file changed, 45 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f353c8c5/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index 6ae8d39..c6dfcff 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -199,6 +199,11 @@ public class PackageDataFormatMojo extends AbstractMojo {
 
 // build json schema for the data format
 String properties = after(json, "  \"properties\": 
{");
+
+// special prepare for bindy/json properties
+properties = prepareBindyProperties(name, 
properties);
+properties = prepareJsonProperties(name, 
properties);
+
 String schema = 
createParameterJsonSchema(dataFormatModel, properties);
 log.debug("JSon schema\n" + schema);
 
@@ -270,6 +275,43 @@ public class PackageDataFormatMojo extends AbstractMojo {
 }
 }
 
+private static String prepareBindyProperties(String name, String 
properties) {
+String bindy = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], 
\"deprecated\": \"false\", \"secret\": \"false\"";
+String bindyCsv = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], 
\"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"Csv\"";
+String bindyFixed = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], 
\"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"Fixed\"";
+String bindyKvp = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], 
\"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": 
\"KeyValue\"";
+
+if ("bindy-csv".equals(name)) {
+properties = properties.replace(bindy, bindyCsv);
+} else if ("bindy-fixed".equals(name)) {
+properties = properties.replace(bindy, bindyFixed);
+} else if ("bindy-kvp".equals(name)) {
+properties = properties.replace(bindy, bindyKvp);
+}
+
+return properties;
+}
+
+private static String prepareJsonProperties(String name, String 
properties) {
+String json = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", 
\"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\"";
+String jsonGson = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", 
\"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\", 
\"defaultValue\": \"Gson\"";
+String jsonJackson = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", 
\"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\", 
\"defaultValue\": \"Jackson\"";
+String jsonJohnzon = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", 
\"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\", 
\"defaultValue\": \"Johnzon\"";
+String jsonXStream = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", 
\"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\", 
\"defaultValue\": \"XStream\"";
+
+if ("json-gson".equals(name)) {
+properties = properties.replace(json, jsonGson);
+} else if ("json-jackson".equals(name)) {
+properties = properties.replace(json, jsonJackson);
+} else if ("json-johnzon".equals(name)) {
+properties = properties.replace(json, jsonJohnzon);
+} else if ("json-xstream".equals(name)) {
+properties = properties.replace(json, jsonXStream);
+}
+
+return properties;
+}
+
 private static String readClassFromCamelResource(File file, StringBuilder 
buffer, BuildContext

[4/5] camel git commit: CAMEL-10062: For specialized Dataformats, provide default value in catalog

2016-06-21 Thread davsclaus 
CAMEL-10062: For specialized Dataformats, provide default value in catalog


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

Branch: refs/heads/master
Commit: 4b2e485d69f961da7b3da6689aeaf9d67ab03610
Parents: f353c8c
Author: Claus Ibsen 
Authored: Tue Jun 21 09:52:10 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jun 21 10:18:33 2016 +0200

--
 .../BindyCsvDataFormatConfiguration.java |  3 ++-
 .../BindyFixedLengthDataFormatConfiguration.java |  3 ++-
 ...BindyKeyValuePairDataFormatConfiguration.java |  3 ++-
 .../maven/packaging/PackageDataFormatMojo.java   |  2 +-
 .../SpringBootAutoConfigurationMojo.java | 19 ++-
 5 files changed, 9 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4b2e485d/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java
--
diff --git 
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java
 
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java
index befeff9..67f781b 100644
--- 
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java
+++ 
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.dataformat.bindy.csv.springboot;
 
+import org.apache.camel.dataformat.bindy.csv.BindyCsvDataFormat;
 import org.apache.camel.model.dataformat.BindyType;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
@@ -30,7 +31,7 @@ public class BindyCsvDataFormatConfiguration {
 /**
  * Whether to use csv fixed or key value pairs mode.
  */
-private BindyType type;
+private BindyType type = BindyType.Csv;
 /**
  * Name of model class to use.
  */

http://git-wip-us.apache.org/repos/asf/camel/blob/4b2e485d/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java
--
diff --git 
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java
 
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java
index a159408..90c89bf 100644
--- 
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java
+++ 
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.dataformat.bindy.fixed.springboot;
 
+import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat;
 import org.apache.camel.model.dataformat.BindyType;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
@@ -30,7 +31,7 @@ public class BindyFixedLengthDataFormatConfiguration {
 /**
  * Whether to use csv fixed or key value pairs mode.
  */
-private BindyType type;
+private BindyType type = BindyType.Fixed;
 /**
  * Name of model class to use.
  */

http://git-wip-us.apache.org/repos/asf/camel/blob/4b2e485d/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java
--
diff --git 
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java
 
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java
index ae5011d..63d823f 100644
--- 
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java
+++ 
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.dataformat.bindy.kvp.springboot;
 
+import org.apache.camel.dataformat.bindy.kvp.BindyKeyValuePairDataFormat;
 import org.apache.camel.model.dataformat.BindyType;
 import

[2/5] camel git commit: CAMEL-10062: For specialized Dataformats, provide default value in catalog

2016-06-21 Thread davsclaus 
CAMEL-10062: For specialized Dataformats, provide default value in catalog


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

Branch: refs/heads/camel-2.17.x
Commit: eb0c7d5fe715db6a89ef3dce54123592bb4fcb61
Parents: cdd0704
Author: Claus Ibsen 
Authored: Tue Jun 21 09:52:07 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jun 21 10:18:23 2016 +0200

--
 .../maven/packaging/PackageDataFormatMojo.java  | 39 
 1 file changed, 39 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/eb0c7d5f/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index 9f88702..9405f73 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -200,6 +200,11 @@ public class PackageDataFormatMojo extends AbstractMojo {
 
 // build json schema for the data format
 String properties = after(json, "  
\"properties\": {");
+
+// special prepare for bindy/json properties
+properties = prepareBindyProperties(name, 
properties);
+properties = prepareJsonProperties(name, 
properties);
+
 String schema = 
createParameterJsonSchema(dataFormatModel, properties);
 log.debug("JSon schema\n" + schema);
 
@@ -275,6 +280,40 @@ public class PackageDataFormatMojo extends AbstractMojo {
 }
 }
 
+private static String prepareBindyProperties(String name, String 
properties) {
+String bindy = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], 
\"deprecated\": \"false\", \"secret\": \"false\"";
+String bindyCsv = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], 
\"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"Csv\"";
+String bindyFixed = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], 
\"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"Fixed\"";
+String bindyKvp = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], 
\"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": 
\"KeyValue\"";
+
+if ("bindy-csv".equals(name)) {
+properties = properties.replace(bindy, bindyCsv);
+} else if ("bindy-fixed".equals(name)) {
+properties = properties.replace(bindy, bindyFixed);
+} else if ("bindy-kvp".equals(name)) {
+properties = properties.replace(bindy, bindyKvp);
+}
+
+return properties;
+}
+
+private static String prepareJsonProperties(String name, String 
properties) {
+String json = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", 
\"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\"";
+String jsonGson = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", 
\"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\", 
\"defaultValue\": \"Gson\"";
+String jsonJackson = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", 
\"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\", 
\"defaultValue\": \"Jackson\"";
+String jsonXStream = "\"enum\": [ \"Gson\", \"Jackson\", \"Johnzon\", 
\"XStream\" ], \"deprecated\": \"false\", \"secret\": \"false\", 
\"defaultValue\": \"XStream\"";
+
+if ("json-gson".equals(name)) {
+properties = properties.replace(json, jsonGson);
+} else if ("json-jackson".equals(name)) {
+properties = properties.replace(json, jsonJackson);
+} else if ("json-xstream".equals(name)) {
+properties = properties.replace(json, jsonXStream);
+}
+
+return properties;
+}
+
 private static String readClassFromCamelResource(File file, StringBuilder 
buffer, BuildContext buildContext) throws MojoExecutionException {
 // skip directories as there may be a sub .resolver directory
 if (file.isDirectory()) {

camel git commit: CAMEL-10080 CxfPayloadConverter to use a XMLStreamReader based conversion if applicable

2016-06-21 Thread ay 
Repository: camel
Updated Branches:
  refs/heads/master 84e6b76bd -> da0fc7bff


CAMEL-10080 CxfPayloadConverter to use a XMLStreamReader based conversion if 
applicable


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

Branch: refs/heads/master
Commit: da0fc7bffac1f369697ba20796e3c4343d349754
Parents: 84e6b76
Author: Akitoshi Yoshida 
Authored: Tue Jun 21 10:16:09 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Tue Jun 21 10:16:33 2016 +0200

--
 .../component/cxf/converter/CxfPayloadConverter.java  | 14 +++---
 .../cxf/converter/CxfPayloadConverterTest.java| 13 +
 2 files changed, 24 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/da0fc7bf/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
--
diff --git 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
index 74e0d10..196dbce 100644
--- 
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
+++ 
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
@@ -195,7 +195,16 @@ public final class CxfPayloadConverter {
 if (type.isInstance(s)) {
 return type.cast(s);
 }
-TypeConverter tc = registry.lookup(type, Source.class);
+TypeConverter tc = registry.lookup(type, 
XMLStreamReader.class);
+if (tc != null && (s instanceof StaxSource || s instanceof 
StAXSource)) {
+XMLStreamReader r = (s instanceof StAXSource)
+? ((StAXSource)s).getXMLStreamReader() : 
((StaxSource) s).getXMLStreamReader();
+if (payload.getNsMap() != null) {
+r = new DelegatingXMLStreamReader(r, 
payload.getNsMap());
+}
+return (T)tc.convertTo(type, r);
+}
+tc = registry.lookup(type, Source.class);
 if (tc != null) {
 XMLStreamReader r = null;
 if (payload.getNsMap() != null) {
@@ -208,8 +217,7 @@ public final class CxfPayloadConverter {
 s = new StAXSource(new 
DelegatingXMLStreamReader(r, payload.getNsMap()));
 }
 }
-T t = tc.convertTo(type, s);
-return t;
+return (T)tc.convertTo(type, s);
 }
 }
 TypeConverter tc = registry.lookup(type, NodeList.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/da0fc7bf/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
--
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
index 5bf636f..8e2d46c 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
@@ -27,6 +27,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stax.StAXSource;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -36,6 +37,7 @@ import org.w3c.dom.NodeList;
 import org.apache.camel.StreamCache;
 import org.apache.camel.component.cxf.CxfPayload;
 import org.apache.camel.test.junit4.ExchangeTestSupport;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -43,6 +45,7 @@ public class CxfPayloadConverterTest extends 
ExchangeTestSupport {
 private Document document;
 private CxfPayload payload;
 private CxfPayload emptyPayload;
+private CxfPayload staxpayload;
 private FileInputStream inputStream;
 
 @Override
@@ -62,8 +65,11 @@ public class CxfPayloadConverterTest extends 
ExchangeTestSupport {
 document.getDocumentElement().normalize();
 List body = new

camel git commit: CAMEL-10079: Upgrade quickfixj to v1.6.2

2016-06-21 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master 384a86005 -> 84e6b76bd


CAMEL-10079: Upgrade quickfixj to v1.6.2


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

Branch: refs/heads/master
Commit: 84e6b76bd8573bcf50d91d75b3ea7ce0ba173246
Parents: 384a860
Author: lburgazzoli 
Authored: Tue Jun 21 09:00:22 2016 +0200
Committer: lburgazzoli 
Committed: Tue Jun 21 09:00:59 2016 +0200

--
 components/camel-quickfix/pom.xml| 6 +++---
 parent/pom.xml   | 2 +-
 platforms/karaf/features/src/main/resources/features.xml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/84e6b76b/components/camel-quickfix/pom.xml
--
diff --git a/components/camel-quickfix/pom.xml 
b/components/camel-quickfix/pom.xml
index 7a6ee80..34f9d91 100644
--- a/components/camel-quickfix/pom.xml
+++ b/components/camel-quickfix/pom.xml
@@ -41,9 +41,9 @@
   camel-core
 
 
-  org.apache.servicemix.bundles
-  org.apache.servicemix.bundles.quickfix
-  ${quickfix-bundle-version}
+  org.quickfixj
+  quickfixj-all
+  ${quickfixj-version}
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/84e6b76b/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 3e2e0f0..155c1ab 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -466,7 +466,7 @@
 1.8.6
 [1.8,2)
 2.2.3
-1.6.1_1
+1.6.2
 3.6.2
 0.9.10_3
 1.4_1

http://git-wip-us.apache.org/repos/asf/camel/blob/84e6b76b/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 c0ef0a1..e827fbe 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1323,8 +1323,8 @@
   
   
 camel-core
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mina/${mina-bundle-version}
-
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quickfix/${quickfix-bundle-version}
+mvn:org.apache.mina/mina-core/${mina2-version}
+mvn:org.quickfixj/quickfixj-all/${quickfixj-version}
 mvn:org.apache.camel/camel-quickfix/${project.version}

camel git commit: CAMEL-9878 camel-commands - Add command to show top N inflight exchanges per routes

2016-06-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master ed6056171 -> 384a86005


CAMEL-9878 camel-commands - Add command to show top N inflight exchanges per 
routes

Added new argument (`route`) to `context-inflight` command. Client can
use the `route` argument to specify the route which inflight exchanges
should be displayed.


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

Branch: refs/heads/master
Commit: 384a86005ea17538f1911bfced81c98a202003fc
Parents: ed60561
Author: Zoran Regvart 
Authored: Sat Jun 18 18:53:22 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jun 21 08:47:41 2016 +0200

--
 .../commands/AbstractLocalCamelController.java  |  4 +-
 .../apache/camel/commands/CamelController.java  |  3 +-
 .../camel/commands/ContextInflightCommand.java  |  6 +-
 .../AbstractLocalCamelControllerTest.java   | 95 
 .../jolokia/DefaultJolokiaCamelController.java  |  4 +-
 .../commands/jolokia/JolokiaRemoteTest.java |  2 +-
 .../camel/karaf/commands/ContextInflight.java   |  5 +-
 7 files changed, 110 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/384a8600/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
--
diff --git 
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
 
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
index 6d80584..03f82dc 100644
--- 
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
+++ 
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java
@@ -174,7 +174,7 @@ public abstract class AbstractLocalCamelController extends 
AbstractCamelControll
 }
 
 @SuppressWarnings("unchecked")
-public List> browseInflightExchanges(String 
camelContextName, int limit, boolean sortByLongestDuration) throws Exception {
+public List> browseInflightExchanges(String 
camelContextName, String route, int limit, boolean sortByLongestDuration) 
throws Exception {
 CamelContext context = this.getLocalCamelContext(camelContextName);
 if (context == null) {
 return null;
@@ -187,7 +187,7 @@ public abstract class AbstractLocalCamelController extends 
AbstractCamelControll
 MBeanServer mBeanServer = agent.getMBeanServer();
 ObjectName on = new ObjectName(agent.getMBeanObjectDomainName() + 
":type=services,name=DefaultInflightRepository,context=" + 
context.getManagementName());
 if (mBeanServer.isRegistered(on)) {
-TabularData list = (TabularData) mBeanServer.invoke(on, 
"browse", new Object[]{limit, sortByLongestDuration}, new String[]{"int", 
"boolean"});
+TabularData list = (TabularData) mBeanServer.invoke(on, 
"browse", new Object[]{route, limit, sortByLongestDuration}, new 
String[]{"java.lang.String", "int", "boolean"});
 Collection values = (Collection) 
list.values();
 for (CompositeData data : values) {
 Map row = new LinkedHashMap();

http://git-wip-us.apache.org/repos/asf/camel/blob/384a8600/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
--
diff --git 
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
 
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
index 65c2139..a13b10f 100644
--- 
a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
+++ 
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
@@ -66,12 +66,13 @@ public interface CamelController {
  * Browses the inflight exchanges
  *
  * @param camelContextNamethe Camel context.
+ * @param route   the Camel route ID
  * @param limit   maximum number of exchanges to return
  * @param sortByLongestDuration   true to sort by longest 
duration, false to sort by exchange id
  * @return a list of key/value pairs with inflight exchange information
  * @throws java.lang.Exception can be thrown
  */
-List> browseInflightExchanges(String

[3/3] camel git commit: CAMEL-10060: Added fat-jar aware package scan class resolver

2016-06-21 Thread davsclaus 
CAMEL-10060: Added fat-jar aware package scan class resolver


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

Branch: refs/heads/camel-2.17.x
Commit: cbe8c3268058b54b855b5490cedc5ab4b61cd5db
Parents: 33048a8
Author: Nicola Ferraro 
Authored: Thu Jun 16 23:37:22 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jun 21 08:44:48 2016 +0200

--
 .../impl/DefaultPackageScanClassResolver.java   |  2 +-
 .../spring/boot/CamelAutoConfiguration.java |  2 +
 .../boot/FatJarPackageScanClassResolver.java| 83 
 3 files changed, 86 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cbe8c326/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
index aba0330..6390e27 100644
--- 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
+++ 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
@@ -417,7 +417,7 @@ public class DefaultPackageScanClassResolver extends 
ServiceSupport implements P
  * @param urlPath the url of the jar file to be examined for classes
  * @return all the .class entries from the JAR
  */
-private List doLoadJarClassEntries(InputStream stream, String 
urlPath) {
+protected List doLoadJarClassEntries(InputStream stream, String 
urlPath) {
 List entries = new ArrayList();
 
 JarInputStream jarStream = null;

http://git-wip-us.apache.org/repos/asf/camel/blob/cbe8c326/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
--
diff --git 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index 771ff27..1385968 100644
--- 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++ 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -76,6 +76,8 @@ public class CamelAutoConfiguration {
 
camelContext.getManagementStrategy().getManagementAgent().setCreateConnector(config.isJmxCreateConnector());
 }
 
+camelContext.setPackageScanClassResolver(new 
FatJarPackageScanClassResolver());
+
 return camelContext;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/cbe8c326/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
--
diff --git 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
new file mode 100644
index 000..e435b7a
--- /dev/null
+++ 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
@@ -0,0 +1,83 @@
+/**
+ * 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.spring.boot;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+
+import org.apache.camel.impl.DefaultPackageScanClassResolver;
+import org.apache.camel.util.IOHelper;
+
+/**
+ * An implementation of the {@code 
org.apache.camel.spi.PackageScanClassResolver} that is

[2/3] camel git commit: CAMEL-10060: Added fat-jar aware package scan class resolver

2016-06-21 Thread davsclaus 
CAMEL-10060: Added fat-jar aware package scan class resolver


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

Branch: refs/heads/master
Commit: 239a4fc9515934b0fa85685d4ef5744e40711a8e
Parents: 6c36d90
Author: Nicola Ferraro 
Authored: Thu Jun 16 23:37:22 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jun 21 08:44:22 2016 +0200

--
 .../impl/DefaultPackageScanClassResolver.java   |  2 +-
 .../spring/boot/CamelAutoConfiguration.java |  2 +
 .../boot/FatJarPackageScanClassResolver.java| 83 
 3 files changed, 86 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/239a4fc9/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
index aba0330..6390e27 100644
--- 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
+++ 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
@@ -417,7 +417,7 @@ public class DefaultPackageScanClassResolver extends 
ServiceSupport implements P
  * @param urlPath the url of the jar file to be examined for classes
  * @return all the .class entries from the JAR
  */
-private List doLoadJarClassEntries(InputStream stream, String 
urlPath) {
+protected List doLoadJarClassEntries(InputStream stream, String 
urlPath) {
 List entries = new ArrayList();
 
 JarInputStream jarStream = null;

http://git-wip-us.apache.org/repos/asf/camel/blob/239a4fc9/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
--
diff --git 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index 9100c3e..a293b6e 100644
--- 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++ 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -77,6 +77,8 @@ public class CamelAutoConfiguration {
 
camelContext.getManagementStrategy().getManagementAgent().setCreateConnector(config.isJmxCreateConnector());
 }
 
+camelContext.setPackageScanClassResolver(new 
FatJarPackageScanClassResolver());
+
 return camelContext;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/239a4fc9/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
--
diff --git 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
new file mode 100644
index 000..e435b7a
--- /dev/null
+++ 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
@@ -0,0 +1,83 @@
+/**
+ * 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.spring.boot;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+
+import org.apache.camel.impl.DefaultPackageScanClassResolver;
+import org.apache.camel.util.IOHelper;
+
+/**
+ * An implementation of the {@code 
org.apache.camel.spi.PackageScanClassResolver} that is able to

[1/3] camel git commit: Update CamelSalesforceMojo.java

2016-06-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 33048a86a -> cbe8c3268
  refs/heads/master 6c36d9000 -> ed6056171


Update CamelSalesforceMojo.java

the current pattern does not allow valid package names like "abc.xyz_123"
the new pattern is based on the excellent discussion at 
http://stackoverflow.com/questions/5205339/regular-expression-matching-fully-qualified-class-names

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

Branch: refs/heads/master
Commit: ed6056171a971ad7f235adb6988cb2ef870970fb
Parents: 239a4fc
Author: ssatguru 
Authored: Thu Jun 16 13:20:49 2016 -0500
Committer: Claus Ibsen 
Committed: Tue Jun 21 08:44:22 2016 +0200

--
 .../src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ed605617/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
index 350a815..287ca71 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
@@ -88,7 +88,7 @@ public class CamelSalesforceMojo extends AbstractMojo {
 protected static final int DEFAULT_TIMEOUT = 6;
 
 private static final String JAVA_EXT = ".java";
-private static final String PACKAGE_NAME_PATTERN = 
"^[a-z]+(\\.[a-z][a-z0-9]*)*$";
+private static final String PACKAGE_NAME_PATTERN = 
"(\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*\\.)+\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*";
 
 private static final String SOBJECT_POJO_VM = "/sobject-pojo.vm";
 private static final String SOBJECT_POJO_OPTIONAL_VM = 
"/sobject-pojo-optional.vm";

[2/2] camel git commit: Support PushTopic replay extension

2016-06-21 Thread davsclaus 
Support PushTopic replay extension

See Salesforce API documentation here: 
https://developer.salesforce.com/docs/atlas.en-us.api_streaming.meta/api_streaming/replay_pushtopic_events.htm

Signed-off-by: Sune Keller 


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

Branch: refs/heads/master
Commit: 68254a0bc8c004d598dbecaaae3b7401b72613be
Parents: 615bc23
Author: Sune Keller 
Authored: Wed Jun 15 10:26:54 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jun 21 08:40:03 2016 +0200

--
 .../src/main/docs/salesforce.adoc   |  8 +-
 .../salesforce/SalesforceComponent.java |  4 +-
 .../salesforce/SalesforceConsumer.java  |  5 ++
 .../salesforce/SalesforceEndpoint.java  |  2 +-
 .../salesforce/SalesforceEndpointConfig.java| 39 -
 .../salesforce/api/dto/SObjectUrls.java |  9 ++
 .../streaming/CometDReplayExtension.java| 88 
 .../internal/streaming/SubscriptionHelper.java  | 42 +-
 8 files changed, 184 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/68254a0b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce.adoc
--
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce.adoc
 
b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce.adoc
index 614b537..3f5c9cd 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce.adoc
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce.adoc
@@ -230,10 +230,8 @@ The Salesforce component supports 16 options which are 
listed below.
 
 
 
-
-
 // endpoint options: START
-The Salesforce component supports 37 endpoint options which are listed below:
+The Salesforce component supports 39 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
@@ -247,9 +245,11 @@ The Salesforce component supports 37 endpoint options 
which are listed below:
 | apiVersion | common |  | String | Salesforce API version defaults to 
SalesforceEndpointConfig.DEFAULT_VERSION
 | batchId | common |  | String | Bulk API Batch ID
 | contentType | common |  | ContentType | Bulk API content type one of XML CSV 
ZIP_XML ZIP_CSV
+| defaultReplayId | common |  | Integer | Default replayId setting if no value 
is found in link initialReplayIdMap
 | format | common |  | PayloadFormat | Payload format to use for Salesforce 
API calls either JSON or XML defaults to JSON
 | httpClient | common |  | SalesforceHttpClient | Custom Jetty Http Client to 
use to connect to Salesforce.
 | includeDetails | common |  | Boolean | Include details in Salesforce1 
Analytics report defaults to false.
+| initialReplayIdMap | common |  | Map | Replay IDs to start from per channel 
name.
 | instanceId | common |  | String | Salesforce1 Analytics report execution 
instance ID
 | jobId | common |  | String | Bulk API Job ID
 | notifyForFields | common |  | NotifyForFieldsEnum | Notify for fields 
options are ALL REFERENCED SELECT WHERE
@@ -281,8 +281,6 @@ The Salesforce component supports 37 endpoint options which 
are listed below:
 // endpoint options: END
 
 
-
-
 For obvious security reasons it is recommended that the clientId,
 clientSecret, userName and password fields be not set in the pom.xml.  
 The plugin should be configured for the rest of the properties, and can

http://git-wip-us.apache.org/repos/asf/camel/blob/68254a0b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 600dcbf..61357ea 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -303,10 +303,10 @@ public class SalesforceComponent extends 
UriEndpointComponent implements Endpoin
 }
 }
 
-public SubscriptionHelper getSubscriptionHelper() throws Exception {
+public

[1/2] camel git commit: Support replay push topics in API version 37.0

2016-06-21 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 615bc2355 -> 6c36d9000


Support replay push topics in API version 37.0

Signed-off-by: Sune Keller 


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

Branch: refs/heads/master
Commit: 6c36d9000b5234a606f00e7957cc65b2acbe2495
Parents: 68254a0
Author: Sune Keller 
Authored: Fri Jun 17 13:31:47 2016 +0200
Committer: Claus Ibsen 
Committed: Tue Jun 21 08:40:03 2016 +0200

--
 .../camel/component/salesforce/api/dto/SObject.java |  9 +
 .../internal/streaming/SubscriptionHelper.java  | 16 +---
 2 files changed, 18 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6c36d900/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObject.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObject.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObject.java
index d390595..2fb7f3f 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObject.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/SObject.java
@@ -43,6 +43,7 @@ public class SObject extends AbstractDTOBase {
 private Boolean undeletable;
 private Boolean triggerable;
 private Boolean compactLayoutable;
+private Boolean mruEnabled;
 
 public String getName() {
 return name;
@@ -243,4 +244,12 @@ public class SObject extends AbstractDTOBase {
 public void setCompactLayoutable(Boolean compactLayoutable) {
 this.compactLayoutable = compactLayoutable;
 }
+
+public Boolean getMruEnabled() {
+return mruEnabled;
+}
+
+public void setMruEnabled(Boolean mruEnabled) {
+this.mruEnabled = mruEnabled;
+}
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/6c36d900/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index befd168..a501187 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -60,8 +60,6 @@ public class SubscriptionHelper extends ServiceSupport {
 
 private static final String EXCEPTION_FIELD = "exception";
 
-private static final double MINIMUM_REPLAY_VERSION = 36.0;
-
 private final SalesforceComponent component;
 private final SalesforceSession session;
 private final BayeuxClient client;
@@ -373,12 +371,16 @@ public class SubscriptionHelper extends ServiceSupport {
 }
 
 public String getEndpointUrl() {
-if (Double.valueOf(component.getConfig().getApiVersion()) >= 
MINIMUM_REPLAY_VERSION
-&& (component.getConfig().getDefaultReplayId() != null || 
!component.getConfig().getInitialReplayIdMap().isEmpty())) {
-return component.getSession().getInstanceUrl() + "/cometd/replay/" 
+ component.getConfig().getApiVersion();
-} else {
-return component.getSession().getInstanceUrl() + "/cometd/" + 
component.getConfig().getApiVersion();
+// In version 36.0 replay is only enabled on a separate endpoint
+if (Double.valueOf(component.getConfig().getApiVersion()) == 36.0) {
+boolean replayOptionsPresent = 
component.getConfig().getDefaultReplayId() != null
+|| 
!component.getConfig().getInitialReplayIdMap().isEmpty();
+if (replayOptionsPresent) {
+return component.getSession().getInstanceUrl() + 
"/cometd/replay/"
++ component.getConfig().getApiVersion();
+}
 }
+return