Revision: 743b9a0081b1
Author:   Jean Deruelle <[email protected]>
Date:     Tue Mar 11 21:54:59 2014 UTC
Log: Update Issue 237 added server id to to tag routing as well to avoid the issue and non regression test

(cherry picked from commit e59c3c5ac91fa070e4f4d1e6ba4d8156df2079ff)

Conflicts:
        containers/sip-servlets-as7/.project
        sip-servlets-core-api/.classpath
        sip-servlets-impl/.classpath

http://code.google.com/p/sipservlets/source/detail?r=743b9a0081b1

Modified:
 /containers/sip-servlets-as7/.project
 /sip-servlets-annotations/.classpath
 /sip-servlets-application-router/.classpath
 /sip-servlets-client/.classpath
 /sip-servlets-core-api/.classpath
/sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcher.java
 /sip-servlets-impl/.classpath
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/ApplicationRoutingHeaderComposer.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/SubsequentRequestDispatcher.java
 /sip-servlets-jruby/.classpath
 /sip-servlets-spec/.classpath
/sip-servlets-test-suite/applications/simple-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/SimpleSipServlet.java /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/Proxy2AppServersRoutingServletTest.java

=======================================
--- /sip-servlets-annotations/.classpath        Tue Mar 11 18:46:24 2014 UTC
+++ /sip-servlets-annotations/.classpath        Tue Mar 11 21:54:59 2014 UTC
@@ -4,5 +4,5 @@
   <classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/javaee-web-api/6.0/javaee-web-api-6.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.0.Final/jboss-servlet-api_3.0_spec-1.0.0.Final.jar"/>
 </classpath>
=======================================
--- /sip-servlets-application-router/.classpath Tue Mar 11 18:46:24 2014 UTC
+++ /sip-servlets-application-router/.classpath Tue Mar 11 21:54:59 2014 UTC
@@ -9,8 +9,12 @@
   <classpathentry kind="src" path="/sip-servlets-jruby"/>
   <classpathentry kind="src" path="/sip-servlets-client"/>
   <classpathentry kind="src" path="/sip-servlets-annotations"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar">
+    <attributes>
+ <attribute value="jar:file:/home/jean/.m2/repository/log4j/log4j/1.2.16/log4j-1.2.16-javadoc.jar!/" name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/javaee-web-api/6.0/javaee-web-api-6.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.0.Final/jboss-servlet-api_3.0_spec-1.0.0.Final.jar"/>
 </classpath>
=======================================
--- /sip-servlets-client/.classpath     Tue Mar 11 18:46:24 2014 UTC
+++ /sip-servlets-client/.classpath     Tue Mar 11 21:54:59 2014 UTC
@@ -4,7 +4,11 @@
   <classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
   <classpathentry kind="src" path="/sip-servlets-spec"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar">
+    <attributes>
+ <attribute value="jar:file:/home/jean/.m2/repository/log4j/log4j/1.2.16/log4j-1.2.16-javadoc.jar!/" name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/javaee-web-api/6.0/javaee-web-api-6.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.0.Final/jboss-servlet-api_3.0_spec-1.0.0.Final.jar"/>
 </classpath>
=======================================
--- /sip-servlets-core-api/.classpath   Tue Mar 11 18:46:24 2014 UTC
+++ /sip-servlets-core-api/.classpath   Tue Mar 11 21:54:59 2014 UTC
@@ -21,5 +21,5 @@
<classpathentry kind="var" path="M2_REPO/org/mobicents/javax/sip/mobicents-jain-sip-ext/1.3.0-SNAPSHOT/mobicents-jain-sip-ext-1.3.0-SNAPSHOT.jar"/> <classpathentry kind="var" path="M2_REPO/org/mobicents/ha/javax/sip/mobicents-jain-sip-ha-core/1.5.0-SNAPSHOT/mobicents-jain-sip-ha-core-1.5.0-SNAPSHOT.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/javaee-web-api/6.0/javaee-web-api-6.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.0.Final/jboss-servlet-api_3.0_spec-1.0.0.Final.jar"/>
 </classpath>
=======================================
--- /sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcher.java Tue Mar 11 18:46:24 2014 UTC +++ /sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcher.java Tue Mar 11 21:54:59 2014 UTC
@@ -228,4 +228,5 @@
        public void setSipService(SipService sipService);

        String getApplicationServerId();
+       String getApplicationServerIdHash();
 }
=======================================
--- /sip-servlets-impl/.classpath       Tue Mar 11 18:46:24 2014 UTC
+++ /sip-servlets-impl/.classpath       Tue Mar 11 21:54:59 2014 UTC
@@ -21,7 +21,11 @@
   <classpathentry kind="src" path="/sip-servlets-jruby"/>
   <classpathentry kind="src" path="/sip-servlets-client"/>
   <classpathentry kind="src" path="/sip-servlets-annotations"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar">
