You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by no...@apache.org on 2011/07/07 20:10:03 UTC
svn commit: r1143946 - in /aries/trunk/jmx:
jmx-core/src/main/java/org/apache/aries/jmx/framework/
jmx-core/src/main/java/org/apache/aries/jmx/util/shared/ jmx-whiteboard/
jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/
Author: not
Date: Thu Jul 7 18:10:03 2011
New Revision: 1143946
URL: http://svn.apache.org/viewvc?rev=1143946&view=rev
Log:
ARIES-686 The whiteboard project currently registers MBeans as a StandardMBean, however this does not work too well as MBeans that emit notifications don't work. The core bundle has a class that makes this work. Moving this to its own package means we can share it between the whiteboard and core projects simply. So this moves a class in jmx-core into a new package, updates references to it and then uses this from the jmx-whiteboard project.
Added:
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/util/shared/
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/util/shared/RegistrableStandardEmitterMBean.java (contents, props changed)
- copied, changed from r1139030, aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/RegistrableStandardEmitterMBean.java
Removed:
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/RegistrableStandardEmitterMBean.java
Modified:
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleStateMBeanHandler.java
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceStateMBeanHandler.java
aries/trunk/jmx/jmx-whiteboard/pom.xml
aries/trunk/jmx/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java
Modified: aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleStateMBeanHandler.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleStateMBeanHandler.java?rev=1143946&r1=1143945&r2=1143946&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleStateMBeanHandler.java (original)
+++ aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/BundleStateMBeanHandler.java Thu Jul 7 18:10:03 2011
@@ -23,6 +23,7 @@ import javax.management.StandardMBean;
import org.apache.aries.jmx.Logger;
import org.apache.aries.jmx.MBeanHandler;
+import org.apache.aries.jmx.util.shared.RegistrableStandardEmitterMBean;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.jmx.framework.BundleStateMBean;
Modified: aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceStateMBeanHandler.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceStateMBeanHandler.java?rev=1143946&r1=1143945&r2=1143946&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceStateMBeanHandler.java (original)
+++ aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/ServiceStateMBeanHandler.java Thu Jul 7 18:10:03 2011
@@ -23,6 +23,7 @@ import javax.management.StandardMBean;
import org.apache.aries.jmx.Logger;
import org.apache.aries.jmx.MBeanHandler;
+import org.apache.aries.jmx.util.shared.RegistrableStandardEmitterMBean;
import org.osgi.framework.BundleContext;
import org.osgi.jmx.framework.ServiceStateMBean;
import org.osgi.service.log.LogService;
Copied: aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/util/shared/RegistrableStandardEmitterMBean.java (from r1139030, aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/RegistrableStandardEmitterMBean.java)
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/util/shared/RegistrableStandardEmitterMBean.java?p2=aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/util/shared/RegistrableStandardEmitterMBean.java&p1=aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/RegistrableStandardEmitterMBean.java&r1=1139030&r2=1143946&rev=1143946&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/framework/RegistrableStandardEmitterMBean.java (original)
+++ aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/util/shared/RegistrableStandardEmitterMBean.java Thu Jul 7 18:10:03 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.aries.jmx.framework;
+package org.apache.aries.jmx.util.shared;
import javax.management.ListenerNotFoundException;
import javax.management.MBeanInfo;
Propchange: aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/util/shared/RegistrableStandardEmitterMBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/util/shared/RegistrableStandardEmitterMBean.java
------------------------------------------------------------------------------
svn:keywords = Revision Date
Propchange: aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/util/shared/RegistrableStandardEmitterMBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: aries/trunk/jmx/jmx-whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-whiteboard/pom.xml?rev=1143946&r1=1143945&r2=1143946&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-whiteboard/pom.xml (original)
+++ aries/trunk/jmx/jmx-whiteboard/pom.xml Thu Jul 7 18:10:03 2011
@@ -69,7 +69,8 @@
<aries.osgi.export.pkg>
</aries.osgi.export.pkg>
<aries.osgi.private.pkg>
- org.apache.aries.jmx.whiteboard
+ org.apache.aries.jmx.whiteboard,
+ org.apache.aries.jmx.util.shared
</aries.osgi.private.pkg>
<aries.osgi.import.service>
javax.management.MBeanServer
@@ -121,6 +122,13 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.aries.jmx</groupId>
+ <artifactId>org.apache.aries.jmx.core</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
<!-- OSGi Libraries -->
<dependency>
Modified: aries/trunk/jmx/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java
URL: http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java?rev=1143946&r1=1143945&r2=1143946&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java (original)
+++ aries/trunk/jmx/jmx-whiteboard/src/main/java/org/apache/aries/jmx/whiteboard/MBeanHolder.java Thu Jul 7 18:10:03 2011
@@ -32,6 +32,7 @@ import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.management.StandardMBean;
+import org.apache.aries.jmx.util.shared.RegistrableStandardEmitterMBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,7 +68,7 @@ final class MBeanHolder {
}
try {
- StandardMBean stdMbean = new StandardMBean(mbean, mbeanInterface);
+ StandardMBean stdMbean = new RegistrableStandardEmitterMBean(mbean, mbeanInterface);
return new MBeanHolder(stdMbean, requestedObjectName);
} catch (NotCompliantMBeanException e) {
LoggerFactory.getLogger(MBeanHolder.class).error(