camel git commit: Upgrade Spring Boot

2017-04-20 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 2964c72b7 -> bf6a98529


Upgrade Spring Boot


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

Branch: refs/heads/camel-2.18.x
Commit: bf6a98529af2d43ff85fefb936714c923ed58d03
Parents: 2964c72
Author: Claus Ibsen 
Authored: Thu Apr 20 17:25:56 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Apr 20 17:25:56 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/bf6a9852/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5beab1d..e84f410 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -543,7 +543,7 @@
 1.5.0.0_1
 3.0.7.RELEASE
 3.0.7.RELEASE_1
-1.4.5.RELEASE
+1.4.6.RELEASE
 1.2.0
 1.6.5.RELEASE
 1.7.5.RELEASE

[3/3] camel git commit: Fixed CS. This closes #1646. This closes #1645

2017-04-20 Thread davsclaus 
Fixed CS. This closes #1646. This closes #1645


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

Branch: refs/heads/master
Commit: 0ab557c0ca3b830b913e991c3b5683e52bb85655
Parents: a3ecc21
Author: Claus Ibsen 
Authored: Thu Apr 20 17:09:51 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Apr 20 17:09:51 2017 +0200

--
 .../catalog/maven/ConnectorArtifactHelper.java  |  8 ++--
 .../maven/DefaultMavenArtifactProvider.java | 46 ++--
 2 files changed, 27 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0ab557c0/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
index 454b639..b233e95 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
@@ -38,15 +38,15 @@ public final class ConnectorArtifactHelper {
 return answer;
 }
 
