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 2015/12/12 20:18:59 UTC
[1/2] camel git commit: CS fixes
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 2410bfa5b -> fcb69ae3e
refs/heads/master 13760a4a5 -> cfe9cc318
CS fixes
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cfe9cc31
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cfe9cc31
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cfe9cc31
Branch: refs/heads/master
Commit: cfe9cc31829e3c822c31a08d6a7ad92a5f9269ca
Parents: 13760a4
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Sat Dec 12 20:18:22 2015 +0100
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Sat Dec 12 20:18:22 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/test/blueprint/CamelBlueprintHelper.java | 3 ++-
.../apache/camel/test/blueprint/CamelBlueprintTestSupport.java | 2 +-
.../src/main/java/org/apache/camel/test/blueprint/Main.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cfe9cc31/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 33e9097..b99814c 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
@@ -145,7 +145,8 @@ public final class CamelBlueprintHelper {
List<BundleDescriptor> bundleDescriptors = getBundleDescriptors(bundleFilter);
// let's put configadmin before blueprint.core
- int idx1=-1, idx2=-1;
+ int idx1 = -1;
+ int idx2 = -1;
for (int i = 0; i < bundleDescriptors.size(); i++) {
BundleDescriptor bd = bundleDescriptors.get(i);
if ("org.apache.felix.configadmin".equals(bd.getHeaders().get("Bundle-SymbolicName"))) {
http://git-wip-us.apache.org/repos/asf/camel/blob/cfe9cc31/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
index 642ee14..1340218 100644
--- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
+++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
@@ -177,7 +177,7 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport {
if (currentProperties == null) {
currentProperties = newProps;
}
- for (Enumeration<String> ek = currentProperties.keys(); ek.hasMoreElements(); ) {
+ for (Enumeration<String> ek = currentProperties.keys(); ek.hasMoreElements();) {
String k = ek.nextElement();
newProps.put(k, currentProperties.get(k));
}
http://git-wip-us.apache.org/repos/asf/camel/blob/cfe9cc31/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
index 0812467..15f16be 100644
--- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
+++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
@@ -100,7 +100,7 @@ public class Main extends MainSupport {
LOG.debug("Starting Blueprint XML file: " + descriptors);
if (configAdminPid != null && configAdminFileName != null) {
// pid/file is used to set INITIAL content of ConfigAdmin to be used when blueprint container is started
- bundleContext = createBundleContext(bundleName, new String[] { configAdminFileName, configAdminPid });
+ bundleContext = createBundleContext(bundleName, new String[] {configAdminFileName, configAdminPid});
} else {
bundleContext = createBundleContext(bundleName);
}
[2/2] camel git commit: CS fixes
Posted by gg...@apache.org.
CS fixes
(cherry picked from commit cfe9cc31829e3c822c31a08d6a7ad92a5f9269ca)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fcb69ae3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fcb69ae3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fcb69ae3
Branch: refs/heads/camel-2.16.x
Commit: fcb69ae3e90cb149969f2eb492966e120482919d
Parents: 2410bfa
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Sat Dec 12 20:18:22 2015 +0100
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Sat Dec 12 20:18:34 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/test/blueprint/CamelBlueprintHelper.java | 3 ++-
.../apache/camel/test/blueprint/CamelBlueprintTestSupport.java | 2 +-
.../src/main/java/org/apache/camel/test/blueprint/Main.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fcb69ae3/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 33e9097..b99814c 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
@@ -145,7 +145,8 @@ public final class CamelBlueprintHelper {
List<BundleDescriptor> bundleDescriptors = getBundleDescriptors(bundleFilter);
// let's put configadmin before blueprint.core
- int idx1=-1, idx2=-1;
+ int idx1 = -1;
+ int idx2 = -1;
for (int i = 0; i < bundleDescriptors.size(); i++) {
BundleDescriptor bd = bundleDescriptors.get(i);
if ("org.apache.felix.configadmin".equals(bd.getHeaders().get("Bundle-SymbolicName"))) {
http://git-wip-us.apache.org/repos/asf/camel/blob/fcb69ae3/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
index 642ee14..1340218 100644
--- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
+++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
@@ -177,7 +177,7 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport {
if (currentProperties == null) {
currentProperties = newProps;
}
- for (Enumeration<String> ek = currentProperties.keys(); ek.hasMoreElements(); ) {
+ for (Enumeration<String> ek = currentProperties.keys(); ek.hasMoreElements();) {
String k = ek.nextElement();
newProps.put(k, currentProperties.get(k));
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fcb69ae3/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
index 0812467..15f16be 100644
--- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
+++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java
@@ -100,7 +100,7 @@ public class Main extends MainSupport {
LOG.debug("Starting Blueprint XML file: " + descriptors);
if (configAdminPid != null && configAdminFileName != null) {
// pid/file is used to set INITIAL content of ConfigAdmin to be used when blueprint container is started
- bundleContext = createBundleContext(bundleName, new String[] { configAdminFileName, configAdminPid });
+ bundleContext = createBundleContext(bundleName, new String[] {configAdminFileName, configAdminPid});
} else {
bundleContext = createBundleContext(bundleName);
}