You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gg...@apache.org on 2016/11/18 17:06:07 UTC

[1/4] camel git commit: Fixed CS

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 <gr...@gmail.com>
Authored: Fri Nov 18 18:05:26 2016 +0100
Committer: Grzegorz Grzybek <gr...@gmail.com>
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);


[4/4] camel git commit: Fixed CS

Posted by gg...@apache.org.
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 <gr...@gmail.com>
Authored: Fri Nov 18 18:05:26 2016 +0100
Committer: Grzegorz Grzybek <gr...@gmail.com>
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);


[3/4] camel git commit: Fixed CS

Posted by gg...@apache.org.
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 <gr...@gmail.com>
Authored: Fri Nov 18 18:05:26 2016 +0100
Committer: Grzegorz Grzybek <gr...@gmail.com>
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);


[2/4] camel git commit: Fixed CS

Posted by gg...@apache.org.
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 <gr...@gmail.com>
Authored: Fri Nov 18 18:05:26 2016 +0100
Committer: Grzegorz Grzybek <gr...@gmail.com>
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);