Revision: 15474
Author: [email protected]
Date: Wed Nov 24 14:44:51 2010
Log: Update issue 2149
http://code.google.com/p/mobicents/source/detail?r=15474

Modified:
/branches/servers/sip-servlets/2.0/sip-servlets-test-suite/testsuite/src/main/java/org/mobicents/servlet/sip/SipEmbedded.java

=======================================
--- /branches/servers/sip-servlets/2.0/sip-servlets-test-suite/testsuite/src/main/java/org/mobicents/servlet/sip/SipEmbedded.java Tue Nov 16 01:29:38 2010 +++ /branches/servers/sip-servlets/2.0/sip-servlets-test-suite/testsuite/src/main/java/org/mobicents/servlet/sip/SipEmbedded.java Wed Nov 24 14:44:51 2010
@@ -33,6 +33,7 @@
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.core.StandardHost;
 import org.apache.catalina.loader.StandardClassLoader;
+import org.apache.catalina.mbeans.MBeanFactory;
 import org.apache.catalina.mbeans.MBeanUtils;
 import org.apache.catalina.security.SecurityClassLoad;
 import org.apache.catalina.security.SecurityConfig;
@@ -65,7 +66,7 @@
        private String darConfigurationFilePath = null;

        private String path = null;
-
+
        private SipStandardService sipService = null;

        private StandardHost host = null;
@@ -76,6 +77,8 @@

        MBeanServer mBeanServer = null;

+       MBeanFactory mBeanFactory = null;
+
        private boolean isHA = false;

        /**
@@ -144,7 +147,7 @@

                Thread.currentThread().setContextClassLoader(catalinaLoader);
         SecurityClassLoad.securityClassLoad(catalinaLoader);
-
+
                /*
* <Service className="org.mobicents.servlet.sip.startup.SipStandardService" * darConfigurationFileLocation="file:///E:/sip-serv/sip-servlets-impl/docs/dar.properties"
@@ -152,9 +155,9 @@
* sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl" * sipApplicationRouterClassName="org.mobicents.servlet.sip.router.DefaultApplicationRouter">
                 */
-               // Create an embedded server
+               // Create an embedded server
sipService = (SipStandardService) Class.forName(serviceFullClassName).newInstance();
-               sipService.setName(serverName);
+        sipService.setName(serverName);
                sipService.setSipStackProperties(sipStackProperties);
sipService.setSipApplicationDispatcherClassName(SipApplicationDispatcherImpl.class.getName()); // sipService.setSipApplicationRouterClassName(DefaultApplicationRouter.class.getName());
@@ -166,16 +169,17 @@
                        sipService.setSipPathName("org.mobicents.ha");
                        sipService.setBalancers("127.0.0.1");
                }
+
 //             sipService.setBypassRequestExecutor(true);
 //             sipService.setBypassResponseExecutor(true);
-               // Create an engine
+               // Create an engine
                SipStandardEngine engine = new SipStandardEngine();
                engine.setName(serverName);
                engine.setBaseDir(getPath());
                engine.setDefaultHost("localhost");
                engine.setService(sipService);
                // Install the assembled container hierarchy
-
+
                sipService.setContainer(engine);
                sipService.init();
                // Create a default virtual host
@@ -188,7 +192,9 @@
                host.addLifecycleListener(new SipHostConfig());
                host.setAutoDeploy(false);
                host.setDeployOnStartup(false);
-               engine.addChild(host);
+
+               engine.addChild(host);
+
        }

        /**
@@ -262,9 +268,19 @@
         */
        public void stopTomcat() {
                // Stop the embedded server
+
+               if(host!=null){
+                       try {
+                               host.stop();
+                       } catch (LifecycleException e) {
+                               log.error("Host already stopped ", e);
+                       }
+               }
+
                if(sipService != null) {
                        try {
                                sipService.stop();
+                               sipService.destroy();
                        } catch (LifecycleException e) {
                                log.error("SipService already stopped ", e);
                        }
@@ -280,7 +296,7 @@
                SipStandardContext context = new SipStandardContext();
                context.setDocBase(docBase);
                context.setName(name);
-               context.setPath(path);
+               context.setPath("/"+path);
                context.setParent(host);
                context.addLifecycleListener(new SipContextConfig());
                context.setManager(new SipStandardManager());
@@ -291,7 +307,7 @@
                SipStandardContext context = new SipStandardContext();
                context.setDocBase(docBase);
                context.setName(name);
-               context.setPath(path);
+               context.setPath("/"+path);
                context.setParent(host);
                context.setSipApplicationSessionTimeout(appSessionTimeout);
                context.addLifecycleListener(new SipContextConfig());
@@ -302,6 +318,11 @@

        public boolean deployContext(SipStandardContext context) {
                context.setParent(host);
+               String path = context.getPath();
+               if (!path.startsWith("/")){
+                       path = "/"+path;
+                       context.setPath(path);
+               }
                host.addChild(context);
                return context.getAvailable();
        }

Reply via email to