3 new revisions:

Revision: 2bff7b073227
Author:   Vladimir Ralev <[email protected]>
Date:     Mon Jul  9 14:42:23 2012
Log:      Update Issue 131...
http://code.google.com/p/sipservlets/source/detail?r=2bff7b073227

Revision: 1e4eca2c8275
Author:   Vladimir Ralev <[email protected]>
Date:     Mon Jul  9 16:25:44 2012
Log:      Update Issue 131
http://code.google.com/p/sipservlets/source/detail?r=1e4eca2c8275

Revision: 3a62b69d8d36
Author:   Vladimir Ralev <[email protected]>
Date:     Mon Jul  9 21:27:55 2012
Log:      Merge branch 'master' of https://code.google.com/p/sipservlets
http://code.google.com/p/sipservlets/source/detail?r=3a62b69d8d36

==============================================================================
Revision: 2bff7b073227
Author:   Vladimir Ralev <[email protected]>
Date:     Mon Jul  9 14:42:23 2012
Log:      Update Issue 131

Remove catalina dependencies
http://code.google.com/p/sipservlets/source/detail?r=2bff7b073227

Modified:
/management/sip-servlets-management/src/main/java/org/mobicents/servlet/management/server/configuration/ConfigurationServiceImpl.java /management/sip-servlets-management/src/main/java/org/mobicents/servlet/management/server/router/DARConfigurationServiceImpl.java

=======================================
--- /management/sip-servlets-management/src/main/java/org/mobicents/servlet/management/server/configuration/ConfigurationServiceImpl.java Tue Mar 27 08:02:55 2012 +++ /management/sip-servlets-management/src/main/java/org/mobicents/servlet/management/server/configuration/ConfigurationServiceImpl.java Mon Jul 9 14:42:23 2012
@@ -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 Tue Mar 27 08:02:55 2012 +++ /management/sip-servlets-management/src/main/java/org/mobicents/servlet/management/server/router/DARConfigurationServiceImpl.java Mon Jul 9 14:42:23 2012
@@ -23,6 +23,7 @@
 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;
@@ -30,10 +31,10 @@
 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 {

==============================================================================
Revision: 1e4eca2c8275
Author:   Vladimir Ralev <[email protected]>
Date:     Mon Jul  9 16:25:44 2012
Log:      Update Issue 131

http://code.google.com/p/sipservlets/source/detail?r=1e4eca2c8275

Modified:
 /containers/sip-servlets-as7-drop-in/patches/patch.jboss-as-web.module.xml

=======================================
--- /containers/sip-servlets-as7-drop-in/patches/patch.jboss-as-web.module.xml Tue Mar 27 08:02:55 2012 +++ /containers/sip-servlets-as7-drop-in/patches/patch.jboss-as-web.module.xml Mon Jul 9 16:25:44 2012
@@ -6,6 +6,7 @@
          <module name="javax.security.jacc.api"/>
 +        <!-- MSS -->
 +        <module name="org.mobicents.javax.servlet.sip" export="true"/>
++        <module name="org.mobicents.dar" export="true"/>
 +        <module name="org.mobicents.libs"/>
      </dependencies>
  </module>

==============================================================================
Revision: 3a62b69d8d36
Author:   Vladimir Ralev <[email protected]>
Date:     Mon Jul  9 21:27:55 2012
Log:      Merge branch 'master' of https://code.google.com/p/sipservlets

http://code.google.com/p/sipservlets/source/detail?r=3a62b69d8d36


Reply via email to