-   private static String loadJsonSchema(ClassLoader classLoader, String 
jsonSchemaPath) {
-   try (InputStream is = 
classLoader.getResourceAsStream(jsonSchemaPath)) {
+private static String loadJsonSchema(ClassLoader classLoader, String 
jsonSchemaPath) {
+try (InputStream is = classLoader.getResourceAsStream(jsonSchemaPath)) 
{
 if (is != null) {
 return loadText(is);
 }
 } catch (Throwable e) {
 LOG.warn("Error loading " + jsonSchemaPath + " file", e);
 }
-   return null;
-   }
+return null;
+}
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/0ab557c0/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
index 1a7f3cb..9361195 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
@@ -73,27 +73,27 @@ public class DefaultMavenArtifactProvider implements 
MavenArtifactProvider {
 
 Grape.setEnableAutoDownload(true);
 
-try (final GroovyClassLoader classLoader = new 
GroovyClassLoader()){
-
-   Map param = new HashMap<>();
-   param.put("classLoader", classLoader);
-   param.put("group", groupId);
-   param.put("module", artifactId);
-   param.put("version", version);
-   // no need to download transitive dependencies as we only need 
to check the component or connector itself
-   param.put("validate", false);
-   param.put("transitive", false);
-
-   LOG.debug("Downloading {}:{}:{}", groupId, artifactId, version);
-   Grape.grab(param);
-
-   // the classloader can load content from the downloaded JAR
-   if (camelCatalog != null) {
-   scanCamelComponents(camelCatalog, classLoader, names);
-   }
-   if (camelConnectorCatalog != null) {
-   scanCamelConnectors(camelConnectorCatalog, classLoader, 
groupId, artifactId, version, names);
-   }
+try (final GroovyClassLoader classLoader = new 
GroovyClassLoader()) {
+
+Map param = new HashMap<>();
+param.put("classLoader", classLoader);
+param.put("group", groupId);
+param.put("module", artifactId);
+param.put("version", version);
+// no need to download transitive dependencies as we only need 
to check the component or connector itself
+param.put("validate", false);
+param.put("transitive", false);
+
+LOG.debug("Downloading {}:{}:{}", groupId, artifactId, 
version);
+

[1/3] camel git commit: Factorize Json schema loading code

2017-04-20 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 6eb2abe89 -> 0ab557c0c


Factorize Json schema loading code

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

Branch: refs/heads/master
Commit: a3ecc2145ac7a5dc12c63c7d9044cb47b71a1ddc
Parents: 39376f5
Author: Aurelien Pupier 
Authored: Thu Apr 20 14:18:54 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Apr 20 17:07:31 2017 +0200

--
 .../catalog/maven/ConnectorArtifactHelper.java  | 39 ++--
 1 file changed, 11 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a3ecc214/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
index 475eb91..454b639 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ConnectorArtifactHelper.java
@@ -32,38 +32,21 @@ public final class ConnectorArtifactHelper {
 
 public static String[] loadJSonSchemas(ClassLoader classLoader) {
 String[] answer = new String[3];
+answer[0] = loadJsonSchema(classLoader, "camel-connector.json");
+answer[1] = loadJsonSchema(classLoader, "camel-connector-schema.json");
+answer[2] = loadJsonSchema(classLoader, "camel-component-schema.json");
+return answer;
+}
 
-String path = "camel-connector.json";
-try {
-InputStream is = classLoader.getResourceAsStream(path);
-if (is != null) {
-answer[0] = loadText(is);
-}
-} catch (Throwable e) {
-LOG.warn("Error loading " + path + " file", e);
-}
-
-path = "camel-connector-schema.json";
-try {
-InputStream is = classLoader.getResourceAsStream(path);
-if (is != null) {
-answer[1] = loadText(is);
-}
-} catch (Throwable e) {
-LOG.warn("Error loading " + path + " file", e);
-}
-
-path = "camel-component-schema.json";
-try {
-InputStream is = classLoader.getResourceAsStream(path);
+   private static String loadJsonSchema(ClassLoader classLoader, String 
jsonSchemaPath) {
+   try (InputStream is = 
classLoader.getResourceAsStream(jsonSchemaPath)) {
 if (is != null) {
-answer[2] = loadText(is);
+return loadText(is);
 }
 } catch (Throwable e) {
-LOG.warn("Error loading " + path + " file", e);
+LOG.warn("Error loading " + jsonSchemaPath + " file", e);
 }
-
-return answer;
-}
+   return null;
+   }
 
 }

camel git commit: Provide missing @Override annotation

2017-04-20 Thread zregvart 
Repository: camel
Updated Branches:
  refs/heads/master b8efc2bb3 -> 6eb2abe89


Provide missing @Override annotation

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

Branch: refs/heads/master
Commit: 6eb2abe89e1f40ce5d3ecd55aa4d7050782e6c62
Parents: b8efc2b
Author: Aurelien Pupier 
Authored: Thu Apr 20 13:59:13 2017 +0200
Committer: Zoran Regvart 
Committed: Thu Apr 20 14:22:33 2017 +0200

--
 .../apache/camel/catalog/maven/DefaultMavenArtifactProvider.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6eb2abe8/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
index 054041b..99d0a47 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
@@ -52,6 +52,7 @@ public class DefaultMavenArtifactProvider implements 
MavenArtifactProvider {
 this.cacheDirectory = directory;
 }
 
+@Override
 public void addMavenRepository(String name, String url) {
 Map repo = new HashMap<>();
 repo.put("name", name);

camel git commit: CAMEL-11175 REST DSL Swagger generator default ...

2017-04-20 Thread zregvart 
Repository: camel
Updated Branches:
  refs/heads/master bee43cefb -> b8efc2bb3


CAMEL-11175 REST DSL Swagger generator default ...

...generated class/package names

This refines default class name and package name generation.


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

Branch: refs/heads/master
Commit: b8efc2bb3c26f1a7ab3f873f80ce9e746c65d0aa
Parents: bee43ce
Author: Zoran Regvart 
Authored: Thu Apr 20 13:26:54 2017 +0200
Committer: Zoran Regvart 
Committed: Thu Apr 20 13:26:54 2017 +0200

--
 .../swagger/RestDslSourceCodeGenerator.java |  25 +++--
 .../swagger/RestDslSourceCodeGeneratorTest.java | 106 +++
 2 files changed, 125 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b8efc2bb/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java
--
diff --git 
a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java
 
b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java
index 252bc40..62c8f70 100644
--- 
a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java
+++ 
b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java
@@ -38,11 +38,11 @@ import org.apache.camel.util.ObjectHelper;
 import static org.apache.camel.util.StringHelper.notEmpty;
 
 public abstract class RestDslSourceCodeGenerator extends 
RestDslGenerator {
-private static final String DEFAULT_CLASS_NAME = "RestDslRoute";
+static final String DEFAULT_CLASS_NAME = "RestDslRoute";
 
-private static final String DEFAULT_INDENT = "";
+static final String DEFAULT_PACKAGE_NAME = "rest.dsl.generated";
 
-private static final String DEFAULT_PACKAGE_NAME = "rest.dsl.generated";
+private static final String DEFAULT_INDENT = "";
 
 private Function classNameGenerator = 
RestDslSourceCodeGenerator::generateClassName;
 
@@ -147,8 +147,15 @@ public abstract class RestDslSourceCodeGenerator 
extends RestDslGenerator c < 
'z').boxed()
+.collect(Collector.of(StringBuilder::new, 
StringBuilder::appendCodePoint, StringBuilder::append,
+StringBuilder::toString));
+
+if (className.isEmpty() || 
!Character.isJavaIdentifierStart(className.charAt(0))) {
+return DEFAULT_CLASS_NAME;
+}
+
+return className;
 }
 
 static String generatePackageName(final Swagger swagger) {
@@ -157,7 +164,13 @@ public abstract class RestDslSourceCodeGenerator 
extends RestDslGenerator= 0; i--) {
 packageName.append(parts[i]);

http://git-wip-us.apache.org/repos/asf/camel/blob/b8efc2bb/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslSourceCodeGeneratorTest.java
--
diff --git 
a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslSourceCodeGeneratorTest.java
 
b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslSourceCodeGeneratorTest.java
new file mode 100644
index 000..15e716c
--- /dev/null
+++ 
b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDslSourceCodeGeneratorTest.java
@@ -0,0 +1,106 @@
+/**
+ * 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.generator.swagger;
+
+import io.swagger.models.Info;
+import io.swagger.models.Swagger;
+
+import org.junit.Test;
+
+import static

camel git commit: CAMEL-11166 make camel-package-maven-plugin wor...

2017-04-20 Thread zregvart 
Repository: camel
Updated Branches:
  refs/heads/master 2a67ab7e4 -> bee43cefb


CAMEL-11166 make camel-package-maven-plugin wor...

...k on Java 9

This changes the dependency to
`javax.annotation:javax.annotation-api:1.3` from
`javax.xml.ws:jaxws-api:2.2.11` to have a smaller footprint, and places
the dependency on the plugin instead of in the parent POM.


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

Branch: refs/heads/master
Commit: bee43cefb4255cc4d580bd270ecce2368d6d71f7
Parents: 2a67ab7
Author: Zoran Regvart 
Authored: Thu Apr 20 11:04:01 2017 +0200
Committer: Zoran Regvart 
Committed: Thu Apr 20 12:35:24 2017 +0200

--
 parent/pom.xml   |  7 ---
 tooling/maven/camel-package-maven-plugin/pom.xml | 17 +
 2 files changed, 17 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bee43cef/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 9b9013b..a8fef1c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5241,13 +5241,6 @@
 
   org.apache.camel
   camel-package-maven-plugin
-  
-
-  javax.xml.ws
-  jaxws-api
-  2.2.11
-
-  
 
 
   org.apache.maven.plugins

http://git-wip-us.apache.org/repos/asf/camel/blob/bee43cef/tooling/maven/camel-package-maven-plugin/pom.xml
--
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml 
b/tooling/maven/camel-package-maven-plugin/pom.xml
index 24bbc02..6dc7d14 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -164,4 +164,21 @@
   spi-annotations
 
   
+
+  
+
+  jigsaw
+  
+[1.9,)
+  
+  
+
+  javax.annotation
+  javax.annotation-api
+  1.3
+
+  
+
+  
+

camel git commit: CAMEL-11173 Integration tests for camel-restdsl...

2017-04-20 Thread zregvart 
Repository: camel
Updated Branches:
  refs/heads/master 094348372 -> 2a67ab7e4


CAMEL-11173 Integration tests for camel-restdsl...

...-swagger-plugin fail on JDK 9

This adds the needed dependencies and sets the source and target Java
version for the integration tests to Java 8. The Groovy dependency
needed to be upgraded because of GROOVY-7587[1].

[1] https://issues.apache.org/jira/browse/GROOVY-7587


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

Branch: refs/heads/master
Commit: 2a67ab7e414d7ab3c1dc70147ebfd3b4ebea812a
Parents: 0943483
Author: Zoran Regvart 
Authored: Thu Apr 20 10:40:45 2017 +0200
Committer: Zoran Regvart 
Committed: Thu Apr 20 10:41:07 2017 +0200

--
 .../maven/camel-restdsl-swagger-plugin/pom.xml  | 25 +++-
 .../src/it/customized/pom.xml   |  4 +++-
 .../src/it/simple/pom.xml   |  4 +++-
 3 files changed, 30 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2a67ab7e/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
--
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml 
b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index 3034769..743f0e5 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -58,6 +58,13 @@
 
   
 
+
+  
+org.codehaus.groovy
+groovy-all
+${groovy-version}
+  
+
   
 
   
@@ -95,4 +102,20 @@
 
   
 
-
\ No newline at end of file
+  
+
+  jigsaw
+  
+[1.9,)
+  
+  
+
+  javax.annotation
+  javax.annotation-api
+  1.3
+
+  
+
+  
+
+

http://git-wip-us.apache.org/repos/asf/camel/blob/2a67ab7e/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml
--
diff --git 
a/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml 
b/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml
index 3065d55..3a71aec 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml
@@ -27,6 +27,8 @@
 
   
 UTF-8
+1.8
+1.8
   
 
   
@@ -63,4 +65,4 @@
   @project.version@
 
   
-
\ No newline at end of file
+

http://git-wip-us.apache.org/repos/asf/camel/blob/2a67ab7e/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple/pom.xml
--
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple/pom.xml 
b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple/pom.xml
index 6e04e2b..2d3e3f1 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple/pom.xml
@@ -27,6 +27,8 @@
 
   
 UTF-8
+1.8
+1.8
   
 
   
@@ -46,4 +48,4 @@
   
 
   
-
\ No newline at end of file
+

[1/2] camel git commit: CAMEL-11170: Service Call : add a spi for component to provide a custom expression to build the camel uri

2017-04-20 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master 548dcea76 -> 094348372


http://git-wip-us.apache.org/repos/asf/camel/blob/09434837/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/cloud/UndertowServiceCallRouteTest.java
--
diff --git 
a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/cloud/UndertowServiceCallRouteTest.java
 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/cloud/UndertowServiceCallRouteTest.java
new file mode 100644
index 000..bab5b55
--- /dev/null
+++ 
b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/cloud/UndertowServiceCallRouteTest.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.undertow.cloud;
+
+import org.apache.camel.ResolveEndpointFailedException;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UndertowServiceCallRouteTest extends CamelTestSupport {
+
+@Test
+public void testCustomCall() throws Exception {
+Assert.assertEquals("8081", template.requestBody("direct:custom", 
"hello", String.class));
+Assert.assertEquals("8082", template.requestBody("direct:custom", 
"hello", String.class));
+}
+
+@Test
+public void testDefaultSchema() throws Exception {
+try {
+Assert.assertEquals("8081", template.requestBody("direct:default", 
"hello", String.class));
+} catch (RuntimeCamelException e) {
+assertTrue(e.getCause() instanceof ResolveEndpointFailedException);
+}
+}
+
+@Override
+protected RoutesBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from("direct:custom")
+.serviceCall()
+.name("myService")
+.component("undertow")
+.staticServiceDiscovery()
+.server("myService@localhost:8081")
+.server("myService@localhost:8082")
+.endParent();
+
+from("direct:default")
+.serviceCall()
+.name("myService")
+.staticServiceDiscovery()
+.server("myService@localhost:8081")
+.server("myService@localhost:8082")
+.endParent();
+
+from("undertow:http://localhost:8081;)
+.transform().constant("8081");
+from("undertow:http://localhost:8082;)
+.transform().constant("8082");
+}
+};
+}
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/09434837/examples/camel-example-spring-boot-servicecall/README.adoc
--
diff --git a/examples/camel-example-spring-boot-servicecall/README.adoc 
b/examples/camel-example-spring-boot-servicecall/README.adoc
index e02ce31..5c2458a 100644
--- a/examples/camel-example-spring-boot-servicecall/README.adoc
+++ b/examples/camel-example-spring-boot-servicecall/README.adoc
@@ -31,7 +31,7 @@ Using multiple shells:
  - start consul:
 
   $ cd services
-  $ src/main/bash/consul-run-linx.sh   (for linux)
+  $ src/main/bash/consul-run-linux.sh  (for linux)
   $ src/main/bash/consul-run-osx.sh(for mac osx)
 
  - start the service-1 service group:

http://git-wip-us.apache.org/repos/asf/camel/blob/09434837/examples/camel-example-spring-boot-servicecall/consumer/src/main/java/org/apache/camel/example/ServiceCallConsumerAutoConfiguration.java
--
diff --git

[2/2] camel git commit: CAMEL-11170: Service Call : add a spi for component to provide a custom expression to build the camel uri

2017-04-20 Thread lburgazzoli 
CAMEL-11170: Service Call : add a spi for component to provide a custom 
expression to build the camel uri


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

Branch: refs/heads/master
Commit: 094348372f674f492476e7305527822c65babd94
Parents: 548dcea
Author: lburgazzoli 
Authored: Wed Apr 19 23:01:19 2017 +0200
Committer: lburgazzoli 
Committed: Thu Apr 20 10:03:57 2017 +0200

--
 .../cloud/DefaultServiceCallExpression.java | 49 +++--
 .../ServiceCallConfigurationDefinition.java |  2 +-
 .../camel/model/cloud/ServiceCallConstants.java | 30 
 .../model/cloud/ServiceCallDefinition.java  | 70 ++-
 .../cloud/ServiceCallDefinitionConstants.java   | 31 +
 .../ServiceCallExpressionConfiguration.java |  6 +-
 .../ServiceCallServiceChooserConfiguration.java |  6 +-
 ...erviceCallServiceDiscoveryConfiguration.java |  6 +-
 .../ServiceCallServiceFilterConfiguration.java  |  6 +-
 ...iceCallServiceLoadBalancerConfiguration.java |  6 +-
 .../cloud/ServiceCallConfigurationTest.java |  3 +-
 components/camel-consul/pom.xml |  5 --
 .../ConsulDefaultServiceCallRouteTest.java  |  1 +
 .../cloud/ConsulRibbonServiceCallRouteTest.java |  1 +
 .../SpringConsulDefaultServiceCallRouteTest.xml |  4 +-
 ...ringConsulExpressionServiceCallRouteTest.xml |  6 +-
 .../SpringConsulRibbonServiceCallRouteTest.xml  |  4 +-
 .../http4/cloud/Http4ServiceExpression.java | 32 +
 .../cloud/Http4ServiceExpressionFactory.java| 28 
 .../apache/camel/cloud/http4-service-expression | 17 +
 .../camel/cloud/http4s-service-expression   | 17 +
 .../jetty/cloud/JettyServiceExpression.java | 51 ++
 .../cloud/JettyServiceExpressionFactory.java| 28 
 .../apache/camel/cloud/jetty-service-expression | 17 +
 .../jetty/cloud/JettyServiceCallRouteTest.java  | 73 
 .../http/cloud/Netty4HttpServiceExpression.java | 51 ++
 .../Netty4HttpServiceExpressionFactory.java | 28 
 .../camel/cloud/netty4-http-service-expression  | 17 +
 .../cloud/Netty4HttpServiceCallRouteTest.java   | 73 
 components/camel-ribbon/pom.xml |  5 --
 .../RibbonServiceCallRegistryRouteTest.java |  5 +-
 .../cloud/RibbonServiceCallRouteDslTest.java| 13 ++--
 .../cloud/RibbonServiceCallRouteTest.java   |  1 +
 .../cloud/RibbonServiceCallUpdateRouteTest.java |  1 +
 .../SpringBeanRibbonServiceCallRouteTest.xml|  2 +-
 ...gDslRibbonPropertiesServiceCallRouteTest.xml |  2 +-
 .../SpringDslRibbonServiceCallRouteTest.xml |  2 +-
 .../CamelCloudConfigurationProperties.java  |  4 +-
 ...rviceCallConfigurationAutoConfiguration.java |  6 +-
 .../CamelCloudServiceCallConfigurationTest.java |  2 +-
 .../boot/cloud/CamelCloudServiceCallTest.java   |  5 +-
 .../cloud/UndertowServiceExpression.java| 51 ++
 .../cloud/UndertowServiceExpressionFactory.java | 28 
 .../camel/cloud/undertow-service-expression | 17 +
 .../cloud/UndertowServiceCallRouteTest.java | 73 
 .../README.adoc |  2 +-
 .../ServiceCallConsumerAutoConfiguration.java   |  4 +-
 .../src/main/resources/application.properties   |  3 +
 .../camel/example/ConsumerApplication.java  |  4 +-
 .../src/main/resources/application.properties   |  3 +
 50 files changed, 771 insertions(+), 130 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/09434837/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java
 
b/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java
index f16e59b..ff3bd34 100644
--- 
a/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java
+++ 
b/camel-core/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallExpression.java
@@ -48,27 +48,7 @@ public class DefaultServiceCallExpression extends 
ServiceCallExpressionSupport {
 // build basic uri if none provided
 String answer = uri;
 if (answer == null) {
-if (scheme == null) {
-// use http/https by default if no scheme or port have been 
configured
-if (port == null) {
-scheme = "http4";
-} else if (port == 443) {
-scheme = "https4";
-} else

[1/2] camel git commit: Regen

2017-04-20 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master d6088eb51 -> 548dcea76


Regen


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

Branch: refs/heads/master
Commit: 548dcea76914146f85ac15c22ff70624df73194c
Parents: 95f1cf2
Author: Claus Ibsen 
Authored: Thu Apr 20 09:45:28 2017 +0200
Committer: Claus Ibsen 
Committed: Thu Apr 20 09:47:44 2017 +0200

--
 .../camel-ribbon-starter/pom.xml| 10 +++---
 .../camel-spring-boot-dependencies/pom.xml  | 38 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/548dcea7/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml
--
diff --git 
a/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml 
b/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml
index 6295637..6fb5adf 100644
--- a/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml
@@ -45,6 +45,11 @@
   
   
 
+
+  org.apache.camel
+  camel-jetty
+  test
+
 
 
   org.apache.camel
@@ -55,10 +60,5 @@
   camel-spring-boot-starter
 
 
-
-  org.apache.camel
-  camel-jetty
-  test
-
   
 

http://git-wip-us.apache.org/repos/asf/camel/blob/548dcea7/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
--
diff --git 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 51e9b1f..ffca907 100644
--- 
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ 
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -2795,97 +2795,97 @@
   
 org.apache.cxf.services.sts
 cxf-services-sts-core
-3.1.10
+3.1.11
   
   
 org.apache.cxf.services.ws-discovery
 cxf-services-ws-discovery-api
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-core
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-bindings-soap
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-bindings-xml
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-databinding-jaxb
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-frontend-jaxrs
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-frontend-jaxws
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-frontend-simple
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-management
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-transports-http
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-transports-jms
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-transports-local
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-ws-addr
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-ws-mex
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-ws-policy
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-ws-rm
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-ws-security
-3.1.10
+3.1.11
   
   
 org.apache.cxf
 cxf-rt-wsdl
-3.1.10
+3.1.11
   
   
 org.apache.ftpserver

[2/2] camel git commit: CAMEL-7519 - new option quotingEscaped added for marshalling/unmarshalling with escape char and fix some typo

2017-04-20 Thread davsclaus 
CAMEL-7519 - new option quotingEscaped added for marshalling/unmarshalling with 
escape char and fix some typo


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

Branch: refs/heads/master
Commit: 95f1cf2a4ccc2f5a5e1ba2baa593adae6409bb09
Parents: d6088eb
Author: onders86 
Authored: Wed Apr 19 14:34:05 2017 +0300
Committer: Claus Ibsen 
Committed: Thu Apr 20 09:47:44 2017 +0200

--
 .../camel/dataformat/bindy/BindyCsvFactory.java |  22 ++-
 .../dataformat/bindy/annotation/CsvRecord.java  |   5 +
 ...ecordFieldStartingWithSeperatorCharTest.java |   2 +-
 ...ContainingMultiQuoteCharEscapeFalseTest.java | 196 ++
 ...vContainingMultiQuoteCharEscapeTrueTest.java | 198 +++
 5 files changed, 418 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/95f1cf2a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
--
diff --git 
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
 
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
index a055855..cb5dd3a 100755
--- 
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
+++ 
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
@@ -68,6 +68,7 @@ public class BindyCsvFactory extends BindyAbstractFactory 
implements BindyFactor
 private boolean quoting;
 private boolean autospanLine;
 private boolean allowEmptyStream;
+private boolean quotingEscaped;
 
 public BindyCsvFactory(Class type) throws Exception {
 super(type);
@@ -207,7 +208,11 @@ public class BindyCsvFactory extends BindyAbstractFactory 
implements BindyFactor
 
 if (!data.equals("")) {
 try {
-value = format.parse(data);
+if (quoting && quote != null && (data.contains("\\" + 
quote) || data.contains(quote)) && quotingEscaped) {
+value = format.parse(data.replaceAll("" + quote,  
"\\" + quote));
+} else {
+value = format.parse(data);
+}
 } catch (FormatException ie) {
 throw new IllegalArgumentException(ie.getMessage() + ", 
position: " + pos + ", line: " + line, ie);
 } catch (Exception e) {
@@ -311,7 +316,12 @@ public class BindyCsvFactory extends BindyAbstractFactory 
implements BindyFactor
 if (quoting && quote != null) {
 buffer.append(quote);
 }
-buffer.append(res);
+// CAMEL-7519 - improvoment escape the token itself by 
prepending escape char
+if (quoting && quote != null && (res.contains("\\" + 
quote) || res.contains(quote))  && quotingEscaped) {
+buffer.append(res.replaceAll("\\" + quote, "" 
+ quote));
+} else {
+buffer.append(res);
+}
 if (quoting && quote != null) {
 buffer.append(quote);
 }
@@ -577,9 +587,13 @@ public class BindyCsvFactory extends BindyAbstractFactory 
implements BindyFactor
 autospanLine = record.autospanLine();
 LOG.debug("Autospan line in last record: {}", 
autospanLine);
 
-// Get skipFirstLine parameter
+// Get allowEmptyStream parameter
 allowEmptyStream = record.allowEmptyStream();
-LOG.debug("Allo empty stream parameter of the CSV: {}" + 
allowEmptyStream);
+LOG.debug("Allow empty stream parameter of the CSV: {}" + 
allowEmptyStream);
+
+// Get quotingEscaped parameter
+quotingEscaped = record.quotingEscaped();
+LOG.debug("Escape quote character flag of the CSV: {}" + 
quotingEscaped);
 }
 
 if (section != null) {

http://git-wip-us.apache.org/repos/asf/camel/blob/95f1cf2a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/CsvRecord.java
--
diff --git

camel git commit: CAMEL-11171 - camel-zookeeper-master, fix to support RAW() function

2017-04-20 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master 3e7b1cfdd -> d6088eb51


CAMEL-11171 - camel-zookeeper-master, fix to support RAW() function


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

Branch: refs/heads/master
Commit: d6088eb5175e4c66c7c8a467694a8d60ff8d3eb5
Parents: 3e7b1cf
Author: Paolo Antinori 
Authored: Wed Apr 19 17:56:40 2017 +0200
Committer: lburgazzoli 
Committed: Thu Apr 20 09:44:02 2017 +0200

--
 components/camel-zookeeper-master/pom.xml  |  5 +
 .../component/zookeepermaster/MasterComponent.java |  3 +--
 .../component/zookeepermaster/MasterEndpointTest.java  | 13 +
 3 files changed, 19 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d6088eb5/components/camel-zookeeper-master/pom.xml
--
diff --git a/components/camel-zookeeper-master/pom.xml 
b/components/camel-zookeeper-master/pom.xml
index a1e89a3..aa63895 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -122,6 +122,11 @@
   camel-quartz2
   test
 
+
+  org.apache.camel
+  camel-ftp
+  test
+
 
 
   org.apache.camel

http://git-wip-us.apache.org/repos/asf/camel/blob/d6088eb5/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/MasterComponent.java
--
diff --git 
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/MasterComponent.java
 
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/MasterComponent.java
index 59749ae..b89dc48 100644
--- 
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/MasterComponent.java
+++ 
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/MasterComponent.java
@@ -21,7 +21,6 @@ import java.util.Map;
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.URISupport;
 
 /**
  * The zookeeper-master camel component ensures that only a single endpoint in 
a cluster is active at any
@@ -72,7 +71,7 @@ public class MasterComponent extends 
ZookeeperComponentSupport {
 String childUri = remaining.substring(idx + 1);
 // we need to apply the params here
 if (params != null && params.size() > 0) {
-childUri = childUri + "?" + URISupport.createQueryString(params);
+childUri = childUri + "?" + uri.substring(uri.indexOf('?') + 1);
 }
 MasterEndpoint answer = new MasterEndpoint(uri, this, name, childUri);
 return answer;

http://git-wip-us.apache.org/repos/asf/camel/blob/d6088eb5/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
--
diff --git 
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
 
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
index 03051b7..b1d88e5 100644
--- 
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
+++ 
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointTest.java
@@ -23,7 +23,9 @@ import org.apache.camel.EndpointInject;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.Route;
+import org.apache.camel.component.file.remote.SftpEndpoint;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.util.ServiceHelper;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -97,4 +99,15 @@ public class MasterEndpointTest extends 
AbstractJUnit4SpringContextTests {
 
 MockEndpoint.assertIsSatisfied(camelContext);
 }
+
+@Test
+public void testRawPropertiesOnChild() throws Exception {
+final String uri = 
"zookeeper-master://name:sftp://myhost/inbox?password=RAW(_BEFORE_AMPERSAND_&_AFTER_AMPERSAND_)=jdoe";
+
+DefaultCamelContext ctx = new DefaultCamelContext();
+MasterEndpoint master = (MasterEndpoint) ctx.getEndpoint(uri);
+SftpEndpoint sftp = (SftpEndpoint) master.getEndpoint();
+
+