+    <attributes>
+ <attribute value="jar:file:/home/jean/.m2/repository/log4j/log4j/1.2.16/log4j-1.2.16-javadoc.jar!/" name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/> <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5.jar"/> <classpathentry kind="var" path="M2_REPO/dnsjava/dnsjava/2.1.0/dnsjava-2.1.0.jar"/>
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/ApplicationRoutingHeaderComposer.java Thu Apr 28 18:18:14 2011 UTC +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/ApplicationRoutingHeaderComposer.java Tue Mar 11 21:54:59 2014 UTC
@@ -1,23 +1,20 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2011-2014, Telestax Inc and individual contributors
+ * by the @authors tag.
  *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * This program is free software: you can redistribute it and/or modify
+ * under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
- * This software is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */

 package org.mobicents.servlet.sip.core;
@@ -31,7 +28,7 @@
* behaves as UAC. When the container acts as UAC the AR must be stored in the from-tag * of the outgoing request.When the container acts as UAS/B2BUA the AR must be stored in the to-tag
  * of the outgoing request. The string looks like this:
- * uniqueValue_appname1_appGeneratedApplicationSessionId
+ * uniqueValue_serverId_appname1_appGeneratedApplicationSessionId
  *
  * @author vralev
  * @author <A HREF="mailto:[email protected]";>Jean Deruelle</A>
@@ -59,7 +56,7 @@


