[1/4] camel git commit: Fixed CS

2016-11-18 Thread ggrzybek 
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x e6bf8367b -> 9ef8327e7
  refs/heads/camel-2.17.x d35f61c20 -> b43043757
  refs/heads/camel-2.18.x a4280151d -> 2a78bb3a8
  refs/heads/master 35a8fb65c -> 3c4eb0def


Fixed CS


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

Branch: refs/heads/master
Commit: 3c4eb0defb8fb9987b977fc16b97ff5a764f85dc
Parents: 35a8fb6
Author: Grzegorz Grzybek 
Authored: Fri Nov 18 18:05:26 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Nov 18 18:05:26 2016 +0100

--
 .../org/apache/camel/test/blueprint/CamelBlueprintHelper.java | 2 +-
 .../test/java/org/apache/camel/test/blueprint/MainTest.java   | 7 +--
 2 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3c4eb0de/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index 90f23bb..59244ff 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -134,7 +134,7 @@ public final class CamelBlueprintHelper {
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter, TinyBundle bundle) throws Exception {
-return createBundleContext(name, bundleFilter, bundle, null,null);
+return createBundleContext(name, bundleFilter, bundle, null, null);
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter,

http://git-wip-us.apache.org/repos/asf/camel/blob/3c4eb0de/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
index eb48a1c..a041e28 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
@@ -19,17 +19,12 @@ package org.apache.camel.test.blueprint;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.StringWriter;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Arrays;
 
 import org.apache.aries.util.io.IOUtils;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.util.FileUtil;
-import org.apache.felix.connect.felix.framework.util.Util;
 import org.junit.Test;
-import org.ops4j.io.FileUtils;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
 
@@ -78,7 +73,7 @@ public class MainTest {
 
 // simulate `camel:run` which is run after packaging the artifact, so 
a "bundle" (location with
 // META-INF/MANIFEST.MF) is detected in target/classes
-URLClassLoader loader = new URLClassLoader(new URL[] { 
tb.toURI().toURL() }, getClass().getClassLoader());
+URLClassLoader loader = new URLClassLoader(new URL[] 
{tb.toURI().toURL()}, getClass().getClassLoader());
 
 Main main = new Main();
 main.setLoader(loader);

[2/4] camel git commit: Fixed CS

2016-11-18 Thread ggrzybek 
Fixed CS

(cherry picked from commit 3c4eb0defb8fb9987b977fc16b97ff5a764f85dc)


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

Branch: refs/heads/camel-2.18.x
Commit: 2a78bb3a87645767a89423eaa818de1043683e46
Parents: a428015
Author: Grzegorz Grzybek 
Authored: Fri Nov 18 18:05:26 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Nov 18 18:05:39 2016 +0100

--
 .../org/apache/camel/test/blueprint/CamelBlueprintHelper.java | 2 +-
 .../test/java/org/apache/camel/test/blueprint/MainTest.java   | 7 +--
 2 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2a78bb3a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index 90f23bb..59244ff 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -134,7 +134,7 @@ public final class CamelBlueprintHelper {
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter, TinyBundle bundle) throws Exception {
-return createBundleContext(name, bundleFilter, bundle, null,null);
+return createBundleContext(name, bundleFilter, bundle, null, null);
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter,

http://git-wip-us.apache.org/repos/asf/camel/blob/2a78bb3a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
index eb48a1c..a041e28 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
@@ -19,17 +19,12 @@ package org.apache.camel.test.blueprint;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.StringWriter;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Arrays;
 
 import org.apache.aries.util.io.IOUtils;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.util.FileUtil;
-import org.apache.felix.connect.felix.framework.util.Util;
 import org.junit.Test;
-import org.ops4j.io.FileUtils;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
 
@@ -78,7 +73,7 @@ public class MainTest {
 
 // simulate `camel:run` which is run after packaging the artifact, so 
a "bundle" (location with
 // META-INF/MANIFEST.MF) is detected in target/classes
-URLClassLoader loader = new URLClassLoader(new URL[] { 
tb.toURI().toURL() }, getClass().getClassLoader());
+URLClassLoader loader = new URLClassLoader(new URL[] 
{tb.toURI().toURL()}, getClass().getClassLoader());
 
 Main main = new Main();
 main.setLoader(loader);

[3/4] camel git commit: Fixed CS

2016-11-18 Thread ggrzybek 
Fixed CS

(cherry picked from commit 3c4eb0defb8fb9987b977fc16b97ff5a764f85dc)


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

Branch: refs/heads/camel-2.17.x
Commit: b430437573051697ade77daa5b386840c49ff1c2
Parents: d35f61c
Author: Grzegorz Grzybek 
Authored: Fri Nov 18 18:05:26 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Nov 18 18:05:48 2016 +0100

--
 .../org/apache/camel/test/blueprint/CamelBlueprintHelper.java | 2 +-
 .../test/java/org/apache/camel/test/blueprint/MainTest.java   | 7 +--
 2 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b4304375/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index 90f23bb..59244ff 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -134,7 +134,7 @@ public final class CamelBlueprintHelper {
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter, TinyBundle bundle) throws Exception {
-return createBundleContext(name, bundleFilter, bundle, null,null);
+return createBundleContext(name, bundleFilter, bundle, null, null);
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter,

http://git-wip-us.apache.org/repos/asf/camel/blob/b4304375/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
index eb48a1c..a041e28 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
@@ -19,17 +19,12 @@ package org.apache.camel.test.blueprint;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.StringWriter;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Arrays;
 
 import org.apache.aries.util.io.IOUtils;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.util.FileUtil;
-import org.apache.felix.connect.felix.framework.util.Util;
 import org.junit.Test;
-import org.ops4j.io.FileUtils;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
 
@@ -78,7 +73,7 @@ public class MainTest {
 
 // simulate `camel:run` which is run after packaging the artifact, so 
a "bundle" (location with
 // META-INF/MANIFEST.MF) is detected in target/classes
-URLClassLoader loader = new URLClassLoader(new URL[] { 
tb.toURI().toURL() }, getClass().getClassLoader());
+URLClassLoader loader = new URLClassLoader(new URL[] 
{tb.toURI().toURL()}, getClass().getClassLoader());
 
 Main main = new Main();
 main.setLoader(loader);

[4/4] camel git commit: Fixed CS

2016-11-18 Thread ggrzybek 
Fixed CS

(cherry picked from commit 3c4eb0defb8fb9987b977fc16b97ff5a764f85dc)


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

Branch: refs/heads/camel-2.16.x
Commit: 9ef8327e7627c3c88035bfce0103ae64639ba59b
Parents: e6bf836
Author: Grzegorz Grzybek 
Authored: Fri Nov 18 18:05:26 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Nov 18 18:05:53 2016 +0100

--
 .../org/apache/camel/test/blueprint/CamelBlueprintHelper.java | 2 +-
 .../test/java/org/apache/camel/test/blueprint/MainTest.java   | 7 +--
 2 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/9ef8327e/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index eed2951..bc9766a 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -139,7 +139,7 @@ public final class CamelBlueprintHelper {
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter, TinyBundle bundle) throws Exception {
-return createBundleContext(name, bundleFilter, bundle, null,null);
+return createBundleContext(name, bundleFilter, bundle, null, null);
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter,

http://git-wip-us.apache.org/repos/asf/camel/blob/9ef8327e/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
--
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
index eb48a1c..a041e28 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/MainTest.java
@@ -19,17 +19,12 @@ package org.apache.camel.test.blueprint;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.StringWriter;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Arrays;
 
 import org.apache.aries.util.io.IOUtils;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.util.FileUtil;
-import org.apache.felix.connect.felix.framework.util.Util;
 import org.junit.Test;
-import org.ops4j.io.FileUtils;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
 import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
 
@@ -78,7 +73,7 @@ public class MainTest {
 
 // simulate `camel:run` which is run after packaging the artifact, so 
a "bundle" (location with
 // META-INF/MANIFEST.MF) is detected in target/classes
-URLClassLoader loader = new URLClassLoader(new URL[] { 
tb.toURI().toURL() }, getClass().getClassLoader());
+URLClassLoader loader = new URLClassLoader(new URL[] 
{tb.toURI().toURL()}, getClass().getClassLoader());
 
 Main main = new Main();
 main.setLoader(loader);

[2/4] camel git commit: [CAMEL-10476] Provide initial configadmin configuration in camel:run scenario

2016-11-18 Thread ggrzybek 
[CAMEL-10476] Provide initial configadmin configuration in camel:run scenario

(cherry picked from commit 35a8fb65ce2f4feffe0b663d4ed48fdf00e98f44)


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

Branch: refs/heads/camel-2.18.x
Commit: a4280151d7cbd37de2425dc414b79ec43b968ece
Parents: 1bbe66b
Author: Grzegorz Grzybek 
Authored: Fri Nov 18 17:04:55 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Nov 18 17:05:14 2016 +0100

--
 .../test/blueprint/CamelBlueprintHelper.java| 76 +++-
 .../org/apache/camel/test/blueprint/Main.java   | 15 +++-
 .../apache/camel/test/blueprint/MainTest.java   | 56 ++-
 3 files changed, 127 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a4280151/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index b291644..90f23bb 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -108,18 +108,38 @@ public final class CamelBlueprintHelper {
 public static BundleContext createBundleContext(String name, String 
descriptors, boolean includeTestBundle,
 String bundleFilter, 
String testBundleVersion, String testBundleDirectives,
 String[] ... 
configAdminPidFiles) throws Exception {
+return createBundleContext(name, descriptors, includeTestBundle,
+bundleFilter, testBundleVersion, testBundleDirectives,
+null,
+configAdminPidFiles);
+}
+
+public static BundleContext createBundleContext(String name, String 
descriptors, boolean includeTestBundle,
+String bundleFilter, 
String testBundleVersion, String testBundleDirectives,
+ClassLoader loader,
+String[] ... 
configAdminPidFiles) throws Exception {
 TinyBundle bundle = null;
+TinyBundle configAdminInitBundle = null;
 
 if (includeTestBundle) {
 // add ourselves as a bundle
 bundle = createTestBundle(testBundleDirectives == null ? name : 
name + ';' + testBundleDirectives,
-testBundleVersion, descriptors, configAdminPidFiles);
+testBundleVersion, descriptors);
+}
+if (configAdminPidFiles != null) {
+configAdminInitBundle = 
createConfigAdminInitBundle(configAdminPidFiles);
 }
 
-return createBundleContext(name, bundleFilter, bundle);
+return createBundleContext(name, bundleFilter, bundle, 
configAdminInitBundle, loader);
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter, TinyBundle bundle) throws Exception {
+return createBundleContext(name, bundleFilter, bundle, null,null);
+}
+
+public static BundleContext createBundleContext(String name, String 
bundleFilter,
+TinyBundle bundle, 
TinyBundle configAdminInitBundle,
+ClassLoader loader) throws 
Exception {
 // ensure felix-connect stores bundles in an unique target directory
 String uid = "" + System.currentTimeMillis();
 String tempDir = "target/bundles/" + uid;
@@ -133,12 +153,17 @@ public final class CamelBlueprintHelper {
 
 List bundles = new LinkedList<>();
 
+if (configAdminInitBundle != null) {
+String jarName = "configAdminInitBundle-" + uid + ".jar";
+bundles.add(getBundleDescriptor("target/test-bundles/" + jarName, 
configAdminInitBundle));
+}
+
 if (bundle != null) {
 String jarName = name.toLowerCase(Locale.ENGLISH) + "-" + uid + 
".jar";
 bundles.add(getBundleDescriptor("target/test-bundles/" + jarName, 
bundle));
 }
 
-List bundleDescriptors = 
getBundleDescriptors(bundleFilter);
+List bundleDescriptors = 
getBundleDescriptors(bundleFilter, loader);

[3/4] camel git commit: [CAMEL-10476] Provide initial configadmin configuration in camel:run scenario

2016-11-18 Thread ggrzybek 
[CAMEL-10476] Provide initial configadmin configuration in camel:run scenario

(cherry picked from commit 35a8fb65ce2f4feffe0b663d4ed48fdf00e98f44)


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

Branch: refs/heads/camel-2.17.x
Commit: d35f61c20cd0a14ebf4eaea3f4c5d050c6ffeb2e
Parents: a41e734
Author: Grzegorz Grzybek 
Authored: Fri Nov 18 17:04:55 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Nov 18 17:38:50 2016 +0100

--
 .../test/blueprint/CamelBlueprintHelper.java| 76 +++-
 .../org/apache/camel/test/blueprint/Main.java   | 15 +++-
 .../apache/camel/test/blueprint/MainTest.java   | 56 ++-
 3 files changed, 127 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d35f61c2/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index b291644..90f23bb 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -108,18 +108,38 @@ public final class CamelBlueprintHelper {
 public static BundleContext createBundleContext(String name, String 
descriptors, boolean includeTestBundle,
 String bundleFilter, 
String testBundleVersion, String testBundleDirectives,
 String[] ... 
configAdminPidFiles) throws Exception {
+return createBundleContext(name, descriptors, includeTestBundle,
+bundleFilter, testBundleVersion, testBundleDirectives,
+null,
+configAdminPidFiles);
+}
+
+public static BundleContext createBundleContext(String name, String 
descriptors, boolean includeTestBundle,
+String bundleFilter, 
String testBundleVersion, String testBundleDirectives,
+ClassLoader loader,
+String[] ... 
configAdminPidFiles) throws Exception {
 TinyBundle bundle = null;
+TinyBundle configAdminInitBundle = null;
 
 if (includeTestBundle) {
 // add ourselves as a bundle
 bundle = createTestBundle(testBundleDirectives == null ? name : 
name + ';' + testBundleDirectives,
-testBundleVersion, descriptors, configAdminPidFiles);
+testBundleVersion, descriptors);
+}
+if (configAdminPidFiles != null) {
+configAdminInitBundle = 
createConfigAdminInitBundle(configAdminPidFiles);
 }
 
-return createBundleContext(name, bundleFilter, bundle);
+return createBundleContext(name, bundleFilter, bundle, 
configAdminInitBundle, loader);
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter, TinyBundle bundle) throws Exception {
+return createBundleContext(name, bundleFilter, bundle, null,null);
+}
+
+public static BundleContext createBundleContext(String name, String 
bundleFilter,
+TinyBundle bundle, 
TinyBundle configAdminInitBundle,
+ClassLoader loader) throws 
Exception {
 // ensure felix-connect stores bundles in an unique target directory
 String uid = "" + System.currentTimeMillis();
 String tempDir = "target/bundles/" + uid;
@@ -133,12 +153,17 @@ public final class CamelBlueprintHelper {
 
 List bundles = new LinkedList<>();
 
+if (configAdminInitBundle != null) {
+String jarName = "configAdminInitBundle-" + uid + ".jar";
+bundles.add(getBundleDescriptor("target/test-bundles/" + jarName, 
configAdminInitBundle));
+}
+
 if (bundle != null) {
 String jarName = name.toLowerCase(Locale.ENGLISH) + "-" + uid + 
".jar";
 bundles.add(getBundleDescriptor("target/test-bundles/" + jarName, 
bundle));
 }
 
-List bundleDescriptors = 
getBundleDescriptors(bundleFilter);
+List bundleDescriptors = 
getBundleDescriptors(bundleFilter, loader);

[1/4] camel git commit: [CAMEL-10476] Provide initial configadmin configuration in camel:run scenario

2016-11-18 Thread ggrzybek 
Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 3e096a5dd -> e6bf8367b
  refs/heads/camel-2.17.x a41e73483 -> d35f61c20
  refs/heads/camel-2.18.x 1bbe66b5d -> a4280151d
  refs/heads/master 88de1d433 -> 35a8fb65c


[CAMEL-10476] Provide initial configadmin configuration in camel:run scenario


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

Branch: refs/heads/master
Commit: 35a8fb65ce2f4feffe0b663d4ed48fdf00e98f44
Parents: 88de1d4
Author: Grzegorz Grzybek 
Authored: Fri Nov 18 17:04:55 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Nov 18 17:04:55 2016 +0100

--
 .../test/blueprint/CamelBlueprintHelper.java| 76 +++-
 .../org/apache/camel/test/blueprint/Main.java   | 15 +++-
 .../apache/camel/test/blueprint/MainTest.java   | 56 ++-
 3 files changed, 127 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/35a8fb65/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index b291644..90f23bb 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -108,18 +108,38 @@ public final class CamelBlueprintHelper {
 public static BundleContext createBundleContext(String name, String 
descriptors, boolean includeTestBundle,
 String bundleFilter, 
String testBundleVersion, String testBundleDirectives,
 String[] ... 
configAdminPidFiles) throws Exception {
+return createBundleContext(name, descriptors, includeTestBundle,
+bundleFilter, testBundleVersion, testBundleDirectives,
+null,
+configAdminPidFiles);
+}
+
+public static BundleContext createBundleContext(String name, String 
descriptors, boolean includeTestBundle,
+String bundleFilter, 
String testBundleVersion, String testBundleDirectives,
+ClassLoader loader,
+String[] ... 
configAdminPidFiles) throws Exception {
 TinyBundle bundle = null;
+TinyBundle configAdminInitBundle = null;
 
 if (includeTestBundle) {
 // add ourselves as a bundle
 bundle = createTestBundle(testBundleDirectives == null ? name : 
name + ';' + testBundleDirectives,
-testBundleVersion, descriptors, configAdminPidFiles);
+testBundleVersion, descriptors);
+}
+if (configAdminPidFiles != null) {
+configAdminInitBundle = 
createConfigAdminInitBundle(configAdminPidFiles);
 }
 
-return createBundleContext(name, bundleFilter, bundle);
+return createBundleContext(name, bundleFilter, bundle, 
configAdminInitBundle, loader);
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter, TinyBundle bundle) throws Exception {
+return createBundleContext(name, bundleFilter, bundle, null,null);
+}
+
+public static BundleContext createBundleContext(String name, String 
bundleFilter,
+TinyBundle bundle, 
TinyBundle configAdminInitBundle,
+ClassLoader loader) throws 
Exception {
 // ensure felix-connect stores bundles in an unique target directory
 String uid = "" + System.currentTimeMillis();
 String tempDir = "target/bundles/" + uid;
@@ -133,12 +153,17 @@ public final class CamelBlueprintHelper {
 
 List bundles = new LinkedList<>();
 
+if (configAdminInitBundle != null) {
+String jarName = "configAdminInitBundle-" + uid + ".jar";
+bundles.add(getBundleDescriptor("target/test-bundles/" + jarName, 
configAdminInitBundle));
+}
+
 if (bundle != null) {
 String jarName = name.toLowerCase(Locale.ENGLISH) + "-" + uid + 
".jar";
 bundles.add(getBundleDescriptor("target/test-bundles/" + jarName, 
bundle));
 }
 
-

[4/4] camel git commit: [CAMEL-10476] Provide initial configadmin configuration in camel:run scenario

2016-11-18 Thread ggrzybek 
[CAMEL-10476] Provide initial configadmin configuration in camel:run scenario

(cherry picked from commit 35a8fb65ce2f4feffe0b663d4ed48fdf00e98f44)


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

Branch: refs/heads/camel-2.16.x
Commit: e6bf8367bc6ae6b0ab14a6069964eb9956ed6689
Parents: 3e096a5
Author: Grzegorz Grzybek 
Authored: Fri Nov 18 17:04:55 2016 +0100
Committer: Grzegorz Grzybek 
Committed: Fri Nov 18 17:45:31 2016 +0100

--
 .../test/blueprint/CamelBlueprintHelper.java| 76 +++-
 .../org/apache/camel/test/blueprint/Main.java   | 15 +++-
 .../apache/camel/test/blueprint/MainTest.java   | 56 ++-
 3 files changed, 127 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e6bf8367/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
--
diff --git 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
index 9f811a2..eed2951 100644
--- 
a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
+++ 
b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java
@@ -113,18 +113,38 @@ public final class CamelBlueprintHelper {
 public static BundleContext createBundleContext(String name, String 
descriptors, boolean includeTestBundle,
 String bundleFilter, 
String testBundleVersion, String testBundleDirectives,
 String[] ... 
configAdminPidFiles) throws Exception {
+return createBundleContext(name, descriptors, includeTestBundle,
+bundleFilter, testBundleVersion, testBundleDirectives,
+null,
+configAdminPidFiles);
+}
+
+public static BundleContext createBundleContext(String name, String 
descriptors, boolean includeTestBundle,
+String bundleFilter, 
String testBundleVersion, String testBundleDirectives,
+ClassLoader loader,
+String[] ... 
configAdminPidFiles) throws Exception {
 TinyBundle bundle = null;
+TinyBundle configAdminInitBundle = null;
 
 if (includeTestBundle) {
 // add ourselves as a bundle
 bundle = createTestBundle(testBundleDirectives == null ? name : 
name + ';' + testBundleDirectives,
-testBundleVersion, descriptors, configAdminPidFiles);
+testBundleVersion, descriptors);
+}
+if (configAdminPidFiles != null) {
+configAdminInitBundle = 
createConfigAdminInitBundle(configAdminPidFiles);
 }
 
-return createBundleContext(name, bundleFilter, bundle);
+return createBundleContext(name, bundleFilter, bundle, 
configAdminInitBundle, loader);
 }
 
 public static BundleContext createBundleContext(String name, String 
bundleFilter, TinyBundle bundle) throws Exception {
+return createBundleContext(name, bundleFilter, bundle, null,null);
+}
+
+public static BundleContext createBundleContext(String name, String 
bundleFilter,
+TinyBundle bundle, 
TinyBundle configAdminInitBundle,
+ClassLoader loader) throws 
Exception {
 // ensure felix-connect stores bundles in an unique target directory
 String uid = "" + System.currentTimeMillis();
 String tempDir = "target/bundles/" + uid;
@@ -138,12 +158,17 @@ public final class CamelBlueprintHelper {
 
 List bundles = new LinkedList<>();
 
+if (configAdminInitBundle != null) {
+String jarName = "configAdminInitBundle-" + uid + ".jar";
+bundles.add(getBundleDescriptor("target/test-bundles/" + jarName, 
configAdminInitBundle));
+}
+
 if (bundle != null) {
 String jarName = name.toLowerCase(Locale.ENGLISH) + "-" + uid + 
".jar";
 bundles.add(getBundleDescriptor("target/test-bundles/" + jarName, 
bundle));
 }
 
-List bundleDescriptors = 
getBundleDescriptors(bundleFilter);
+List bundleDescriptors = 
getBundleDescriptors(bundleFilter, loader);

camel git commit: CAMEL-10494 Camel-Kubernetes: Consuming events from nodes

2016-11-18 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 8fbddbd7f -> 88de1d433


CAMEL-10494 Camel-Kubernetes: Consuming events from nodes


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

Branch: refs/heads/master
Commit: 88de1d433fe92c6a7b9dc410aff4d813c6102727
Parents: 8fbddbd
Author: Andrea Cosentino 
Authored: Fri Nov 18 11:41:50 2016 +0100
Committer: Andrea Cosentino 
Committed: Fri Nov 18 11:41:50 2016 +0100

--
 .../kubernetes/KubernetesEndpoint.java  |   4 +
 .../consumer/KubernetesNodesConsumer.java   | 118 
 .../kubernetes/consumer/common/NodeEvent.java   |  47 +++
 .../consumer/KubernetesNodesConsumerTest.java   | 136 +++
 4 files changed, 305 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/88de1d43/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java
--
diff --git 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java
 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java
index e520699..2934b64 100644
--- 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java
+++ 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java
@@ -26,6 +26,7 @@ import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import 
org.apache.camel.component.kubernetes.consumer.KubernetesNamespacesConsumer;
+import org.apache.camel.component.kubernetes.consumer.KubernetesNodesConsumer;
 import org.apache.camel.component.kubernetes.consumer.KubernetesPodsConsumer;
 import 
org.apache.camel.component.kubernetes.consumer.KubernetesReplicationControllersConsumer;
 import 
org.apache.camel.component.kubernetes.consumer.KubernetesServicesConsumer;
@@ -141,6 +142,9 @@ public class KubernetesEndpoint extends DefaultEndpoint {
 
 case KubernetesCategory.NAMESPACES:
 return new KubernetesNamespacesConsumer(this, processor);
+
+case KubernetesCategory.NODES:
+return new KubernetesNodesConsumer(this, processor);
 
 default:
 throw new IllegalArgumentException("The " + category + " 
consumer category doesn't exist");

http://git-wip-us.apache.org/repos/asf/camel/blob/88de1d43/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumer.java
--
diff --git 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumer.java
 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumer.java
new file mode 100644
index 000..f2a1d55
--- /dev/null
+++ 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumer.java
@@ -0,0 +1,118 @@
+/**
+ * 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.kubernetes.consumer;
+
+import java.util.concurrent.ExecutorService;
+
+import io.fabric8.kubernetes.api.model.DoneableNode;
+import io.fabric8.kubernetes.api.model.Node;
+import io.fabric8.kubernetes.api.model.NodeList;
+import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.dsl.ClientNonNamespaceOperation;
+import io.fabric8.kubernetes.client.dsl.ClientResource;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import

svn commit: r1001314 - in /websites/production/camel/content: book-in-one-page.html book-pattern-appendix.html cache/main.pageCache splitter.html

2016-11-18 Thread buildbot 
Author: buildbot
Date: Fri Nov 18 10:21:39 2016
New Revision: 1001314

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/book-pattern-appendix.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/splitter.html

Modified: websites/production/camel/content/book-in-one-page.html
==
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Fri Nov 18 10:21:39 
2016
@@ -3966,11 +3966,11 @@ The tutorial has been designed in two pa
 While not actual tutorials you might find working through the source of the 
various Examples useful.
 
 Tutorial on Spring 
Remoting with JMSThanksThis tutorial was kindly donated 
to Apache Camel by Martin Gilday.PrefaceThis tutorial aims to guide the 
reader through the stages of creating a project which uses Camel to facilitate 
the routing of messages from a JMS queue to a http://www.springramework.org; 
rel="nofollow">Spring service. The route works in a synchronous fashion 
returning a response to the client./**/
+/*]]>*/
 Tutorial on Spring 
Remoting with JMSPrefacePrerequisitesDistributionAboutCreate the Camel Project
 Update the POM with 
Dependencies
 Writing the 
Server
@@ -6085,11 +6085,11 @@ So we completed the last piece in the pi
 This example has been removed from Camel 2.9 onwards. 
Apache Axis 1.4 is a very old and unsupported framework. We encourage users to 
use CXF instead of Axis.
 
 /**/
+/*]]>*/
 Tutorial using Axis 
1.4 with Apache Camel
 PrerequisitesDistributionIntroductionSetting up the project to 
run Axis
 Maven 2wsdlConfiguring AxisRunning the 
Example
@@ -12318,7 +12318,7 @@ from(direct:start)
  
 Using This Pattern If you would 
like to use this EIP Pattern then please read the Getting Started, you may also find the Architecture useful particularly the 
description of Endpoint and URIs. Then you could try out some of the Examples first before trying this pattern 
out.SplitterThe http://www.enterpriseintegrationpatterns.com/Sequencer.html; 
rel="nofollow">Splitter from the EIP patterns allows you split a 
message into a number of pieces and process them individuallyhttp://www.enterpriseintegrationpatterns.com/img/Sequencer.gif; 
data-image-src="http://www.enterpriseintegrationpatterns.com/img/Sequencer.gif;>You
 need to specify a Splitter as split(). In earlier versions of 
Camel, you need to use splitter().Options
   
-  NameDefault ValueDescriptionstrategyRefRefers to an http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/processor/aggregate/AggregationStrategy.html;>AggregationStrategy
 to be used to assemble the replies from the sub-messages, into a single 
outgoing message from the Splitter. 
See the defaults described below in What the Splitter 
returns. From Camel 2.12 onwards y
 ou can also use a POJO as the AggregationStrategy, see the Aggregate page for more details. If an 
exception is thrown from the aggregate method in the AggregationStrategy, then 
by default, that exceptionis not handled by the error handler. The error 
handler can be enabled to react if enabling the shareUnitOfWork 
option.strategyMethodNameCamel 2.12: This option can be used to 
explicit declare the method name to use, when using POJOs as the 
AggregationStrategy. See the Aggregate page for more 
details.strategyMethodAllowNullfalseCamel 2.12: If this option is 
false then the aggregate method is not used for the very first 
splitted message. If this option is true then null 
values is used as the oldExchange (for the very first message 
splitted), when using POJOs as the AggregationStrategy. See the Aggregate page for more 
details.parallelProcessingfalseIf enabled then processing the sub-messages 
occurs concurrently. Note the caller thread will still wait until all 
sub-messages has been fully processed, before it continues.parallelAggregatefalseCamel 2.14: If enabled 
then the aggregate method on AggregationStrategy can 
be called concurrently. Notice that this would require the implementation of 
AggregationStrategy to be implemented as