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 2015/07/11 08:30:47 UTC
[1/2] camel git commit: CXF upgrade
Repository: camel
Updated Branches:
refs/heads/master 967c91dfd -> 847065993
CXF upgrade
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ffd352a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ffd352a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ffd352a
Branch: refs/heads/master
Commit: 2ffd352a69b0a498520c215793a5ef886435c7a2
Parents: 967c91d
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jul 11 08:18:00 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jul 11 08:18:00 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2ffd352a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4a621f4..c2905c7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -123,7 +123,7 @@
<concurrentlinkedhashmap.version>1.4.2</concurrentlinkedhashmap.version>
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<cxf-version>3.1.1</cxf-version>
- <cxf-version-range>[2.7,4.0)</cxf-version-range>
+ <cxf-version-range>[3.0,4.0)</cxf-version-range>
<cxf-xjc-utils-version>3.0.3</cxf-xjc-utils-version>
<deltaspike-version>1.4.1</deltaspike-version>
<derby-version>10.11.1.1</derby-version>
[2/2] camel git commit: CAMEL-6858: Delayer EIP - Add JMX attribute
to know if any messages are delayed
Posted by da...@apache.org.
CAMEL-6858: Delayer EIP - Add JMX attribute to know if any messages are delayed
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/84706599
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/84706599
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/84706599
Branch: refs/heads/master
Commit: 847065993f349d6a035552fc0d69941b8a45599f
Parents: 2ffd352
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jul 11 08:37:17 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jul 11 08:37:17 2015 +0200
----------------------------------------------------------------------
.../apache/camel/api/management/mbean/ManagedDelayerMBean.java | 3 +++
.../java/org/apache/camel/management/mbean/ManagedDelayer.java | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/84706599/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedDelayerMBean.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedDelayerMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedDelayerMBean.java
index 1cc0061..5f28641 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedDelayerMBean.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedDelayerMBean.java
@@ -27,4 +27,7 @@ public interface ManagedDelayerMBean extends ManagedProcessorMBean {
@ManagedOperation(description = "Set a constant delay in millis")
void constantDelay(Integer millis);
+ @ManagedAttribute(description = "Number of exchanges currently delayed")
+ int getDelayedCount();
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/84706599/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
index 5f77399..ce2a45e 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedDelayer.java
@@ -49,4 +49,7 @@ public class ManagedDelayer extends ManagedProcessor implements ManagedDelayerMB
getDelayer().setDelay(delay);
}
+ public int getDelayedCount() {
+ return getDelayer().getDelayedCount();
+ }
}