Author: ieb
Date: Tue Feb 26 04:50:27 2013
New Revision: 1450023
URL: http://svn.apache.org/r1450023
Log:
SLING-2751 Fixed JMX names for event JMX objects.
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/AllJobStatisticsMBean.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/AllJobStatisticsMBean.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/AllJobStatisticsMBean.java?rev=1450023&r1=1450022&r2=1450023&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/AllJobStatisticsMBean.java
(original)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/AllJobStatisticsMBean.java
Tue Feb 26 04:50:27 2013
@@ -28,7 +28,7 @@ import org.apache.sling.event.jobs.jmx.S
@Component(immediate = true)
@Service(value = StatisticsMBean.class)
-@Properties(@Property(name = "jmx.objectname", value =
"org.apache.sling.event.AllJobs:type=Statistics"))
+@Properties(@Property(name = "jmx.objectname", value =
"org.apache.sling:type=queues,name=AllQueues"))
public class AllJobStatisticsMBean extends AbstractJobStatistics {
private static final long TTL = 1000L;
private long agregateStatisticsTTL = 0L;
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java?rev=1450023&r1=1450022&r2=1450023&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java
(original)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jmx/QueuesMBeanImpl.java
Tue Feb 26 04:50:27 2013
@@ -52,7 +52,7 @@ import org.osgi.service.event.EventHandl
@Component(immediate = true)
@Service(value = { QueuesMBean.class, EventHandler.class })
@Properties({
- @Property(name = "jmx.objectname", propertyPrivate = true, value =
"org.apache.sling.event.Queues:type=Statistics"),
+ @Property(name = "jmx.objectname", propertyPrivate = true, value =
"org.apache.sling:type=queues,name=QueueNames"),
@Property(name = "event.topics", propertyPrivate = true, value = {
QueueStatusEvent.TOPIC }) })
public class QueuesMBeanImpl extends StandardEmitterMBean implements
QueuesMBean, EventHandler {
@@ -163,7 +163,7 @@ public class QueuesMBeanImpl extends Sta
ServiceRegistration serviceRegistration = bundleContext
.registerService(StatisticsMBean.class.getName(), queueMBean,
createProperties(
-
"jmx.objectname","org.apache.sling.event.queue."+queue.getName()+":type=Statistics",
+
"jmx.objectname","org.apache.sling:type=queues,name="+queue.getName(),
Constants.SERVICE_DESCRIPTION, "QueueMBean for
queue "+queue.getName(),
Constants.SERVICE_VENDOR,"Apache"));
QueueMBeanHolder queueMBeanHolder = new QueueMBeanHolder(