public final static String[] getAppNameAndSessionId(SipApplicationDispatcher sipApplicationDispatcher, String text) {
-               String[] tuple = new String[2];
+               String[] tuple = new String[3];
                if(text != null) {
                        final String[] tokens = text.split(TOKEN_SEPARATOR);

@@ -67,12 +64,19 @@
                        // and it will be stored for later.
                        if(tokens.length > 1) {
// Otherwise extract the uniqueValue from the tag string, it's the first token.
-                               final String hashedAppName = tokens[1];
- String appName = sipApplicationDispatcher.getApplicationNameFromHash(hashedAppName);
-                               if(appName == null)
- throw new IllegalArgumentException("The hash doesn't correspond to any app name: " + hashedAppName);
-                               tuple[0] = appName;
-                               tuple[1] = tokens[2];
+                               final String hashedAppName = tokens[2];
+ if(sipApplicationDispatcher.getApplicationServerIdHash().equalsIgnoreCase(tokens[1])) { + String appName = sipApplicationDispatcher.getApplicationNameFromHash(hashedAppName);
+                                       if(appName == null)
+ throw new IllegalArgumentException("The hash doesn't correspond to any app name: " + hashedAppName);
+                                       tuple[0] = tokens[1];
+                                       tuple[1] = appName;
+                                       tuple[2] = tokens[3];
+                               } else {
+                                       tuple[0] = tokens[1];
+                                       tuple[1] = null;
+                                       tuple[2] = null;
+                               }
                        }
                }
                return tuple;
@@ -80,6 +84,8 @@

public final static String getHash(SipApplicationDispatcher sipApplicationDispatcher, String applicationName, String applicationId) {
                String text = randomString() + TOKEN_SEPARATOR;
+               // https://code.google.com/p/sipservlets/issues/detail?id=237
+ text += sipApplicationDispatcher.getApplicationServerIdHash() + TOKEN_SEPARATOR; text += sipApplicationDispatcher.getHashFromApplicationName(applicationName);
                if(applicationId != null && applicationId.length() > 0) {
                        text = text + TOKEN_SEPARATOR + applicationId;
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Tue Mar 11 18:46:24 2014 UTC +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Tue Mar 11 21:54:59 2014 UTC
@@ -178,6 +178,7 @@

        // app server id
        private String applicationServerId;
+       private String applicationServerIdHash;
        // ref back to the sip service
        private SipService sipService = null;
        //the sip factory implementation
@@ -267,6 +268,7 @@
                maxMemory = Runtime.getRuntime().maxMemory() / (double) 1024;
                congestionControlPolicy = CongestionControlPolicy.ErrorResponse;
                applicationServerId = "" + UUID.randomUUID();
+               applicationServerIdHash = 
GenericUtils.hashString(applicationServerId);
        }

        /**
@@ -1520,6 +1522,11 @@
        public String getApplicationServerId() {
                return applicationServerId;
        }
+       @Override
+       public String getApplicationServerIdHash() {
+               return applicationServerIdHash;
+       }
+

        /**
         * Check if the route is external
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/SubsequentRequestDispatcher.java Tue Mar 11 18:46:24 2014 UTC +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/SubsequentRequestDispatcher.java Tue Mar 11 21:54:59 2014 UTC
@@ -125,9 +125,9 @@
                        final ToHeader toHeader = (ToHeader) 
request.getHeader(ToHeader.NAME);
                        final String arText = toHeader.getTag();
                        try {
- final String[] tuple = ApplicationRoutingHeaderComposer.getAppNameAndSessionId(sipApplicationDispatcher, arText);
-                               applicationName = tuple[0];
-                               applicationId = tuple[1];
+ final String[] tuple = ApplicationRoutingHeaderComposer.getAppNameAndSessionId(sipApplicationDispatcher, arText);
+                               applicationName = tuple[1];
+                               applicationId = tuple[2];
                        } catch(IllegalArgumentException e) {
                                throw new 
DispatcherException(Response.SERVER_INTERNAL_ERROR, e);
                        }
@@ -164,7 +164,7 @@
// ACK for final error response are proxied statelessly for proxy applications //Means that this is an ACK to a container generated error response, so we can drop it
                                                        
if(logger.isDebugEnabled()) {
- logger.debug("The popped Route, application Id and name are null for an ACK, and this is an ACK for an error response, so it is dropped"); + logger.debug("The popped Route, application Id and name are null for an ACK or belonging to a different SIP application server, this is an ACK for an error response, so it is dropped");
                                                        }
                                                        return ;
                                                }
=======================================
--- /sip-servlets-jruby/.classpath      Tue Mar 11 18:46:24 2014 UTC
+++ /sip-servlets-jruby/.classpath      Tue Mar 11 21:54:59 2014 UTC
@@ -5,5 +5,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
   <classpathentry kind="src" path="/sip-servlets-spec"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/javaee-web-api/6.0/javaee-web-api-6.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.0.Final/jboss-servlet-api_3.0_spec-1.0.0.Final.jar"/>
 </classpath>
=======================================
--- /sip-servlets-spec/.classpath       Tue Mar 11 18:46:24 2014 UTC
+++ /sip-servlets-spec/.classpath       Tue Mar 11 21:54:59 2014 UTC
@@ -4,5 +4,5 @@
   <classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/javaee-web-api/6.0/javaee-web-api-6.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.0.Final/jboss-servlet-api_3.0_spec-1.0.0.Final.jar"/>
 </classpath>
=======================================
--- /sip-servlets-test-suite/applications/simple-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/SimpleSipServlet.java Mon Jan 28 17:54:52 2013 UTC +++ /sip-servlets-test-suite/applications/simple-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/SimpleSipServlet.java Tue Mar 11 21:54:59 2014 UTC
@@ -306,7 +306,7 @@
                        inviteSipSession = request.getSession();
                        inviteSipSession.setAttribute(TEST_EXCEPTION_ON_EXPIRE, 
true);
                }
-               if(fromString.contains(TEST_ERROR_RESPONSE)) {
+ if(fromString.contains(TEST_ERROR_RESPONSE) || fromString.contains("error-response")) { request.getApplicationSession().setAttribute(TEST_ERROR_RESPONSE, "true"); SipServletResponse sipServletResponse = request.createResponse(SipServletResponse.SC_BUSY_HERE);
                        sipServletResponse.send();
=======================================
--- /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/Proxy2AppServersRoutingServletTest.java Tue Mar 11 18:46:24 2014 UTC +++ /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/Proxy2AppServersRoutingServletTest.java Tue Mar 11 21:54:59 2014 UTC
@@ -29,11 +29,9 @@
 import javax.sip.header.ViaHeader;

 import org.apache.log4j.Logger;
-import org.cafesip.sipunit.SipPhone;
 import org.cafesip.sipunit.SipStack;
 import org.mobicents.servlet.sip.SipEmbedded;
 import org.mobicents.servlet.sip.SipServletTestCase;
-import org.mobicents.servlet.sip.SipUnitServletTestCase;
 import org.mobicents.servlet.sip.testsuite.ProtocolObjects;
 import org.mobicents.servlet.sip.testsuite.TestSipListener;

@@ -81,12 +79,19 @@
                                + 
"org/mobicents/servlet/sip/testsuite/proxy/proxy-dar.properties";
        }

-       protected String getDarConfigurationFileForClosestServer() {
+       protected String getDarConfigurationFileForSecondServer() {
                return "file:///"
                                + projectHome
                                + 
"/sip-servlets-test-suite/testsuite/src/test/resources/"
                                + 
"org/mobicents/servlet/sip/testsuite/proxy/proxy-dar.properties";
        }
+
+       protected String getDarConfigurationFileUASSecondServer() {
+               return "file:///"
+                               + projectHome
+                               + 
"/sip-servlets-test-suite/testsuite/src/test/resources/"
+ + "org/mobicents/servlet/sip/testsuite/simple/simple-sip-servlet-dar.properties";
+       }

        @Override
        public void setUp() throws Exception {
@@ -131,19 +136,21 @@
                return new SipStack(transport, port, properties);
        }

-       /* This test starts 2 sip servlets container
+       /*
+        * https://code.google.com/p/sipservlets/issues/detail?id=259
+        * This test starts 2 sip servlets container
         * one on 5070 that has the proxy app to ROUTE to the other server on 
5069
         * one on port 5069 that has the proxy application to route to UAS.
         *
         * Tests for number of Via Header in ACK to be correct 3 instead of 2
         */
-       public void testExternalRouting() throws Exception {
+       public void test2Proxies() throws Exception {
                //start the most remote server first
                tomcat.startTomcat();
                deployApplication();
                //create and start the closest server
                //starting tomcat
- closestTomcat = new SipEmbedded("SIP-Servlet-Closest-Tomcat-Server", serviceFullClassName); + closestTomcat = new SipEmbedded("SIP-Servlet-Second-Tomcat-Server", serviceFullClassName);
                closestTomcat.setLoggingFilePath(
                                projectHome + File.separatorChar + 
"sip-servlets-test-suite" +
                                File.separatorChar + "testsuite" +
@@ -151,9 +158,9 @@
                                File.separatorChar + "test" +
                                File.separatorChar + "resources" + 
File.separatorChar);
                logger.info("Log4j path is : " + 
closestTomcat.getLoggingFilePath());
- closestTomcat.setDarConfigurationFilePath(getDarConfigurationFileForClosestServer()); + closestTomcat.setDarConfigurationFilePath(getDarConfigurationFileForSecondServer());
                closestTomcat.initTomcat(tomcatBasePath, null);
- closestTomcat.addSipConnector("SIP-Servlet-Closest-Tomcat-Server", sipIpAddress, 5069, ListeningPoint.UDP); + closestTomcat.addSipConnector("SIP-Servlet-Second-Tomcat-Server", sipIpAddress, 5069, ListeningPoint.UDP);
                closestTomcat.startTomcat();
                closestTomcat.deployContext(
                                                projectHome
@@ -190,6 +197,58 @@
                        viaHeaders.next();
                }
                assertEquals(3, count);
+       }
+
+       /*
+        * https://code.google.com/p/sipservlets/issues/detail?id=237
+        * This test starts 2 sip servlets container
+        * one on 5070 that has the proxy app to ROUTE to the other server on 
5069
+        * one on port 5069 that has the UAS application to send back an error
+        *
+        * Tests for number of Via Header in ACK to be correct 3 instead of 2
+        */
+       public void testProxyUASError() throws Exception {
+               //start the most remote server first
+               tomcat.startTomcat();
+               deployApplication();
+               //create and start the closest server
+               //starting tomcat
+ closestTomcat = new SipEmbedded("SIP-Servlet-Second-Tomcat-Server", serviceFullClassName);
+               closestTomcat.setLoggingFilePath(
+                               projectHome + File.separatorChar + 
"sip-servlets-test-suite" +
+                               File.separatorChar + "testsuite" +
+                               File.separatorChar + "src" +
+                               File.separatorChar + "test" +
+                               File.separatorChar + "resources" + 
File.separatorChar);
+               logger.info("Log4j path is : " + 
closestTomcat.getLoggingFilePath());
+ closestTomcat.setDarConfigurationFilePath(getDarConfigurationFileUASSecondServer());
+               closestTomcat.initTomcat(tomcatBasePath, null);
+ closestTomcat.addSipConnector("SIP-Servlet-Second-Tomcat-Server", sipIpAddress, 5069, ListeningPoint.UDP);
+               closestTomcat.startTomcat();
+               closestTomcat.deployContext(
+                                               projectHome
+ + "/sip-servlets-test-suite/applications/simple-sip-servlet/src/main/sipapp",
+                                               "sip-test-context", "sip-test");
+               Thread.sleep(TIMEOUT);
+
+ String fromName = "test-unique-location-urn-uri1-push-route-app-server-error-response";
+               String fromSipAddress = "sip-servlets.com";
+               SipURI fromAddress = 
senderProtocolObjects.addressFactory.createSipURI(
+                               fromName, fromSipAddress);
+
+               String toUser = "receiver";
+               String toSipAddress = "sip-servlets.com";
+               SipURI toAddress = 
senderProtocolObjects.addressFactory.createSipURI(
+                               toUser, toSipAddress);
+
+               String r = "requestUri";
+ String ra = "" + System.getProperty("org.mobicents.testsuite.testhostaddr") + ":5057";
+               SipURI requestUri = 
senderProtocolObjects.addressFactory.createSipURI(
+                               r, ra);
+               sender.setRecordRoutingProxyTesting(true);
+ sender.sendSipRequest("INVITE", fromAddress, toAddress, null, null, false, null, null, requestUri);
+               Thread.sleep(TIMEOUT);
+               assertTrue(sender.isFinalResponseReceived());
        }

        @Override

--

--- You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to