Revision: 15573
Author: [email protected]
Date: Tue Nov 30 09:16:49 2010
Log: fixing test not working anymore because of tomcat7 impossibility to
restart
http://code.google.com/p/mobicents/source/detail?r=15573
Modified:
/branches/servers/sip-servlets/2.0/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootmeSipServletTest.java
=======================================
---
/branches/servers/sip-servlets/2.0/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootmeSipServletTest.java
Tue Oct 19 11:56:58 2010
+++
/branches/servers/sip-servlets/2.0/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootmeSipServletTest.java
Tue Nov 30 09:16:49 2010
@@ -503,7 +503,7 @@
SipURI toAddress =
senderProtocolObjects.addressFactory.createSipURI(
toUser, toSipAddress);
tomcat.removeConnector(sipConnector);
- tomcat.stopTomcat();
+ tomcat.stopTomcat();
Properties sipStackProperties = new Properties();
sipStackProperties.setProperty("javax.sip.STACK_NAME", "mss-"
+ sipIpAddress + "-" + 5070);
@@ -517,11 +517,10 @@
"true");
sipStackProperties.setProperty("org.mobicents.servlet.sip.SERVER_HEADER",
"MobicentsSipServletsServer");
-
tomcat.getSipService().setSipStackProperties(sipStackProperties);
- tomcat.getSipService().init();
- tomcat.restartTomcat();
+ tomcat.initTomcat(tomcatBasePath, sipStackProperties);
+ tomcat.startTomcat();
deployApplication();
- sipConnector = tomcat.addSipConnector(serverName, sipIpAddress, 5070,
listeningPointTransport);
+ sipConnector = tomcat.addSipConnector(serverName, sipIpAddress, 5070,
listeningPointTransport);
sender.sendSipRequest("INVITE", fromAddress, toAddress, null, null,
false);
Thread.sleep(TIMEOUT);
assertTrue(sender.isAckSent());