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/08/22 15:21:08 UTC
[1/3] git commit: CAMEL-6586: Added missing JMX attributes to seda
endpoint. Thanks to Zemian Deng for the patch.
Updated Branches:
refs/heads/camel-2.10.x 7edc4929d -> 5654b18b5
refs/heads/camel-2.11.x 3d2b9a89a -> ba58c25cd
refs/heads/master 5a0697421 -> d23719f39
CAMEL-6586: Added missing JMX attributes to seda endpoint. Thanks to Zemian Deng for the patch.
Conflicts:
camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ba58c25c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ba58c25c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ba58c25c
Branch: refs/heads/camel-2.11.x
Commit: ba58c25cda232a0cc25f6be4f2563b723c3f4c02
Parents: 3d2b9a8
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Aug 22 15:16:17 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Aug 22 15:18:13 2013 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/seda/SedaEndpoint.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ba58c25c/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index 7faa956..452c88f 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -370,6 +370,16 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
return EndpointHelper.browseRangeMessagesAsXml(this, fromIndex, toIndex, includeBody);
}
+ @ManagedAttribute(description = "Camel context name")
+ public String getCamelId() {
+ return getCamelContext().getName();
+ }
+
+ @ManagedAttribute(description = "Endpoint service state")
+ public String getState() {
+ return getStatus().name();
+ }
+
void onStarted(SedaProducer producer) {
producers.add(producer);
}
[3/3] git commit: CAMEL-6586: Added missing JMX attributes to seda
endpoint. Thanks to Zemian Deng for the patch.
Posted by da...@apache.org.
CAMEL-6586: Added missing JMX attributes to seda endpoint. Thanks to Zemian Deng for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d23719f3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d23719f3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d23719f3
Branch: refs/heads/master
Commit: d23719f3909caf19d0b150a3799d9961fbbe5774
Parents: 5a06974
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Aug 22 15:16:17 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Aug 22 15:20:54 2013 +0200
----------------------------------------------------------------------
.../camel/component/seda/SedaEndpoint.java | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d23719f3/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index 228eb00..f2c5fca 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -415,6 +415,16 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
return EndpointHelper.browseRangeMessagesAsXml(this, fromIndex, toIndex, includeBody);
}
+ @ManagedAttribute(description = "Camel context name")
+ public String getCamelId() {
+ return getCamelContext().getName();
+ }
+
+ @ManagedAttribute(description = "Endpoint service state")
+ public String getState() {
+ return getStatus().name();
+ }
+
void onStarted(SedaProducer producer) {
producers.add(producer);
}
@@ -437,6 +447,10 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
}
}
+ public boolean hasConsumers() {
+ return this.consumers.size() > 0;
+ }
+
@Override
protected void doStart() throws Exception {
super.doStart();
@@ -492,10 +506,4 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
queue = null;
}
- public boolean hasConsumers() {
- if (this.consumers == null) {
- return false;
- }
- return this.consumers.size() > 0;
- }
}
[2/3] git commit: CAMEL-6586: Added missing JMX attributes to seda
endpoint. Thanks to Zemian Deng for the patch.
Posted by da...@apache.org.
CAMEL-6586: Added missing JMX attributes to seda endpoint. Thanks to Zemian Deng for the patch.
Conflicts:
camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5654b18b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5654b18b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5654b18b
Branch: refs/heads/camel-2.10.x
Commit: 5654b18b5ceca4b07dfabe21bd446f194d5b4dbe
Parents: 7edc492
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Aug 22 15:16:17 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Aug 22 15:18:34 2013 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/seda/SedaEndpoint.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5654b18b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index e33d21d..470f766 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -332,6 +332,16 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
return EndpointHelper.browseRangeMessagesAsXml(this, fromIndex, toIndex, includeBody);
}
+ @ManagedAttribute(description = "Camel context name")
+ public String getCamelId() {
+ return getCamelContext().getName();
+ }
+
+ @ManagedAttribute(description = "Endpoint service state")
+ public String getState() {
+ return getStatus().name();
+ }
+
void onStarted(SedaProducer producer) {
producers.add(producer);
}