Author: azeez
Date: Mon Jan 7 00:16:26 2008
New Revision: 11913
Log:
Use org.wso2.wsas as the JMX domain name
Modified:
trunk/commons/statistics/modules/core/src/main/java/org/wso2/statistics/service/StatisticsService.java
trunk/commons/utils/src/main/java/org/wso2/utils/MBeanRegistrar.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
trunk/wsas/java/modules/core/conf/server.xml
Modified:
trunk/commons/statistics/modules/core/src/main/java/org/wso2/statistics/service/StatisticsService.java
==============================================================================
---
trunk/commons/statistics/modules/core/src/main/java/org/wso2/statistics/service/StatisticsService.java
(original)
+++
trunk/commons/statistics/modules/core/src/main/java/org/wso2/statistics/service/StatisticsService.java
Mon Jan 7 00:16:26 2008
@@ -27,7 +27,6 @@
import org.wso2.statistics.module.StatisticsModule;
import org.wso2.utils.AbstractAdmin;
import org.wso2.utils.MBeanRegistrar;
-import org.wso2.utils.ServerConfiguration;
import javax.xml.namespace.QName;
import java.util.Iterator;
@@ -36,20 +35,9 @@
*
*/
public class StatisticsService extends AbstractAdmin implements
StatisticsServiceMBean {
- private static Log log = LogFactory.getLog(StatisticsService.class);
static {
- String jmxPort =
ServerConfiguration.getInstance().getFirstProperty("Ports.JMX");
- if (jmxPort != null) {
- try {
- MBeanRegistrar.
- registerMBean(new StatisticsService(),
"WSO2:type=Statistics");
- } catch (Exception e) {
- String msg = "Could not register StatisticsService MBean";
- log.error(msg, e);
- throw new RuntimeException(msg, e);
- }
- }
+ MBeanRegistrar.registerMBean(new StatisticsService());
}
public StatisticsService() {
Modified: trunk/commons/utils/src/main/java/org/wso2/utils/MBeanRegistrar.java
==============================================================================
--- trunk/commons/utils/src/main/java/org/wso2/utils/MBeanRegistrar.java
(original)
+++ trunk/commons/utils/src/main/java/org/wso2/utils/MBeanRegistrar.java
Mon Jan 7 00:16:26 2008
@@ -15,6 +15,9 @@
*/
package org.wso2.utils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import javax.management.MBeanServer;
import javax.management.ObjectName;
import java.util.Set;
@@ -23,6 +26,8 @@
* The class which is responsible for registering MBeans
*/
public class MBeanRegistrar {
+ private static Log log = LogFactory.getLog(MBeanRegistrar.class);
+
public static void registerMBean(Object mbeanInstance,
String objectName) throws Exception {
@@ -30,6 +35,30 @@
Set set = mbs.queryNames(new ObjectName(objectName), null);
if (set.isEmpty()) {
mbs.registerMBean(mbeanInstance, new ObjectName(objectName));
+ } else {
+ throw new Exception("MBean " + objectName + " already exists");
+ }
+ }
+
+ public static void registerMBean(Object mbeanInstance) {
+ String jmxPort =
ServerConfiguration.getInstance().getFirstProperty("Ports.JMX");
+ String serverPackage =
ServerConfiguration.getInstance().getFirstProperty("Package");
+ if (serverPackage == null) {
+ serverPackage = "wso2";
+ }
+ if (jmxPort != null) {
+ try {
+ String className = mbeanInstance.getClass().getName();
+ if(className.indexOf(".") != -1){
+ className = className.substring(className.lastIndexOf(".")
+ 1);
+ }
+ MBeanRegistrar.
+ registerMBean(mbeanInstance, serverPackage + ":type="
+ className);
+ } catch (Exception e) {
+ String msg = "Could not register " + mbeanInstance.getClass()
+ " MBean";
+ log.error(msg, e);
+ throw new RuntimeException(msg, e);
+ }
}
}
}
Modified:
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
==============================================================================
---
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
(original)
+++
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
Mon Jan 7 00:16:26 2008
@@ -40,17 +40,7 @@
private Controllable controllable;
static {
- String jmxPort =
ServerConfiguration.getInstance().getFirstProperty("Ports.JMX");
- if (jmxPort != null) {
- try {
- MBeanRegistrar.
- registerMBean(new ServerAdmin(),
"WSO2:type=ServerAdmin");
- } catch (Exception e) {
- String msg = "Could not register ServerAdmin MBean";
- log.error(msg, e);
- throw new RuntimeException(msg, e);
- }
- }
+ MBeanRegistrar.registerMBean(new ServerAdmin());
}
public ServerAdmin() {
Modified:
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
---
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
(original)
+++
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
Mon Jan 7 00:16:26 2008
@@ -115,19 +115,9 @@
"Cannot remove transport binding. " +
"<br/>A service must contain at least one transport binding!";
private PersistenceManager pm = new PersistenceManager();
-
+
static {
- String jmxPort =
ServerConfiguration.getInstance().getFirstProperty("Ports.JMX");
- if (jmxPort != null) {
- try {
- MBeanRegistrar.
- registerMBean(new ServiceAdmin(),
"WSO2:type=ServiceAdmin");
- } catch (Exception e) {
- String msg = "Could not register ServiceAdmin MBean";
- log.error(msg, e);
- throw new RuntimeException(msg, e);
- }
- }
+ MBeanRegistrar.registerMBean(new ServiceAdmin());
}
public ServiceAdmin() {
Modified: trunk/wsas/java/modules/core/conf/server.xml
==============================================================================
--- trunk/wsas/java/modules/core/conf/server.xml (original)
+++ trunk/wsas/java/modules/core/conf/server.xml Mon Jan 7 00:16:26 2008
@@ -30,6 +30,11 @@
<Name>WSO2 WSAS</Name>
<!--
+ The fully qualified name of the server
+ -->
+ <Package>org.wso2.wsas</Package>
+
+ <!--
The version of this WSO2 WSAS distribution
-->
<Version>@wso2wsas_version@</Version>
_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
