[1/6] camel git commit: CAMEL-10118: Overriding module logger in main class

2016-07-04 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master d17061ad4 -> f7f401933


CAMEL-10118: Overriding module logger in main class


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

Branch: refs/heads/master
Commit: 8b4f772e9a86d3a97a036e2f55e3b825b11a23d2
Parents: d17061a
Author: Nicola Ferraro 
Authored: Mon Jul 4 16:18:59 2016 +0200
Committer: Nicola Ferraro 
Committed: Mon Jul 4 16:18:59 2016 +0200

--
 .../itest/springboot/ITestApplication.java  | 32 
 .../springboot/command/UnitTestCommand.java | 29 --
 2 files changed, 32 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8b4f772e/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java
 
b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java
index 47aca42..036510b 100644
--- 
a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java
+++ 
b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestApplication.java
@@ -16,6 +16,14 @@
  */
 package org.apache.camel.itest.springboot;
 
+import java.net.URL;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.util.StatusPrinter;
+
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -29,6 +37,8 @@ import org.springframework.scheduling.annotation.EnableAsync;
 public class ITestApplication {
 
 public static void main(String[] args) throws Exception {
+overrideLoggingConfig();
+
 SpringApplication.run(ITestApplication.class, args);
 }
 
@@ -38,4 +48,26 @@ public class ITestApplication {
 return "spring-boot-main";
 }
 
+private static void overrideLoggingConfig() {
+
+URL logbackFile = 
ITestApplication.class.getResource("/spring-logback.xml");
+if (logbackFile != null) {
+
+LoggerContext context = (LoggerContext) 
LoggerFactory.getILoggerFactory();
+
+try {
+JoranConfigurator configurator = new JoranConfigurator();
+configurator.setContext(context);
+// Call context.reset() to clear any previous configuration, 
e.g. default
+// configuration. For multi-step configuration, omit calling 
context.reset().
+context.reset();
+configurator.doConfigure(logbackFile);
+} catch (JoranException je) {
+// StatusPrinter will handle this
+}
+StatusPrinter.printInCaseOfErrorsOrWarnings(context);
+}
+
+}
+
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/8b4f772e/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java
 
b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java
index b7bf02e..9d917b6 100644
--- 
a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java
+++ 
b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/command/UnitTestCommand.java
@@ -29,11 +29,6 @@ import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
 import javax.management.ObjectName;
 
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.joran.JoranConfigurator;
-import ch.qos.logback.core.joran.spi.JoranException;
-import ch.qos.logback.core.util.StatusPrinter;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.itest.springboot.Command;
 import org.apache.camel.itest.springboot.ITestConfig;
@@ -65,8 +60,6 @@ public class UnitTestCommand extends AbstractTestCommand 
implements Command {
 @Override
 public UnitTestResult executeTest(final ITestConfig config, String 
component) throws Exception {
 
-overrideLoggingConfig();
-
 logger.info("Spring-Boot

[6/6] camel git commit: CAMEL-10118: Small fix and source check

2016-07-04 Thread davsclaus 
CAMEL-10118: Small fix and source check


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

Branch: refs/heads/master
Commit: f7f401933bfc5e2e1351b210855f4a7197964fa0
Parents: 6694368
Author: Nicola Ferraro 
Authored: Mon Jul 4 18:22:13 2016 +0200
Committer: Nicola Ferraro 
Committed: Mon Jul 4 18:22:13 2016 +0200

--
 .../camel/itest/springboot/CamelZipkinStarterTest.java|  1 +
 .../camel/itest/springboot/util/ArquillianPackager.java   | 10 --
 2 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f7f40193/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZipkinStarterTest.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZipkinStarterTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZipkinStarterTest.java
index 8d32563..5a73d25 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZipkinStarterTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelZipkinStarterTest.java
@@ -35,6 +35,7 @@ public class CamelZipkinStarterTest extends 
AbstractSpringBootTestSupport {
 public static ITestConfig createTestConfig() {
 return new ITestConfigBuilder()
 .module(inferModuleName(CamelZipkinStarterTest.class))
+.unitTestExpectedNumber(0)
 .build();
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/f7f40193/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
index 985427b..4cb453f3 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
@@ -281,8 +281,14 @@ public final class ArquillianPackager {
 
 private static boolean validTestDependency(ITestConfig config, 
MavenCoordinate coordinate) {
 
-Pattern[] patterns = new Pattern[]{Pattern.compile("^log4j$"), 
Pattern.compile("^slf4j-log4j12$"), Pattern.compile("^slf4j-simple$"), 
Pattern.compile("^slf4j-jdk14$"), Pattern.compile
-("^logback-classic$"), Pattern.compile("^logback-core$")};
+Pattern[] patterns = new Pattern[]{
+Pattern.compile("^log4j$"),
+Pattern.compile("^slf4j-log4j12$"),
+Pattern.compile("^slf4j-simple$"),
+Pattern.compile("^slf4j-jdk14$"),
+Pattern.compile("^logback-classic$"),
+Pattern.compile("^logback-core$")
+};
 
 boolean valid = true;
 for (Pattern p : patterns) {

[4/6] camel git commit: CAMEL-10118: Excluded Mongodb tests

2016-07-04 Thread davsclaus 
CAMEL-10118: Excluded Mongodb tests


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

Branch: refs/heads/master
Commit: 15fc68515e6a86bf91efdd018baf4eb56abadf37
Parents: c4d05f0
Author: Nicola Ferraro 
Authored: Mon Jul 4 17:07:12 2016 +0200
Committer: Nicola Ferraro 
Committed: Mon Jul 4 17:07:12 2016 +0200

--
 tests/camel-itest-spring-boot/pom.xml | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/15fc6851/tests/camel-itest-spring-boot/pom.xml
--
diff --git a/tests/camel-itest-spring-boot/pom.xml 
b/tests/camel-itest-spring-boot/pom.xml
index a2836e4..eccb9dc 100644
--- a/tests/camel-itest-spring-boot/pom.xml
+++ b/tests/camel-itest-spring-boot/pom.xml
@@ -134,8 +134,12 @@
 
15000
 0
 
-
+
 
org.apache.camel.itest.springboot.CamelXmlbeansTest
+
+
+
org.apache.camel.itest.springboot.CamelMongodbTest
+
org.apache.camel.itest.springboot.CamelMongodbGridfsTest
 
 
 **/*Test.java

[2/6] camel git commit: CAMEL-10118: - Fixed log dependencies - Moved test configuration to surefire - Overriden logger in Optaplanner - Excluded Xmlbeans from test

2016-07-04 Thread davsclaus 
CAMEL-10118:
- Fixed log dependencies
- Moved test configuration to surefire
- Overriden logger in Optaplanner
- Excluded Xmlbeans from test


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

Branch: refs/heads/master
Commit: 44461c2ee428ddd72165c64f47e512ad40dca3c0
Parents: 8b4f772
Author: Nicola Ferraro 
Authored: Mon Jul 4 16:21:28 2016 +0200
Committer: Nicola Ferraro 
Committed: Mon Jul 4 16:21:28 2016 +0200

--
 tests/camel-itest-spring-boot/pom.xml   | 28 
 .../itest/springboot/ITestConfigBuilder.java| 22 +++
 .../itest/springboot/CamelOptaplannerTest.java  |  1 +
 .../springboot/util/ArquillianPackager.java | 16 +--
 .../test/resources/spring-boot-itest.properties |  9 ---
 5 files changed, 47 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/44461c2e/tests/camel-itest-spring-boot/pom.xml
--
diff --git a/tests/camel-itest-spring-boot/pom.xml 
b/tests/camel-itest-spring-boot/pom.xml
index 93bea2a..a2836e4 100644
--- a/tests/camel-itest-spring-boot/pom.xml
+++ b/tests/camel-itest-spring-boot/pom.xml
@@ -133,10 +133,38 @@
 false
 
15000
 0
+
+
+
org.apache.camel.itest.springboot.CamelXmlbeansTest
+
 
 **/*Test.java
 
 
+
+
+
+
+itest.springboot.unitTestEnabled
+false
+
+
+
itest.springboot.includeTestDependencies
+true
+
+
+
itest.springboot.mavenOfflineResolution
+false
+
+
+
+
 
 version_org.apache.camel:camel-core
 ${project.version}

http://git-wip-us.apache.org/repos/asf/camel/blob/44461c2e/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
 
b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
index 50ef8c6..5863fb1 100644
--- 
a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
+++ 
b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
@@ -16,11 +16,9 @@
  */
 package org.apache.camel.itest.springboot;
 
-import java.io.InputStream;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Properties;
 import java.util.TreeSet;
 
 /**
@@ -28,9 +26,7 @@ import java.util.TreeSet;
  */
 public class ITestConfigBuilder {
 
-private static final String PROPERTIES_FILE = 
"/spring-boot-itest.properties";
-
-private Properties properties;
+public static final String CONFIG_PREFIX = "itest.springboot.";
 
 private ITestConfig config;
 
@@ -150,7 +146,7 @@ public class ITestConfigBuilder {
 
 // Set the defaults
 if (config.getUnitTestEnabled() == null) {
-config.setUnitTestEnabled(booleanPropertyOr("unitTestEnabled", 
false));
+config.setUnitTestEnabled(booleanPropertyOr("unitTestEnabled", 
true));
 }
 
 if (config.getMavenGroup() == null) {
@@ -162,7 +158,7 @@ public class ITestConfigBuilder {
 }
 
 if (config.getMavenOfflineResolution() == null) {
-
config.setMavenOfflineResolution(booleanPropertyOr("mavenOfflineResolution", 
true));
+
config.setMavenOfflineResolution(booleanPropertyOr("mavenOfflineResolution", 
false));
 }
 
 if (config.getUnitTestInclusionPattern() == null) {
@@ -229,17 +225,7 @@ public class ITestConfigBuilder {
 }
 
 private String propertyOr(String name, String defaultVal) {
-if (properties == null) {
-properties = new Properties();
-try {
-InputStream in = 
getClass().getResourceAsStream(PROPERTIES_FILE);
-properties.load(in);
-

[3/6] camel git commit: CAMEL-10118: Changed resolutor to avoid throwing unnecessary errors when dedpendencies are not needed

2016-07-04 Thread davsclaus 
CAMEL-10118: Changed resolutor to avoid throwing unnecessary errors when 
dedpendencies are not needed


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

Branch: refs/heads/master
Commit: c4d05f08f28993274768ff6edc95930954bf484d
Parents: 44461c2
Author: Nicola Ferraro 
Authored: Mon Jul 4 16:26:32 2016 +0200
Committer: Nicola Ferraro 
Committed: Mon Jul 4 16:26:32 2016 +0200

--
 .../itest/springboot/util/DependencyResolver.java  | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c4d05f08/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
index 0f58d01..19fd33d 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
@@ -44,7 +44,6 @@ public final class DependencyResolver {
  *
  * @param groupArtifact the groupId and artifactId in the form 
"groupId:artifactId"
  * @return the maven canonical form of the artifact 
"groupId:artifactId:version"
- * @throws RuntimeException if the version cannot be resolved
  */
 public static String withVersion(String groupArtifact) {
 return withVersion(DEFAULT_PREFIX, groupArtifact);
@@ -57,7 +56,6 @@ public final class DependencyResolver {
  * @param prefix the prefix to use to lookup the property from surefire
  * @param groupArtifact the groupId and artifactId in the form 
"groupId:artifactId"
  * @return the maven canonical form of the artifact 
"groupId:artifactId:version"
- * @throws RuntimeException if the version cannot be resolved
  */
 public static String withVersion(String prefix, String groupArtifact) {
 String version = System.getProperty(prefix + groupArtifact);
@@ -68,13 +66,18 @@ public final class DependencyResolver {
 version = resolveSurefireProperty(prefix + groupArtifact);
 }
 } catch (Exception e) {
-throw new IllegalStateException("Error while retrieving version 
for artifact: " + groupArtifact, e);
+// cannot use logging libs
+System.out.println("RESOLVER ERROR>> Error while retrieving 
version for artifact: " + groupArtifact);
+e.printStackTrace();
+return groupArtifact;
 }
 
 if (version == null) {
-throw new IllegalStateException("Cannot determine version for 
maven artifact: " + groupArtifact);
+System.out.println("RESOLVER ERROR>> Cannot determine version for 
maven artifact: " + groupArtifact);
+return groupArtifact;
 } else if (!isResolved(version)) {
-throw new IllegalStateException("Cannot resolve version for maven 
artifact: " + groupArtifact + ". Missing property value: " + version);
+System.out.println("RESOLVER ERROR>> Cannot resolve version for 
maven artifact: " + groupArtifact + ". Missing property value: " + version);
+return groupArtifact;
 }
 
 return groupArtifact + ":" + version;

[5/6] camel git commit: CAMEL-10118: Fixed Sjms test dependencies

2016-07-04 Thread davsclaus 
CAMEL-10118: Fixed Sjms test dependencies


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

Branch: refs/heads/master
Commit: 6694368c2de67f74e9640c5fbbf2499612f17114
Parents: 15fc685
Author: Nicola Ferraro 
Authored: Mon Jul 4 18:04:44 2016 +0200
Committer: Nicola Ferraro 
Committed: Mon Jul 4 18:04:44 2016 +0200

--
 .../camel/itest/springboot/ITestConfigBuilder.java   |  3 +++
 .../apache/camel/itest/springboot/CamelSjmsTest.java |  8 ++--
 .../itest/springboot/util/ArquillianPackager.java| 15 ++-
 3 files changed, 19 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6694368c/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
 
b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
index 5863fb1..5f6caa9 100644
--- 
a/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
+++ 
b/tests/camel-itest-spring-boot/src/main/java/org/apache/camel/itest/springboot/ITestConfigBuilder.java
@@ -105,6 +105,9 @@ public class ITestConfigBuilder {
 }
 
 public ITestConfigBuilder exclusion(String exclusionCanonicalForm) {
+if (exclusionCanonicalForm.split(":").length != 2) {
+throw new IllegalArgumentException("Expected exclusion in the form 
groupId:artifactId, got: " + exclusionCanonicalForm);
+}
 if (config.getMavenExclusions() == null) {
 config.setMavenExclusions(new HashSet());
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/6694368c/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSjmsTest.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSjmsTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSjmsTest.java
index 26e6ec2..d5d8384 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSjmsTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSjmsTest.java
@@ -35,8 +35,11 @@ public class CamelSjmsTest extends 
AbstractSpringBootTestSupport {
 public static ITestConfig createTestConfig() {
 return new ITestConfigBuilder()
 .module(inferModuleName(CamelSjmsTest.class))
+.exclusion("com.atomikos:transactions-jta")
+//// to run unit tests
 //.dependency("com.atomikos:transactions-jdbc:3.9.3")
 //.dependency("com.atomikos:transactions-jms:3.9.3")
+//.dependency("com.atomikos:transactions-api:3.9.3")
 //.dependency("javax.transaction:javax.transaction-api:1.2")
 //.disableJmx("org.apache.activemq:*")
 .build();
@@ -45,8 +48,9 @@ public class CamelSjmsTest extends 
AbstractSpringBootTestSupport {
 @Test
 public void componentTests() throws Exception {
 //this.runComponentTest(config);
-this.runModuleUnitTestsIfEnabled(config);
-}
 
+// Unit tests can be enabled if required
+//this.runModuleUnitTestsIfEnabled(config);
+}
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/6694368c/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
index 102d42f..985427b 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/ArquillianPackager.java
@@ -164,7 +164,7 @@ public final class ArquillianPackager {
 
 for (MavenResolvedArtifact art : moduleArtifacts) {
 MavenCoordinate c = art.getCoordinate();
-if (!validTestDependency(c)) {
+if (!validTestDependency(config, c)) {
 continue;
 }
 MavenDependency

camel git commit: CAMEL-10120: Creating an InputStream from XMLStreamReader fails without default namespace

2016-07-04 Thread siano 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 1c2ef2104 -> e517bbd4a


CAMEL-10120: Creating an InputStream from XMLStreamReader fails without default 
namespace

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

Branch: refs/heads/camel-2.17.x
Commit: e517bbd4a33e878eba998b2c1ec5f28a77dd6c24
Parents: 1c2ef21
Author: Stephan Siano 
Authored: Mon Jul 4 15:10:45 2016 +0200
Committer: Stephan Siano 
Committed: Mon Jul 4 15:33:26 2016 +0200

--
 .../camel/converter/jaxp/XMLStreamReaderInputStream.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e517bbd4/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
index ab8de5c..9601742 100644
--- 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
+++ 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
@@ -103,9 +103,9 @@ class XMLStreamReaderInputStream extends InputStream {
 QName qname = reader.getName();
 writer.writeStartElement(qname.getPrefix(), 
qname.getLocalPart(), qname.getNamespaceURI());
 for (int i = 0; i < reader.getAttributeCount(); i++) {
-writer.writeAttribute(
-reader.getAttributePrefix(i), 
reader.getAttributeNamespace(i), reader.getAttributeLocalName(i),
-reader.getAttributeValue(i));
+String namespaceUri = 
reader.getAttributeNamespace(i);
+
writer.writeAttribute(reader.getAttributePrefix(i), namespaceUri == null ? "" : 
namespaceUri, reader.getAttributeLocalName(i),
+  reader.getAttributeValue(i));
 }
 for (int i = 0; i < reader.getNamespaceCount(); i++) {
 
writer.writeNamespace(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));

camel git commit: CAMEL-10120: Creating an InputStream from XMLStreamReader fails without default namespace

2016-07-04 Thread siano 
Repository: camel
Updated Branches:
  refs/heads/master 3485b6152 -> d17061ad4


CAMEL-10120: Creating an InputStream from XMLStreamReader fails without default 
namespace

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

Branch: refs/heads/master
Commit: d17061ad4519635f001f5b41801e596971d60b96
Parents: 3485b61
Author: Stephan Siano 
Authored: Mon Jul 4 15:10:45 2016 +0200
Committer: Stephan Siano 
Committed: Mon Jul 4 15:10:45 2016 +0200

--
 .../camel/converter/jaxp/XMLStreamReaderInputStream.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d17061ad/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
index ab8de5c..9601742 100644
--- 
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
+++ 
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java
@@ -103,9 +103,9 @@ class XMLStreamReaderInputStream extends InputStream {
 QName qname = reader.getName();
 writer.writeStartElement(qname.getPrefix(), 
qname.getLocalPart(), qname.getNamespaceURI());
 for (int i = 0; i < reader.getAttributeCount(); i++) {
-writer.writeAttribute(
-reader.getAttributePrefix(i), 
reader.getAttributeNamespace(i), reader.getAttributeLocalName(i),
-reader.getAttributeValue(i));
+String namespaceUri = 
reader.getAttributeNamespace(i);
+
writer.writeAttribute(reader.getAttributePrefix(i), namespaceUri == null ? "" : 
namespaceUri, reader.getAttributeLocalName(i),
+  reader.getAttributeValue(i));
 }
 for (int i = 0; i < reader.getNamespaceCount(); i++) {
 
writer.writeNamespace(reader.getNamespacePrefix(i), reader.getNamespaceURI(i));

camel git commit: CAMEL-10115: introduced pollTimeoutMs with default 5000

2016-07-04 Thread anoordover 
Repository: camel
Updated Branches:
  refs/heads/master 3b508f55d -> 3485b6152


CAMEL-10115: introduced pollTimeoutMs with default 5000


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

Branch: refs/heads/master
Commit: 3485b61520d0f3d2823f2fb689ad75600f4d3cfd
Parents: 3b508f5
Author: Arno Noordover 
Authored: Sun Jul 3 20:30:03 2016 +0200
Committer: Arno Noordover 
Committed: Mon Jul 4 14:24:17 2016 +0200

--
 components/camel-kafka/src/main/docs/kafka.adoc |  7 ++-
 .../component/kafka/KafkaConfiguration.java | 15 +-
 .../camel/component/kafka/KafkaConsumer.java|  4 +-
 .../component/kafka/KafkaConsumerTest.java  | 12 +++--
 .../clients/consumer/KafkaConsumerTest.java | 52 
 5 files changed, 83 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3485b615/components/camel-kafka/src/main/docs/kafka.adoc
--
diff --git a/components/camel-kafka/src/main/docs/kafka.adoc 
b/components/camel-kafka/src/main/docs/kafka.adoc
index 557eec2..575c6a2 100644
--- a/components/camel-kafka/src/main/docs/kafka.adoc
+++ b/components/camel-kafka/src/main/docs/kafka.adoc
@@ -87,8 +87,10 @@ The Kafka component supports 1 options which are listed 
below.
 
 
 
+
+
 // endpoint options: START
-The Kafka component supports 73 endpoint options which are listed below:
+The Kafka component supports 74 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
@@ -115,6 +117,7 @@ The Kafka component supports 73 endpoint options which are 
listed below:
 | keyDeserializer | consumer | 
org.apache.kafka.common.serialization.StringDeserializer | String | 
Deserializer class for key that implements the Deserializer interface.
 | maxPartitionFetchBytes | consumer | 1048576 | Integer | The maximum amount 
of data per-partition the server will return. The maximum total memory used for 
a request will be partitions max.partition.fetch.bytes. This size must be at 
least as large as the maximum message size the server allows or else it is 
possible for the producer to send messages larger than the consumer can fetch. 
If that happens the consumer can get stuck trying to fetch a large message on a 
certain partition.
 | partitionAssignor | consumer | 
org.apache.kafka.clients.consumer.RangeAssignor | String | The class name of 
the partition assignment strategy that the client will use to distribute 
partition ownership amongst consumer instances when group management is used
+| pollTimeoutMs | consumer | 5000 | Long | The timeout used when polling the 
KafkaConsumer.
 | seekToBeginning | consumer | false | boolean | If the option is true then 
KafkaConsumer will read from beginning on startup.
 | sessionTimeoutMs | consumer | 3 | Integer | The timeout used to detect 
failures when using Kafka's group management facilities.
 | valueDeserializer | consumer | 
org.apache.kafka.common.serialization.StringDeserializer | String | 
Deserializer class for value that implements the Deserializer interface.
@@ -180,6 +183,8 @@ The Kafka component supports 73 endpoint options which are 
listed below:
 
 
 
+
+
 For more information about Producer/Consumer configuration:
 
 
http://kafka.apache.org/documentation.html#newconsumerconfigs[http://kafka.apache.org/documentation.html#newconsumerconfigs]

http://git-wip-us.apache.org/repos/asf/camel/blob/3485b615/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
index 35ebd36..c69f32f 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
@@ -71,7 +71,9 @@ public class KafkaConfiguration {
 //session.timeout.ms
 @UriParam(label = "consumer", defaultValue = "3")
 private Integer sessionTimeoutMs = 3;
-//auto.offset.reset
+@UriParam(label = "consumer", defaultValue = "5000")
+private Long pollTimeoutMs = 5000L;
+//auto.offset.reset1
 @UriParam(label = "consumer", defaultValue = "latest", enums = 
"latest,earliest,none")
 private String autoOffsetReset = "latest";
 //partition.assignment.strategy
@@

camel git commit: CAMEL-10115: introduced pollTimeoutMs with default 5000

2016-07-04 Thread anoordover 
Repository: camel
Updated Branches:
  refs/heads/CAMEL-10115 [created] e27af6d81


CAMEL-10115: introduced pollTimeoutMs with default 5000


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

Branch: refs/heads/CAMEL-10115
Commit: e27af6d815e683b7b2d046a4b7c54bd625e9bcf8
Parents: 16cd1a7
Author: Arno Noordover 
Authored: Sun Jul 3 20:30:03 2016 +0200
Committer: Arno Noordover 
Committed: Mon Jul 4 13:54:49 2016 +0200

--
 components/camel-kafka/src/main/docs/kafka.adoc |  7 ++-
 .../component/kafka/KafkaConfiguration.java | 15 +-
 .../camel/component/kafka/KafkaConsumer.java|  4 +-
 .../component/kafka/KafkaConsumerTest.java  | 12 +++--
 .../clients/consumer/KafkaConsumerTest.java | 52 
 5 files changed, 83 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e27af6d8/components/camel-kafka/src/main/docs/kafka.adoc
--
diff --git a/components/camel-kafka/src/main/docs/kafka.adoc 
b/components/camel-kafka/src/main/docs/kafka.adoc
index 557eec2..575c6a2 100644
--- a/components/camel-kafka/src/main/docs/kafka.adoc
+++ b/components/camel-kafka/src/main/docs/kafka.adoc
@@ -87,8 +87,10 @@ The Kafka component supports 1 options which are listed 
below.
 
 
 
+
+
 // endpoint options: START
-The Kafka component supports 73 endpoint options which are listed below:
+The Kafka component supports 74 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
@@ -115,6 +117,7 @@ The Kafka component supports 73 endpoint options which are 
listed below:
 | keyDeserializer | consumer | 
org.apache.kafka.common.serialization.StringDeserializer | String | 
Deserializer class for key that implements the Deserializer interface.
 | maxPartitionFetchBytes | consumer | 1048576 | Integer | The maximum amount 
of data per-partition the server will return. The maximum total memory used for 
a request will be partitions max.partition.fetch.bytes. This size must be at 
least as large as the maximum message size the server allows or else it is 
possible for the producer to send messages larger than the consumer can fetch. 
If that happens the consumer can get stuck trying to fetch a large message on a 
certain partition.
 | partitionAssignor | consumer | 
org.apache.kafka.clients.consumer.RangeAssignor | String | The class name of 
the partition assignment strategy that the client will use to distribute 
partition ownership amongst consumer instances when group management is used
+| pollTimeoutMs | consumer | 5000 | Long | The timeout used when polling the 
KafkaConsumer.
 | seekToBeginning | consumer | false | boolean | If the option is true then 
KafkaConsumer will read from beginning on startup.
 | sessionTimeoutMs | consumer | 3 | Integer | The timeout used to detect 
failures when using Kafka's group management facilities.
 | valueDeserializer | consumer | 
org.apache.kafka.common.serialization.StringDeserializer | String | 
Deserializer class for value that implements the Deserializer interface.
@@ -180,6 +183,8 @@ The Kafka component supports 73 endpoint options which are 
listed below:
 
 
 
+
+
 For more information about Producer/Consumer configuration:
 
 
http://kafka.apache.org/documentation.html#newconsumerconfigs[http://kafka.apache.org/documentation.html#newconsumerconfigs]

http://git-wip-us.apache.org/repos/asf/camel/blob/e27af6d8/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
--
diff --git 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
index 35ebd36..c69f32f 100644
--- 
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
+++ 
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
@@ -71,7 +71,9 @@ public class KafkaConfiguration {
 //session.timeout.ms
 @UriParam(label = "consumer", defaultValue = "3")
 private Integer sessionTimeoutMs = 3;
-//auto.offset.reset
+@UriParam(label = "consumer", defaultValue = "5000")
+private Long pollTimeoutMs = 5000L;
+//auto.offset.reset1
 @UriParam(label = "consumer", defaultValue = "latest", enums = 
"latest,earliest,none")
 private String autoOffsetReset = "latest";

[camel] Git Push Summary

2016-07-04 Thread anoordover 
Repository: camel
Updated Branches:
  refs/heads/CAMEL-10115 [deleted] e27af6d81

camel git commit: CAMEL-10118: Fixed wrong generation of Spring Boot auto configuraiton of data formats where there could be naming clashes.

2016-07-04 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 16cd1a77d -> 3b508f55d


CAMEL-10118: Fixed wrong generation of Spring Boot auto configuraiton of data 
formats where there could be naming clashes.


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

Branch: refs/heads/master
Commit: 3b508f55d24ab4baa5164189d052fb3b320bce02
Parents: 16cd1a7
Author: Claus Ibsen 
Authored: Mon Jul 4 14:15:46 2016 +0200
Committer: Claus Ibsen 
Committed: Mon Jul 4 14:15:46 2016 +0200

--
 .../bindy/csv/springboot/BindyCsvDataFormatConfiguration.java  | 2 +-
 .../fixed/springboot/BindyFixedLengthDataFormatConfiguration.java  | 2 +-
 .../kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java   | 2 +-
 .../component/gson/springboot/GsonDataFormatConfiguration.java | 2 +-
 .../jackson/springboot/JacksonDataFormatConfiguration.java | 2 +-
 .../johnzon/springboot/JohnzonDataFormatConfiguration.java | 2 +-
 .../snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java | 2 +-
 .../dataformat/xstream/springboot/JsonDataFormatConfiguration.java | 2 +-
 .../zipfile/springboot/ZipFileDataFormatConfiguration.java | 2 +-
 .../camel/maven/packaging/SpringBootAutoConfigurationMojo.java | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3b508f55/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 67f781b..b249e17 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
@@ -25,7 +25,7 @@ import 
org.springframework.boot.context.properties.ConfigurationProperties;
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@ConfigurationProperties(prefix = "camel.dataformat.bindy")
+@ConfigurationProperties(prefix = "camel.dataformat.bindy-csv")
 public class BindyCsvDataFormatConfiguration {
 
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/3b508f55/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 90c89bf..8931068 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
@@ -25,7 +25,7 @@ import 
org.springframework.boot.context.properties.ConfigurationProperties;
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
-@ConfigurationProperties(prefix = "camel.dataformat.bindy")
+@ConfigurationProperties(prefix = "camel.dataformat.bindy-fixed")
 public class BindyFixedLengthDataFormatConfiguration {
 
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/3b508f55/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 63d823f..b30ed96 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
@@ -25,7 +25,7 @@ import

camel git commit: Upgrade spring

2016-07-04 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 20401a386 -> 16cd1a77d


Upgrade spring


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

Branch: refs/heads/master
Commit: 16cd1a77dfb13bf3a196389fcbd57aff313ad297
Parents: 20401a3
Author: Claus Ibsen 
Authored: Mon Jul 4 13:37:48 2016 +0200
Committer: Claus Ibsen 
Committed: Mon Jul 4 13:37:48 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/16cd1a77/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 0043e84..fb602d1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -540,8 +540,8 @@
 ${spring4-version}
 4.0.9.RELEASE
 4.1.9.RELEASE
-4.2.6.RELEASE
-4.2.6.RELEASE
+4.2.7.RELEASE
+4.2.7.RELEASE
 1.2.1
 4.0.4.RELEASE
 
4.0.4.RELEASE_1

[3/3] camel git commit: CAMEL-10118: Improvements to spring-boot testing framework

2016-07-04 Thread davsclaus 
CAMEL-10118: Improvements to spring-boot testing framework


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

Branch: refs/heads/master
Commit: 20401a386651f330468751ea52eb43645483dee5
Parents: a4bf413
Author: Nicola Ferraro 
Authored: Mon Jul 4 12:40:31 2016 +0200
Committer: Nicola Ferraro 
Committed: Mon Jul 4 12:40:31 2016 +0200

--
 tests/camel-itest-spring-boot/README.md |   5 +-
 tests/camel-itest-spring-boot/pom.xml   |  73 +++-
 .../apache/camel/itest/springboot/Command.java  |   4 +-
 .../camel/itest/springboot/CommandRouter.java   |   5 +-
 .../itest/springboot/ITestApplication.java  |   2 +
 .../camel/itest/springboot/ITestConfig.java |  66 +++
 .../itest/springboot/ITestConfigBuilder.java|  69 +++-
 .../springboot/command/AbstractTestCommand.java |  12 +-
 .../springboot/command/UnitTestCommand.java |  79 +++-
 .../camel/itest/springboot/CamelAhcWsTest.java  |   4 +
 .../camel/itest/springboot/CamelApnsTest.java   |   2 +
 .../camel/itest/springboot/CamelBoxTest.java|   2 +
 .../itest/springboot/CamelBraintreeTest.java|   2 +
 .../camel/itest/springboot/CamelCacheTest.java  |   1 +
 .../itest/springboot/CamelCassandraqlTest.java  |   6 +
 .../camel/itest/springboot/CamelCryptoTest.java |   1 +
 .../itest/springboot/CamelDisruptorTest.java|   1 +
 .../springboot/CamelElasticsearchTest.java  |   1 +
 .../camel/itest/springboot/CamelExecTest.java   |   2 +
 .../camel/itest/springboot/CamelFtpTest.java|   1 +
 .../springboot/CamelGoogleCalendarTest.java |   1 +
 .../itest/springboot/CamelGoogleMailTest.java   |   1 +
 .../camel/itest/springboot/CamelHawtdbTest.java |   1 +
 .../itest/springboot/CamelHazelcastTest.java|   3 +
 .../camel/itest/springboot/CamelHbaseTest.java  |   2 +
 .../camel/itest/springboot/CamelHl7Test.java|   2 +
 .../camel/itest/springboot/CamelIgniteTest.java |   1 +
 .../itest/springboot/CamelInfinispanTest.java   |   2 +
 .../camel/itest/springboot/CamelJasyptTest.java |   1 +
 .../itest/springboot/CamelJavaspaceTest.java|   2 +-
 .../camel/itest/springboot/CamelJbpmTest.java   |   1 +
 .../itest/springboot/CamelJcloudsTest.java  |   3 +
 .../camel/itest/springboot/CamelJcrTest.java|   3 +
 .../camel/itest/springboot/CamelJetty9Test.java |   2 +
 .../itest/springboot/CamelJettyCommonTest.java  |   1 +
 .../camel/itest/springboot/CamelJettyTest.java  |   1 +
 .../camel/itest/springboot/CamelJmsTest.java|   3 +
 .../camel/itest/springboot/CamelKafkaTest.java  |   1 +
 .../itest/springboot/CamelKubernetesTest.java   |   5 +-
 .../itest/springboot/CamelLinkedinTest.java |   2 +
 .../camel/itest/springboot/CamelMailTest.java   |   1 +
 .../camel/itest/springboot/CamelMina2Test.java  |   1 +
 .../camel/itest/springboot/CamelMllpTest.java   |   1 +
 .../camel/itest/springboot/CamelNatsTest.java   |   1 +
 .../itest/springboot/CamelNetty4HttpTest.java   |   4 +
 .../camel/itest/springboot/CamelNetty4Test.java |   1 +
 .../itest/springboot/CamelNettyHttpTest.java|   1 +
 .../camel/itest/springboot/CamelNettyTest.java  |   3 +
 .../itest/springboot/CamelOlingo2Test.java  |   2 +
 .../itest/springboot/CamelPgeventTest.java  |   1 +
 .../itest/springboot/CamelQuartz2Test.java  |   1 +
 .../camel/itest/springboot/CamelQuartzTest.java |   1 +
 .../itest/springboot/CamelRabbitmqTest.java |   1 +
 .../itest/springboot/CamelRestletTest.java  |   2 +
 .../itest/springboot/CamelSalesforceTest.java   |   2 +
 .../itest/springboot/CamelSapNetweaverTest.java |   2 +
 .../camel/itest/springboot/CamelScalaTest.java  |   1 +
 .../itest/springboot/CamelServicenowTest.java   |   2 +
 .../itest/springboot/CamelServletTest.java  |   3 +
 .../camel/itest/springboot/CamelSjmsTest.java   |   6 +-
 .../camel/itest/springboot/CamelSlackTest.java  |   2 +
 .../camel/itest/springboot/CamelSmppTest.java   |   3 +
 .../itest/springboot/CamelSparkRestTest.java|   2 +
 .../itest/springboot/CamelSpringRedisTest.java  |   5 +-
 .../camel/itest/springboot/CamelSpringTest.java |   1 +
 .../itest/springboot/CamelSpringWsTest.java |   3 +
 .../camel/itest/springboot/CamelStreamTest.java |   3 +
 .../itest/springboot/CamelSwaggerJavaTest.java  |   5 +-
 .../itest/springboot/CamelSwaggerTest.java  |  51 ---
 .../itest/springboot/CamelTwitterTest.java  |   2 +-
 .../itest/springboot/CamelUndertowTest.java |   3 +
 .../itest/springboot/CamelWeatherTest.java  |   3 +-
 .../itest/springboot/CamelWebsocketTest.java|   1 +
 .../itest/springboot/CamelXmljsonTest.java  |   2 +
 .../camel/itest/springboot/CamelXmppTest.java   |   7 +-

[2/3] camel git commit: CAMEL-10118: Improvements to spring-boot testing framework

2016-07-04 Thread davsclaus 
http://git-wip-us.apache.org/repos/asf/camel/blob/20401a38/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSalesforceTest.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSalesforceTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSalesforceTest.java
index f83f131..c122e2d 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSalesforceTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSalesforceTest.java
@@ -35,6 +35,8 @@ public class CamelSalesforceTest extends 
AbstractSpringBootTestSupport {
 public static ITestConfig createTestConfig() {
 return new ITestConfigBuilder()
 .module(inferModuleName(CamelSalesforceTest.class))
+
.basePath("../../components/camel-salesforce/camel-salesforce-component")
+
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest.*|MSPTest$)")
 .autostart(false) // needs configuration
 .build();
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/20401a38/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSapNetweaverTest.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSapNetweaverTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSapNetweaverTest.java
index e3f83d2..f7b058c 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSapNetweaverTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelSapNetweaverTest.java
@@ -35,6 +35,8 @@ public class CamelSapNetweaverTest extends 
AbstractSpringBootTestSupport {
 public static ITestConfig createTestConfig() {
 return new ITestConfigBuilder()
 .module(inferModuleName(CamelSapNetweaverTest.class))
+.unitTestInclusionPattern("^$") // no pure unit-tests
+.unitTestExpectedNumber(0)
 .build();
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/20401a38/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelScalaTest.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelScalaTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelScalaTest.java
index ca1a39c..73131b8 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelScalaTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelScalaTest.java
@@ -35,6 +35,7 @@ public class CamelScalaTest extends 
AbstractSpringBootTestSupport {
 public static ITestConfig createTestConfig() {
 return new ITestConfigBuilder()
 .module(inferModuleName(CamelScalaTest.class))
+
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|LoopTest$|IdempotentConsumerEagerTest$|AutoStartupTest$)")
 // no runnable methods on these tests
 .build();
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/20401a38/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServicenowTest.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServicenowTest.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServicenowTest.java
index 9cf07c7..095fe34 100644
--- 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServicenowTest.java
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServicenowTest.java
@@ -35,6 +35,8 @@ public class CamelServicenowTest extends 
AbstractSpringBootTestSupport {
 public static ITestConfig createTestConfig() {
 return new ITestConfigBuilder()
 .module(inferModuleName(CamelServicenowTest.class))
+.unitTestInclusionPattern("^$") // no tests
+.unitTestExpectedNumber(0)
 .build();
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/20401a38/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletTest.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelServletTest.java

[1/3] camel git commit: CAMEL-10118: Improvements to spring-boot testing framework

2016-07-04 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master a4bf413a0 -> 20401a386


http://git-wip-us.apache.org/repos/asf/camel/blob/20401a38/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
--
diff --git 
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
new file mode 100644
index 000..0f58d01
--- /dev/null
+++ 
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java
@@ -0,0 +1,150 @@
+/**
+ * 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.itest.springboot.util;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathFactory;
+
+import org.w3c.dom.Document;
+
+/**
+ * Resolves the currently used version of a library. Useful to run unit tests 
directly from the IDE, without passing additional parameters.
+ * It resolves surefire properties.
+ */
+public final class DependencyResolver {
+
+private static final String DEFAULT_PREFIX = "version_";
+
+private static DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();
+private static XPathFactory xPathfactory = XPathFactory.newInstance();
+
+private DependencyResolver() {
+}
+
+/**
+ * Gets a groupId and artifactId in the form "groupId:artifactId" and 
returns the current version from the pom.
+ * Uses {@link DependencyResolver#withVersion(String, String)} using a 
default prefix.
+ *
+ * @param groupArtifact the groupId and artifactId in the form 
"groupId:artifactId"
+ * @return the maven canonical form of the artifact 
"groupId:artifactId:version"
+ * @throws RuntimeException if the version cannot be resolved
+ */
+public static String withVersion(String groupArtifact) {
+return withVersion(DEFAULT_PREFIX, groupArtifact);
+}
+
+/**
+ * Gets a groupId and artifactId in the form "groupId:artifactId" and 
returns the current version from the pom.
+ * Versions are resolved from system properties when using surefire, and 
by looking at the poms when running from IDE.
+ *
+ * @param prefix the prefix to use to lookup the property from surefire
+ * @param groupArtifact the groupId and artifactId in the form 
"groupId:artifactId"
+ * @return the maven canonical form of the artifact 
"groupId:artifactId:version"
+ * @throws RuntimeException if the version cannot be resolved
+ */
+public static String withVersion(String prefix, String groupArtifact) {
+String version = System.getProperty(prefix + groupArtifact);
+
+try {
+if (version == null) {
+// Usually, when running from IDE
+version = resolveSurefireProperty(prefix + groupArtifact);
+}
+} catch (Exception e) {
+throw new IllegalStateException("Error while retrieving version 
for artifact: " + groupArtifact, e);
+}
+
+if (version == null) {
+throw new IllegalStateException("Cannot determine version for 
maven artifact: " + groupArtifact);
+} else if (!isResolved(version)) {
+throw new IllegalStateException("Cannot resolve version for maven 
artifact: " + groupArtifact + ". Missing property value: " + version);
+}
+
+return groupArtifact + ":" + version;
+}
+
+private static String resolveSurefireProperty(String property) throws 
Exception {
+property = getSurefirePropertyFromPom("pom.xml", property);
+if (property != null && !isResolved(property)) {
+property = resolveProperty("pom.xml", property, 0);
+}
+if (property != null && !isResolved(property)) {
+property = resolveProperty("../pom.xml", property, 0);
+}
+if (property != null && !isResolved(property)) {
+property =

[2/2] camel git commit: CAMEL-10117: Camel-Elasticsearch: Default pathHome option should work on all the platforms - Update docs

2016-07-04 Thread acosentino 
CAMEL-10117: Camel-Elasticsearch: Default pathHome option should work on all 
the platforms - Update docs


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

Branch: refs/heads/camel-2.17.x
Commit: 1c2ef2104f11004bec6491be719bcc0e518a3e69
Parents: d54f7da
Author: Andrea Cosentino 
Authored: Mon Jul 4 10:13:00 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 4 10:13:00 2016 +0200

--
 components/camel-elasticsearch/src/main/docs/elasticsearch.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1c2ef210/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc
--
diff --git a/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc 
b/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc
index 1daf35d..a064206 100644
--- a/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc
+++ b/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc
@@ -74,10 +74,10 @@ of SYNC, ASYNC or DEFAULT) *Camel 2.16* .*From version 2.17 
replicationType opti
 elasticsearch 2.0.0 the async replication has been removed.*
 ===
 
+
 // endpoint options: START
 The Elasticsearch component supports 13 endpoint options which are listed 
below:
 
-{% raw %}
 [width="100%",cols="2s,1,1m,1m,5",options="header"]
 |===
 | Name | Group | Default | Java Type | Description
@@ -95,9 +95,9 @@ The Elasticsearch component supports 13 endpoint options 
which are listed below:
 | exchangePattern | advanced | InOnly | ExchangePattern | Sets the default 
exchange pattern when creating an exchange
 | synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
 |===
-{% endraw %}
 // endpoint options: END
 
+
 |parent |optionally used with INDEX operations for Elasticsearch
 
https://www.elastic.co/guide/en/elasticsearch/guide/current/parent-child.html[Parent-Child
 relationships] to specify the ID of the parent record *Camel 2.16.1 /

[1/2] camel git commit: CAMEL-10117: Camel-Elasticsearch: Default pathHome option should work on all the platforms

2016-07-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 922575d83 -> 1c2ef2104


CAMEL-10117: Camel-Elasticsearch: Default pathHome option should work on all 
the platforms


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

Branch: refs/heads/camel-2.17.x
Commit: d54f7dabbb73c46c51e4a9983f2d762fa12de30a
Parents: 922575d
Author: Andrea Cosentino 
Authored: Mon Jul 4 09:36:00 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 4 09:46:16 2016 +0200

--
 .../src/main/docs/elasticsearch.adoc| 26 
 .../ElasticsearchConfiguration.java |  7 +++---
 2 files changed, 30 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d54f7dab/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc
--
diff --git a/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc 
b/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc
index 4ee8ebf..1daf35d 100644
--- a/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc
+++ b/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc
@@ -72,6 +72,31 @@ be any of ONE, QUORUM, ALL or DEFAULT) *Camel 2.16*
 |replicationType |the replication type to use with INDEX and BULK operations 
(can be any
 of SYNC, ASYNC or DEFAULT) *Camel 2.16* .*From version 2.17 replicationType 
option has been removed, since from
 elasticsearch 2.0.0 the async replication has been removed.*
+===
+
+// endpoint options: START
+The Elasticsearch component supports 13 endpoint options which are listed 
below:
+
+{% raw %}
+[width="100%",cols="2s,1,1m,1m,5",options="header"]
+|===
+| Name | Group | Default | Java Type | Description
+| clusterName | producer |  | String | *Required* Name of cluster or use local 
for local mode
+| clientTransportSniff | producer | true | Boolean | Is the client allowed to 
sniff the rest of the cluster or not (default true). This setting map to the 
client.transport.sniff setting.
+| consistencyLevel | producer | DEFAULT | WriteConsistencyLevel | The write 
consistency level to use with INDEX and BULK operations (can be any of ONE 
QUORUM ALL or DEFAULT)
+| data | producer |  | Boolean | Is the node going to be allowed to allocate 
data (shards) to it or not. This setting map to the node.data setting.
+| indexName | producer |  | String | The name of the index to act against
+| indexType | producer |  | String | The type of the index to act against
+| ip | producer |  | String | The TransportClient remote host ip to use
+| operation | producer |  | String | What operation to perform
+| pathHome | producer | ${user.home}/.elasticsearch | String | The path.home 
property of ElasticSearch configuration. You need to provide a valid path 
otherwise the default $user.home/.elasticsearch will be used.
+| port | producer | 9300 | int | The TransportClient remote port to use 
(defaults to 9300)
+| transportAddresses | producer |  | String | Comma separated list with 
ip:port formatted remote transport addresses to use. The ip and port options 
must be left blank for transportAddresses to be considered instead.
+| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default 
exchange pattern when creating an exchange
+| synchronous | advanced | false | boolean | Sets whether synchronous 
processing should be strictly used or Camel is allowed to use asynchronous 
processing (if supported).
+|===
+{% endraw %}
+// endpoint options: END
 
 |parent |optionally used with INDEX operations for Elasticsearch
 
https://www.elastic.co/guide/en/elasticsearch/guide/current/parent-child.html[Parent-Child
@@ -82,6 +107,7 @@ relationships] to specify the ID of the parent record *Camel 
2.16.1 /
 the cluster
 |===
 
+
 [[ElasticSearch-MessageOperations]]
 Message Operations
 ^^

http://git-wip-us.apache.org/repos/asf/camel/blob/d54f7dab/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
--
diff --git 
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
 
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
index c3bd9e5..891baa3 100644
---

camel git commit: CAMEL-10117: Camel-Elasticsearch: Default pathHome option should work on all the platforms

2016-07-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master fa3f36c9d -> a4bf413a0


CAMEL-10117: Camel-Elasticsearch: Default pathHome option should work on all 
the platforms


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

Branch: refs/heads/master
Commit: a4bf413a00aca67240d5b3697c08cc67c71ecae1
Parents: fa3f36c
Author: Andrea Cosentino 
Authored: Mon Jul 4 09:36:00 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 4 09:36:00 2016 +0200

--
 .../camel-elasticsearch/src/main/docs/elasticsearch.adoc  | 4 +++-
 .../component/elasticsearch/ElasticsearchConfiguration.java   | 7 ---
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a4bf413a/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc
--
diff --git a/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc 
b/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc
index 8462bea..31c3681 100644
--- a/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc
+++ b/components/camel-elasticsearch/src/main/docs/elasticsearch.adoc
@@ -61,6 +61,7 @@ The Elasticsearch component supports 1 options which are 
listed below.
 
 
 
+
 // endpoint options: START
 The Elasticsearch component supports 13 endpoint options which are listed 
below:
 
@@ -76,7 +77,7 @@ The Elasticsearch component supports 13 endpoint options 
which are listed below:
 | indexType | producer |  | String | The type of the index to act against
 | ip | producer |  | String | The TransportClient remote host ip to use
 | operation | producer |  | String | What operation to perform
-| pathHome | producer | /usr/share/elasticsearch | String | The path.home 
property of ElasticSearch configuration. You need to provide a valid path 
otherwise the default /usr/share/elasticsearch will be used.
+| pathHome | producer | ${user.home}/.elasticsearch | String | The path.home 
property of ElasticSearch configuration. You need to provide a valid path 
otherwise the default $user.home/.elasticsearch will be used.
 | port | producer | 9300 | int | The TransportClient remote port to use 
(defaults to 9300)
 | transportAddresses | producer |  | String | Comma separated list with 
ip:port formatted remote transport addresses to use. The ip and port options 
must be left blank for transportAddresses to be considered instead.
 | exchangePattern | advanced | InOnly | ExchangePattern | Sets the default 
exchange pattern when creating an exchange
@@ -86,6 +87,7 @@ The Elasticsearch component supports 13 endpoint options 
which are listed below:
 // endpoint options: END
 
 
+
 [[ElasticSearch-MessageOperations]]
 Message Operations
 ^^

http://git-wip-us.apache.org/repos/asf/camel/blob/a4bf413a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
--
diff --git 
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
 
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
index c3bd9e5..891baa3 100644
--- 
a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
+++ 
b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchConfiguration.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.elasticsearch;
 
+import java.io.File;
 import java.util.List;
 
 import org.apache.camel.spi.Metadata;
@@ -51,8 +52,8 @@ public class ElasticsearchConfiguration {
 private int port = ElasticsearchConstants.DEFAULT_PORT;
 @UriParam(defaultValue = "true")
 private Boolean clientTransportSniff = true;
-@UriParam(defaultValue = "/usr/share/elasticsearch")
-private String pathHome = "/usr/share/elasticsearch";
+@UriParam(defaultValue = "${user.home}/.elasticsearch")
+private String pathHome = System.getProperty("user.home") + File.separator 
+ ".elasticsearch";
 
 /**
  * Name of cluster or use local for local mode
@@ -182,7 +183,7 @@ public class ElasticsearchConfiguration {
 }
 
 /**
- * The path.home property of ElasticSearch configuration. You need to 
provide a valid path, otherwise the default, /usr/share/elasticsearch, will be 
used.
+ * The path.home property of ElasticSearch configuration. You need to 
provide a valid path, otherwise the

camel git commit: Upgrade Deltaspike to version 1.7.0

2016-07-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 561247267 -> fa3f36c9d


Upgrade Deltaspike to version 1.7.0


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

Branch: refs/heads/master
Commit: fa3f36c9da7f6d7b3847c62668f15d72885fd27a
Parents: 5612472
Author: Andrea Cosentino 
Authored: Mon Jul 4 08:55:06 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 4 08:55:06 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/fa3f36c9/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 25f050a..0043e84 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -139,7 +139,7 @@
 [3.0,4.0)
 3.0.5
 3.0.5
-1.6.1
+1.7.0
 10.11.1.1
 3.3.4
 2.1.7

camel git commit: Upgrade Weld to version 2.3.5.Final

2016-07-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 8e9b49f3f -> 561247267


Upgrade Weld to version 2.3.5.Final


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

Branch: refs/heads/master
Commit: 5612472674d14846d7758d19f2b22b5bf699c8bd
Parents: 8e9b49f
Author: Andrea Cosentino 
Authored: Mon Jul 4 08:40:55 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 4 08:40:55 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/56124726/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 98e2c1a..25f050a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -581,7 +581,7 @@
 3.3.0
 0.7
 1.1.28.Final
-2.3.4.Final
+2.3.5.Final
 0.9.4_5
 4.4.1
 1.0.2_2

camel git commit: Upgrade Univocity Parsers to version 2.1.2

2016-07-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 2930abbe5 -> 8e9b49f3f


Upgrade Univocity Parsers to version 2.1.2


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

Branch: refs/heads/master
Commit: 8e9b49f3f5a403da06138867197ec12a794e7394
Parents: 2930abb
Author: Andrea Cosentino 
Authored: Mon Jul 4 08:25:51 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 4 08:25:51 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/8e9b49f3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 44ddf3f..98e2c1a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -569,7 +569,7 @@
 4.0.4_1
 4.0.4
 1.3.23.Final
-2.1.1
+2.1.2
 
2015-01-27T15-02-14
 
1.0.0
 4.0.4

camel git commit: Upgrade Karaf3 version to 3.0.7

2016-07-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master ddc89511d -> 2930abbe5


Upgrade Karaf3 version to 3.0.7


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

Branch: refs/heads/master
Commit: 2930abbe5eab82db8f2899ccd0fe1449405d68db
Parents: ddc8951
Author: Andrea Cosentino 
Authored: Mon Jul 4 08:10:05 2016 +0200
Committer: Andrea Cosentino 
Committed: Mon Jul 4 08:10:05 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/2930abbe/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 7a93835..44ddf3f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -358,7 +358,7 @@
 0.10.0.0
 0.10.0.0_1
 2.4.4
-3.0.6
+3.0.7
 4.0.5
 6.4.0.Final
 0.4.9