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 2013/10/03 18:00:20 UTC
[1/4] git commit: Use karaf 2.3.3
Updated Branches:
refs/heads/camel-2.12.x 652a05f5d -> b0c7920b7
refs/heads/master e90d061b2 -> a27ca6c8e
Use karaf 2.3.3
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/196f5274
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/196f5274
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/196f5274
Branch: refs/heads/master
Commit: 196f5274a7f78729831ab9447dfc389c954e15fa
Parents: e90d061
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 3 13:39:00 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 3 13:39:00 2013 +0200
----------------------------------------------------------------------
.../org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/196f5274/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
index 8441215..84980e2 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
@@ -133,7 +133,7 @@ public class OSGiIntegrationTestSupport extends CamelTestSupport {
karafDistributionConfiguration()
.frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
// This version is not actual karaf version that we use.
- .karafVersion("2.3.1")
+ .karafVersion("2.3.3")
.name("Apache Karaf")
.useDeployFolder(false).unpackDirectory(new File("target/paxexam/unpack/")),
[2/4] git commit: Added trace logging when getting correlation key
from map in camel-jms.
Posted by da...@apache.org.
Added trace logging when getting correlation key from map in camel-jms.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a27ca6c8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a27ca6c8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a27ca6c8
Branch: refs/heads/master
Commit: a27ca6c8e09e67023271fe69ac6362007f7d03be
Parents: 196f527
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 3 17:59:26 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 3 17:59:26 2013 +0200
----------------------------------------------------------------------
.../camel/component/jms/reply/CorrelationTimeoutMap.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a27ca6c8/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
index fdc96e6..7b279d9 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
@@ -57,6 +57,13 @@ public class CorrelationTimeoutMap extends DefaultTimeoutMap<String, ReplyHandle
}
@Override
+ public ReplyHandler get(String key) {
+ ReplyHandler answer = super.get(key);
+ log.trace("Get correlationID: {} -> {}", key, answer != null);
+ return answer;
+ }
+
+ @Override
public void put(String key, ReplyHandler value, long timeoutMillis) {
try {
if (listener != null) {
[3/4] git commit: Use karaf 2.3.3
Posted by da...@apache.org.
Use karaf 2.3.3
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fcf4684c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fcf4684c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fcf4684c
Branch: refs/heads/camel-2.12.x
Commit: fcf4684cb845f23ddd9a381e7712c98279669d60
Parents: 652a05f
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 3 13:39:00 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 3 17:59:52 2013 +0200
----------------------------------------------------------------------
.../org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fcf4684c/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
index 8441215..84980e2 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
@@ -133,7 +133,7 @@ public class OSGiIntegrationTestSupport extends CamelTestSupport {
karafDistributionConfiguration()
.frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
// This version is not actual karaf version that we use.
- .karafVersion("2.3.1")
+ .karafVersion("2.3.3")
.name("Apache Karaf")
.useDeployFolder(false).unpackDirectory(new File("target/paxexam/unpack/")),
[4/4] git commit: Added trace logging when getting correlation key
from map in camel-jms.
Posted by da...@apache.org.
Added trace logging when getting correlation key from map in camel-jms.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b0c7920b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b0c7920b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b0c7920b
Branch: refs/heads/camel-2.12.x
Commit: b0c7920b7cd345c16b89629f109a3fb6c97eb6f0
Parents: fcf4684
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 3 17:59:26 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 3 18:00:07 2013 +0200
----------------------------------------------------------------------
.../camel/component/jms/reply/CorrelationTimeoutMap.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b0c7920b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
index fdc96e6..7b279d9 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationTimeoutMap.java
@@ -57,6 +57,13 @@ public class CorrelationTimeoutMap extends DefaultTimeoutMap<String, ReplyHandle
}
@Override
+ public ReplyHandler get(String key) {
+ ReplyHandler answer = super.get(key);
+ log.trace("Get correlationID: {} -> {}", key, answer != null);
+ return answer;
+ }
+
+ @Override
public void put(String key, ReplyHandler value, long timeoutMillis) {
try {
if (listener != null) {