Revision: 15504
Author: [email protected]
Date: Thu Nov 25 10:10:17 2010
Log:  Fixes Issue 2149.
Appropriate changes for the SipEmbedded to start and stop correctly.


http://code.google.com/p/mobicents/source/detail?r=15504

Modified:
/branches/servers/sip-servlets/2.0/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/startup/SipProtocolHandler.java /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/test/java/org/mobicents/servlet/sip/testsuite/AllTests.java

=======================================
--- /branches/servers/sip-servlets/2.0/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/startup/SipProtocolHandler.java Sun Nov 21 09:21:23 2010 +++ /branches/servers/sip-servlets/2.0/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/startup/SipProtocolHandler.java Thu Nov 25 10:10:17 2010
@@ -623,7 +623,8 @@
        @Override
        public void stop() throws Exception {
                // TODO Auto-generated method stub
-               throw new UnsupportedOperationException();
+//             throw new UnsupportedOperationException();
+               destroy();
        }

 }
=======================================
--- /branches/servers/sip-servlets/2.0/sip-servlets-test-suite/testsuite/src/main/java/org/mobicents/servlet/sip/SipEmbedded.java Thu Nov 25 01:49:03 2010 +++ /branches/servers/sip-servlets/2.0/sip-servlets-test-suite/testsuite/src/main/java/org/mobicents/servlet/sip/SipEmbedded.java Thu Nov 25 10:10:17 2010
@@ -269,18 +269,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 {
+                               if(sipService.findConnectors().length>0){
+                                       Connector[] connectors = 
sipService.findConnectors();
+                                       for (int i = 0; i < connectors.length; 
i++) {
+                                               Connector connector = 
connectors[i];
+                                               connector.stop();
+                                               connector.destroy();
+                                               
sipService.removeConnector(connector);
+                                       }
+                               }
                                sipService.stop();
-//                             sipService.destroy();
+                               host.stop();
                        } catch (LifecycleException e) {
                                log.error("SipService already stopped ", e);
                        }
@@ -296,7 +297,7 @@
                SipStandardContext context = new SipStandardContext();
                context.setDocBase(docBase);
                context.setName(name);
-               context.setPath("/"+path);
+               context.setPath(File.separator+path);
                context.setParent(host);
                context.addLifecycleListener(new SipContextConfig());
                context.setManager(new SipStandardManager());
@@ -307,7 +308,7 @@
                SipStandardContext context = new SipStandardContext();
                context.setDocBase(docBase);
                context.setName(name);
-               context.setPath("/"+path);
+               context.setPath(File.separator+path);
                context.setParent(host);
                context.setSipApplicationSessionTimeout(appSessionTimeout);
                context.addLifecycleListener(new SipContextConfig());
@@ -319,8 +320,8 @@
        public boolean deployContext(SipStandardContext context) {
                context.setParent(host);
                String path = context.getPath();
-               if (!path.startsWith("/")){
-                       path = "/"+path;
+               if (!path.startsWith(File.separator)){
+                       path = File.separator+path;
                        context.setPath(path);
                }
                host.addChild(context);
=======================================
--- /branches/servers/sip-servlets/2.0/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/AllTests.java Thu Nov 25 01:49:03 2010 +++ /branches/servers/sip-servlets/2.0/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/AllTests.java Thu Nov 25 10:10:17 2010
@@ -47,6 +47,7 @@
import org.mobicents.servlet.sip.testsuite.deployment.DistributableServletTest; import org.mobicents.servlet.sip.testsuite.deployment.NoApplicationDeployedTest; import org.mobicents.servlet.sip.testsuite.deployment.SameInstanceServletTest;
+import org.mobicents.servlet.sip.testsuite.failover.BasicFailoverTest;
 import org.mobicents.servlet.sip.testsuite.join.JoinSipServletTest;
import org.mobicents.servlet.sip.testsuite.listeners.ListenersSipServletTest; import org.mobicents.servlet.sip.testsuite.mapping.ServletMappingSipServletTest;
@@ -173,6 +174,7 @@
                suite.addTestSuite(SameInstanceServletTest.class);
                suite.addTestSuite(DistributableServletTest.class);
                suite.addTestSuite(ShootistSipServletForkingTest.class);
+//             suite.addTestSuite(BasicFailoverTest.class);
                suite.addTestSuite(SipURITest.class);
                suite.addTestSuite(AddressTest.class);
                suite.addTestSuite(TelURLTest.class);

Reply via email to