Update Issue 131

Remove catalina dependencies

Author: vladimirralev

management/sip-servlets-management/src/main/java/org/mobicents/servlet/management/server/configuration/ConfigurationServiceImpl.java

@@ -22,15 +22,16 @@
 
 package org.mobicents.servlet.management.server.configuration;
 
+import java.lang.management.ManagementFactory;
 import java.util.Iterator;
 import java.util.Set;
 
 import javax.management.Attribute;
 import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 
-import org.apache.catalina.mbeans.MBeanUtils;
 import org.mobicents.servlet.management.client.configuration.ConfigurationService;
 import org.mobicents.servlet.sip.annotation.ConcurrencyControlMode;
 import org.mobicents.servlet.sip.core.CongestionControlPolicy;
@@ -39,7 +40,16 @@
 
 public class ConfigurationServiceImpl  extends RemoteServiceServlet implements ConfigurationService {
 	static final long serialVersionUID = 1L;
-	private static MBeanServer mserver = MBeanUtils.createServer();
+	private static MBeanServer mserver;
+	static {
+		if( MBeanServerFactory.findMBeanServer(null).size() > 0 ) {
+            mserver = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
+           
+        } else {
+            mserver = ManagementFactory.getPlatformMBeanServer();
+           
+        }
+	}
 
 	private ObjectName getApplicationDispatcher() {
 		try {

management/sip-servlets-management/src/main/java/org/mobicents/servlet/management/server/router/DARConfigurationServiceImpl.java

@@ -23,17 +23,18 @@
 package org.mobicents.servlet.management.server.router;
 
 import java.io.ByteArrayInputStream;
+import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
 import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
 
-import org.apache.catalina.mbeans.MBeanUtils;
 import org.mobicents.servlet.management.client.router.DARConfigurationService;
 import org.mobicents.servlet.management.client.router.DARRoute;
 import org.mobicents.servlet.management.client.router.DARRouteNode;
@@ -44,7 +45,16 @@
 
 public class DARConfigurationServiceImpl extends RemoteServiceServlet implements DARConfigurationService {
 
-	private static MBeanServer mserver = MBeanUtils.createServer();
+	private static MBeanServer mserver;
+	static {
+		if( MBeanServerFactory.findMBeanServer(null).size() > 0 ) {
+            mserver = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
+           
+        } else {
+            mserver = ManagementFactory.getPlatformMBeanServer();
+           
+        }
+	}
 
 	private ObjectName getApplicationDispatcher() {
 		try {