You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/02/24 08:25:04 UTC
[1/3] camel git commit: Fixed CS. This closes #855. This closes #849.
This closes #848. This closes #519.
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 0766a0678 -> 459a8b67d
refs/heads/camel-2.16.x 35c494e51 -> b77804759
refs/heads/master 4a1679054 -> 8466e1273
Fixed CS. This closes #855. This closes #849. This closes #848. This closes #519.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8466e127
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8466e127
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8466e127
Branch: refs/heads/master
Commit: 8466e1273c8c54f3ea3bcdbb6ebbdc929da1d559
Parents: 4a16790
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 24 08:17:25 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 24 08:17:25 2016 +0100
----------------------------------------------------------------------
.../camel/test/blueprint/CamelBlueprintTestSupport.java | 2 +-
.../ConfigAdminNoDefaultValuesBlueprintCreationTest.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8466e127/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 35f55f8..928d257 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
@@ -154,7 +154,7 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport {
// to the same state of BP container
Set<Long> bpEvents = new HashSet<>();
- if(!expectReload){
+ if (!expectReload) {
CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, symbolicName, BlueprintEvent.CREATED, null);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8466e127/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
index f19342b..8ace8c9 100644
--- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
+++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
@@ -16,16 +16,17 @@
*/
package org.apache.camel.test.blueprint;
-import org.junit.Test;
import java.util.Dictionary;
+import org.junit.Test;
+
/**
*
*/
public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends CamelBlueprintTestSupport {
@Override
- protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate(){
+ protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate() {
return true;
}
@@ -35,8 +36,7 @@ public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends CamelBluepr
}
@Override
- protected String useOverridePropertiesWithConfigAdmin(Dictionary props)
- throws Exception {
+ protected String useOverridePropertiesWithConfigAdmin(Dictionary props) throws Exception {
props.put("greeting", "Bye");
props.put("destination", "mock:result");
return "my-placeholders";
[2/3] camel git commit: Fixed CS. This closes #855. This closes #849.
This closes #848. This closes #519.
Posted by da...@apache.org.
Fixed CS. This closes #855. This closes #849. This closes #848. This closes #519.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b7780475
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b7780475
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b7780475
Branch: refs/heads/camel-2.16.x
Commit: b77804759488ef0813d187b5d8b095c5d8db5f47
Parents: 35c494e
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 24 08:17:25 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 24 08:24:37 2016 +0100
----------------------------------------------------------------------
.../camel/test/blueprint/CamelBlueprintTestSupport.java | 2 +-
.../ConfigAdminNoDefaultValuesBlueprintCreationTest.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b7780475/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 35f55f8..928d257 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
@@ -154,7 +154,7 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport {
// to the same state of BP container
Set<Long> bpEvents = new HashSet<>();
- if(!expectReload){
+ if (!expectReload) {
CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, symbolicName, BlueprintEvent.CREATED, null);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b7780475/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
index f19342b..8ace8c9 100644
--- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
+++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
@@ -16,16 +16,17 @@
*/
package org.apache.camel.test.blueprint;
-import org.junit.Test;
import java.util.Dictionary;
+import org.junit.Test;
+
/**
*
*/
public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends CamelBlueprintTestSupport {
@Override
- protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate(){
+ protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate() {
return true;
}
@@ -35,8 +36,7 @@ public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends CamelBluepr
}
@Override
- protected String useOverridePropertiesWithConfigAdmin(Dictionary props)
- throws Exception {
+ protected String useOverridePropertiesWithConfigAdmin(Dictionary props) throws Exception {
props.put("greeting", "Bye");
props.put("destination", "mock:result");
return "my-placeholders";
[3/3] camel git commit: Fixed CS. This closes #855. This closes #849.
This closes #848. This closes #519.
Posted by da...@apache.org.
Fixed CS. This closes #855. This closes #849. This closes #848. This closes #519.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/459a8b67
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/459a8b67
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/459a8b67
Branch: refs/heads/camel-2.15.x
Commit: 459a8b67d5ff395f5062279a0eb66d9e18a45dae
Parents: 0766a06
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 24 08:17:25 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 24 08:24:52 2016 +0100
----------------------------------------------------------------------
.../camel/test/blueprint/CamelBlueprintTestSupport.java | 2 +-
.../ConfigAdminNoDefaultValuesBlueprintCreationTest.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/459a8b67/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 0ee9066..48bc05d 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
@@ -144,7 +144,7 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport {
// to the same state of BP container
Set<Long> bpEvents = new HashSet<Long>();
- if(!expectReload){
+ if (!expectReload) {
CamelBlueprintHelper.waitForBlueprintContainer(bpEvents, answer, symbolicName, BlueprintEvent.CREATED, null);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/459a8b67/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
index f19342b..8ace8c9 100644
--- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
+++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
@@ -16,16 +16,17 @@
*/
package org.apache.camel.test.blueprint;
-import org.junit.Test;
import java.util.Dictionary;
+import org.junit.Test;
+
/**
*
*/
public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends CamelBlueprintTestSupport {
@Override
- protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate(){
+ protected boolean expectBlueprintContainerReloadOnConfigAdminUpdate() {
return true;
}
@@ -35,8 +36,7 @@ public class ConfigAdminNoDefaultValuesBlueprintCreationTest extends CamelBluepr
}
@Override
- protected String useOverridePropertiesWithConfigAdmin(Dictionary props)
- throws Exception {
+ protected String useOverridePropertiesWithConfigAdmin(Dictionary props) throws Exception {
props.put("greeting", "Bye");
props.put("destination", "mock:result");
return "my-placeholders";