Revision: 16238
Author: pavel.slegr
Date: Fri Jan  7 03:52:40 2011
Log: jbcp 5.x update - MSS 1.5 fixes up to r16226
http://code.google.com/p/mobicents/source/detail?r=16238

Added:
/branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/b2bua/B2BUASessionCallbackTest.java
Modified:
/branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/ExtendedListeningPoint.java /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/InitialRequestDispatcher.java /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/applications/call-forwarding-b2bua-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/b2bua/CallForwardingB2BUASipServlet.java /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/AllTests.java /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/resources/log4j.xml

=======================================
--- /dev/null
+++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/b2bua/B2BUASessionCallbackTest.java Fri Jan 7 03:52:40 2011
@@ -0,0 +1,188 @@
+/*
+ * 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
+ * the License, or (at your option) any later version.
+ *
+ * This software 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.
+ *
+ * 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.
+ */
+package org.mobicents.servlet.sip.testsuite.b2bua;
+
+import java.io.File;
+import java.util.ListIterator;
+
+import javax.sip.ListeningPoint;
+import javax.sip.SipProvider;
+import javax.sip.address.SipURI;
+import javax.sip.header.CallIdHeader;
+import javax.sip.header.ContactHeader;
+import javax.sip.header.Header;
+import javax.sip.header.UserAgentHeader;
+
+import org.apache.log4j.Logger;
+import org.mobicents.servlet.sip.SipServletTestCase;
+import org.mobicents.servlet.sip.testsuite.ProtocolObjects;
+import org.mobicents.servlet.sip.testsuite.TestSipListener;
+
+/**
+ * Testing if sessionreadytoinvalidate is called twice http://code.google.com/p/mobicents/issues/detail?id=2246
+ *
+ * @author Vladimir
+ *
+ */
+public class B2BUASessionCallbackTest extends SipServletTestCase {
+
+ private static transient Logger logger = Logger.getLogger(B2BUASessionCallbackTest.class);
+
+       private static final String TRANSPORT_UDP = "udp";
+       private static final String TRANSPORT_TCP = "tcp";
+       private static final boolean AUTODIALOG = true;
+       private static final int TIMEOUT = 15000;
+//     private static final int TIMEOUT = 100000000;
+
+       TestSipListener sender;
+       TestSipListener receiver;
+       ProtocolObjects senderProtocolObjects;
+       ProtocolObjects receiverProtocolObjects;
+
+       public B2BUASessionCallbackTest(String name) {
+               super(name);
+               startTomcatOnStartup = false;
+               autoDeployOnStartup = false;
+       }
+
+       @Override
+       public void deployApplication() {
+               assertTrue(tomcat.deployContext(
+ projectHome + "/sip-servlets-test-suite/applications/call-forwarding-b2bua-servlet/src/main/sipapp",
+                               "sip-test-context",
+                               "sip-test"));
+       }
+
+       @Override
+       protected String getDarConfigurationFile() {
+               return "file:///"
+                               + projectHome
+                               + 
"/sip-servlets-test-suite/testsuite/src/test/resources/"
+ + "org/mobicents/servlet/sip/testsuite/callcontroller/call-forwarding-b2bua-servlet-dar.properties";
+       }
+
+       @Override
+       protected void setUp() throws Exception {
+               super.setUp();
+
+ tomcat.addSipConnector(serverName, sipIpAddress, 5070, ListeningPoint.TCP);
+               tomcat.startTomcat();
+               deployApplication();
+
+               senderProtocolObjects = new 
ProtocolObjects("forward-udp-sender",
+                               "gov.nist", TRANSPORT_UDP, AUTODIALOG, null, 
null, null);
+               receiverProtocolObjects = new 
ProtocolObjects("forward-tcp-receiver",
+                               "gov.nist", TRANSPORT_TCP, AUTODIALOG, null, 
null, null);
+
+       }
+
+ public void testCallForwardingCallerSendByeDoubleCallback() throws Exception {
+               File testResult = new File("b2buaSessionDoubleCallbackTest");
+               testResult.delete();
+               sender = new TestSipListener(5080, 5070, senderProtocolObjects, 
true);
+               SipProvider senderProvider = sender.createProvider();
+
+ receiver = new TestSipListener(5090, 5070, receiverProtocolObjects, false);
+               SipProvider receiverProvider = receiver.createProvider();
+
+               receiverProvider.addSipListener(receiver);
+               senderProvider.addSipListener(sender);
+
+               senderProtocolObjects.start();
+               receiverProtocolObjects.start();
+
+               String fromName = "forward-tcp-sender";
+               String fromSipAddress = "sip-servlets.com";
+               SipURI fromAddress = 
senderProtocolObjects.addressFactory.createSipURI(
+                               fromName, fromSipAddress);
+
+               String toSipAddress = "sip-servlets.com";
+               String toUser = "forward-receiver";
+               SipURI toAddress = 
senderProtocolObjects.addressFactory.createSipURI(
+                               toUser, toSipAddress);
+
+ sender.sendSipRequest("INVITE", fromAddress, toAddress, null, null, false, new String[] {UserAgentHeader.NAME, "extension-header", "DOUBLE"}, new String[] {"TestSipListener UA", "extension-sip-listener","DOUBLE"}, true);
+               Thread.sleep(TIMEOUT+8000);
+               assertTrue(sender.getOkToByeReceived());
+               assertTrue(receiver.getByeReceived());
+ CallIdHeader receiverCallIdHeader = (CallIdHeader)receiver.getInviteRequest().getHeader(CallIdHeader.NAME); + CallIdHeader senderCallIdHeader = (CallIdHeader)sender.getInviteRequest().getHeader(CallIdHeader.NAME); + ListIterator<UserAgentHeader> userAgentHeaderIt = receiver.getInviteRequest().getHeaders(UserAgentHeader.NAME);
+               int i = 0;
+               while (userAgentHeaderIt.hasNext()) {
+                       UserAgentHeader userAgentHeader = (UserAgentHeader) 
userAgentHeaderIt
+                                       .next();
+ assertTrue(userAgentHeader.toString().trim().endsWith("CallForwardingB2BUASipServlet"));
+                       i++;
+               }
+               assertEquals(1, i);
+ ListIterator<ContactHeader> contactHeaderIt = receiver.getInviteRequest().getHeaders(ContactHeader.NAME);
+               i = 0;
+               while (contactHeaderIt.hasNext()) {
+                       ContactHeader contactHeader = (ContactHeader) 
contactHeaderIt
+                                       .next();
+ assertTrue(contactHeader.toString().trim().startsWith("Contact: \"callforwardingB2BUA\" <sip:[email protected]:5070;q=0.1;transport=tcp;test>;test"));
+                       i++;
+               }
+               assertEquals(1, i);
+ ListIterator<Header> extensionHeaderIt = receiver.getInviteRequest().getHeaders("extension-header");
+               i = 0;
+               while (extensionHeaderIt.hasNext()) {
+                       extensionHeaderIt.next();
+                       i++;
+               }
+               assertEquals(2, i);
+ userAgentHeaderIt = receiver.getByeRequestReceived().getHeaders(UserAgentHeader.NAME);
+               i = 0;
+               while (userAgentHeaderIt.hasNext()) {
+                       UserAgentHeader userAgentHeader = (UserAgentHeader) 
userAgentHeaderIt
+                                       .next();
+ assertTrue(userAgentHeader.toString().trim().endsWith("CallForwardingB2BUASipServlet"));
+                       i++;
+               }
+               assertEquals(1, i);
+ contactHeaderIt = receiver.getByeRequestReceived().getHeaders(ContactHeader.NAME);
+               i = 0;
+               while (contactHeaderIt.hasNext()) {
+                       ContactHeader contactHeader = (ContactHeader) 
contactHeaderIt
+                                       .next();
+                       i++;
+               }
+               assertEquals(0, i);
+ assertFalse(receiverCallIdHeader.getCallId().equals(senderCallIdHeader.getCallId())); + extensionHeaderIt = receiver.getByeRequestReceived().getHeaders("extension-header");
+               i = 0;
+               while (extensionHeaderIt.hasNext()) {
+                       extensionHeaderIt.next();
+                       i++;
+               }
+               assertEquals(2, i);
+               assertFalse(testResult.exists());
+       }
+
+       @Override
+       protected void tearDown() throws Exception {
+               senderProtocolObjects.destroy();
+               receiverProtocolObjects.destroy();
+               sender = null;
+               receiver = null;
+               logger.info("Test completed");
+               super.tearDown();
+       }
+
+
+}
=======================================
--- /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java Thu Jan 6 05:29:29 2011 +++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java Fri Jan 7 03:52:40 2011
@@ -524,7 +524,7 @@
         * @param transport
         * @return
         */
- public static ContactHeader createContactHeader(SipNetworkInterfaceManager sipNetworkInterfaceManager, Request request, String displayName, String outboundInterface) { + public static ContactHeader createContactHeader(SipNetworkInterfaceManager sipNetworkInterfaceManager, Request request, String displayName, String userName, String outboundInterface) {
                ExtendedListeningPoint listeningPoint = null;
                if(outboundInterface == null) {
                        String transport = findTransport(request);
@@ -540,7 +540,7 @@
                }
                boolean usePublicAddress = findUsePublicAddress(
                                sipNetworkInterfaceManager, request, 
listeningPoint);
-               return listeningPoint.createContactHeader(displayName, 
usePublicAddress);
+ return listeningPoint.createContactHeader(displayName, userName, usePublicAddress);
        }

        /**
=======================================
--- /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/ExtendedListeningPoint.java Thu Jan 6 05:29:29 2011 +++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/ExtendedListeningPoint.java Fri Jan 7 03:52:40 2011
@@ -121,11 +121,11 @@
         * @param displayName the display name to use
         * @return the Contact header
         */
- public ContactHeader createContactHeader(String displayName, boolean usePublicAddress) { + public ContactHeader createContactHeader(String displayName, String userName, boolean usePublicAddress) {
                try {
                        // FIXME : the SIP URI can be cached to improve 
performance
                        String host = getIpAddress(usePublicAddress);
- javax.sip.address.SipURI sipURI = SipFactories.addressFactory.createSipURI(null, host); + javax.sip.address.SipURI sipURI = SipFactories.addressFactory.createSipURI(userName, host);
                        sipURI.setHost(host);
                        sipURI.setPort(port);
// Issue 1150 : we assume that if the transport match the default protocol of the transport protocol used it is not added
=======================================
--- /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/InitialRequestDispatcher.java Thu Jan 6 05:29:29 2011 +++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/InitialRequestDispatcher.java Fri Jan 7 03:52:40 2011
@@ -330,7 +330,7 @@
// subscriber URI should be set before calling makeAppSessionKey method, see Issue 750
                // http://code.google.com/p/mobicents/issues/detail?id=750
                try {
- URI subscriberUri = SipFactories.addressFactory.createURI(applicationRouterInfo.getSubscriberURI()); + URI subscriberUri = SipFactories.addressFactory.createAddress(applicationRouterInfo.getSubscriberURI()).getURI();
                        javax.servlet.sip.URI jainSipSubscriberUri = null;
                        if(subscriberUri instanceof javax.sip.address.SipURI) {
jainSipSubscriberUri= new SipURIImpl((javax.sip.address.SipURI)subscriberUri);
=======================================
--- /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java Thu Jan 6 05:29:29 2011 +++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java Fri Jan 7 03:52:40 2011
@@ -355,11 +355,18 @@
                                        // so that the subsequent requests can 
be failed over
                                        try {
                                                ContactHeader contactHeader = 
null;
+ FromHeader from = (FromHeader) methodRequest.getHeader(FromHeader.NAME);
+                                               String displayName = 
from.getAddress().getDisplayName();
+                                               String userName = null;
+                                               javax.sip.address.URI uri = 
from.getAddress().getURI();
+                                               if(uri.isSipURI()) {
+                                                       userName = 
((javax.sip.address.SipURI)uri).getUser();
+                                               }
                                                
if(sipFactory.isUseLoadBalancer()) {
SipLoadBalancer loadBalancerToUse = sipFactory.getLoadBalancerToUse(); - javax.sip.address.SipURI sipURI = SipFactories.addressFactory.createSipURI("", loadBalancerToUse.getAddress().getHostAddress()); + javax.sip.address.SipURI sipURI = SipFactories.addressFactory.createSipURI(userName, loadBalancerToUse.getAddress().getHostAddress());
                                                        
sipURI.setHost(loadBalancerToUse.getAddress().getHostAddress());
-                                                       
sipURI.setPort(loadBalancerToUse.getSipPort());
+                                                       
sipURI.setPort(loadBalancerToUse.getSipPort());

                                                        // TODO: Is this enough 
or we must specify the transport somewhere?
// We can leave it like this. It will be updated if needed in the send() method
@@ -367,8 +374,9 @@

javax.sip.address.Address contactAddress = SipFactories.addressFactory.createAddress(sipURI); contactHeader = SipFactories.headerFactory.createContactHeader(contactAddress);
-                                               } else {
- contactHeader = JainSipUtils.createContactHeader(sipFactory.getSipNetworkInterfaceManager(), methodRequest, "", outboundInterface);
+                                               } else {
+
+ contactHeader = JainSipUtils.createContactHeader(sipFactory.getSipNetworkInterfaceManager(), methodRequest, displayName, userName, outboundInterface);
                                                }
                                                
methodRequest.setHeader(contactHeader);
                                        } catch (Exception e) {
=======================================
--- /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java Thu Jan 6 05:29:29 2011 +++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java Fri Jan 7 03:52:40 2011
@@ -215,6 +215,7 @@
                                //Creating container contact header
                                ContactHeader contactHeader = null;
                                String fromName = null;
+                               String diaplayName = 
newFromHeader.getAddress().getDisplayName();
if(newFromHeader.getAddress().getURI() instanceof javax.sip.address.SipURI) { fromName = ((javax.sip.address.SipURI) newFromHeader.getAddress().getURI()).getUser();
                                }
@@ -227,12 +228,12 @@
                                        
sipURI.setPort(loadBalancerToUse.getSipPort());
                                        
sipURI.setTransportParam(ListeningPoint.UDP);
javax.sip.address.Address contactAddress = SipFactories.addressFactory.createAddress(sipURI);
-                                       if(fromName != null && fromName.length() 
> 0) {
-                                               
contactAddress.setDisplayName(fromName);
+                                       if(diaplayName != null && 
diaplayName.length() > 0) {
+                                               
contactAddress.setDisplayName(diaplayName);
                                        }
contactHeader = SipFactories.headerFactory.createContactHeader(contactAddress);
                                } else {
- contactHeader = JainSipUtils.createContactHeader(sipFactoryImpl.getSipNetworkInterfaceManager(), newRequest, fromName, session.getOutboundInterface()); + contactHeader = JainSipUtils.createContactHeader(sipFactoryImpl.getSipNetworkInterfaceManager(), newRequest, diaplayName, fromName, session.getOutboundInterface());
                                }
                                if(contactHeaderSet.size() > 0) {
// if the set is not empty then we adjust the values of the set to match the host and port + forbidden params of the container
=======================================
--- /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java Thu Jan 6 05:29:29 2011 +++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java Fri Jan 7 03:52:40 2011
@@ -519,6 +519,7 @@
                        //Adding default contact header for specific methods 
only
                        
if(JainSipUtils.CONTACT_HEADER_METHODS.contains(method)) {
                                String fromName = null;
+                               String displayName = 
fromHeader.getAddress().getDisplayName();
if(fromHeader.getAddress().getURI() instanceof javax.sip.address.SipURI) { fromName = ((javax.sip.address.SipURI)fromHeader.getAddress().getURI()).getUser();
                                }
@@ -532,12 +533,12 @@
                                        
sipURI.setPort(loadBalancerToUse.getSipPort());
                                        sipURI.setTransportParam(transport);
javax.sip.address.Address contactAddress = SipFactories.addressFactory.createAddress(sipURI);
-                                       if(fromName != null && fromName.length() 
> 0) {
-                                               
contactAddress.setDisplayName(fromName);
+                                       if(displayName != null && 
displayName.length() > 0) {
+                                               
contactAddress.setDisplayName(displayName);
                                        }
contactHeader = SipFactories.headerFactory.createContactHeader(contactAddress);
                                } else {
- contactHeader = JainSipUtils.createContactHeader(getSipNetworkInterfaceManager(), requestToWrap, fromName, null); + contactHeader = JainSipUtils.createContactHeader(getSipNetworkInterfaceManager(), requestToWrap, displayName, fromName, null);
                                }
                        }
                        // Add all headers
=======================================
--- /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java Thu Jan 6 05:29:29 2011 +++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java Fri Jan 7 03:52:40 2011
@@ -338,7 +338,7 @@
                                        }
                                    // Add the contact header for the dialog.
                                    ContactHeader contactHeader = 
JainSipUtils.createContactHeader(
- super.sipFactoryImpl.getSipNetworkInterfaceManager(), request, null, outboundInterface); + super.sipFactoryImpl.getSipNetworkInterfaceManager(), request, null, null, outboundInterface);
                                    String transport = "udp";
if(session != null && session.getTransport() != null) transport = session.getTransport(); SipConnector sipConnector = StaticServiceHolder.sipStandardService.findSipConnector(transport);
@@ -1155,12 +1155,13 @@
final FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME); final javax.sip.address.URI fromUri = fromHeader.getAddress().getURI();
                                        String fromName = null;
+                                       String displayName = 
fromHeader.getAddress().getDisplayName();
                                        if(fromUri instanceof 
javax.sip.address.SipURI) {
                                                fromName = 
((javax.sip.address.SipURI)fromUri).getUser();
                                        }
                                        // Create the contact name address.
                                        contactHeader =
- JainSipUtils.createContactHeader(sipNetworkInterfaceManager, request, fromName, session.getOutboundInterface()); + JainSipUtils.createContactHeader(sipNetworkInterfaceManager, request, displayName, fromName, session.getOutboundInterface());
                                        request.addHeader(contactHeader);
                                }

=======================================
--- /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/applications/call-forwarding-b2bua-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/b2bua/CallForwardingB2BUASipServlet.java Thu Jan 6 05:29:29 2011 +++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/applications/call-forwarding-b2bua-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/b2bua/CallForwardingB2BUASipServlet.java Fri Jan 7 03:52:40 2011
@@ -158,7 +158,8 @@
        @Override
protected void doInvite(SipServletRequest request) throws ServletException,
                        IOException {
-               // Issue 1484 : 
http://code.google.com/p/mobicents/issues/detail?id=1484
+ request.getApplicationSession().setAttribute("double-callback-test", request.getHeader("DOUBLE")!=null);
+                       // Issue 1484 : 
http://code.google.com/p/mobicents/issues/detail?id=1484
                // check the state of the session it shouldn't be Terminated
                request.getSession().getAttribute("Foo");
                State state = request.getSession().getState();
@@ -573,6 +574,28 @@
        }

        public void sessionReadyToInvalidate(SipApplicationSessionEvent ev) {
+               // Issue 
http://code.google.com/p/mobicents/issues/detail?id=2246
+ String fromName = ev.getApplicationSession().getAttribute("double-callback-test").toString();
+               if(fromName.contains("true")) {
+ boolean doubleCallback = ev.getApplicationSession().getAttribute("double") != null;
+                       if(doubleCallback) {
+                               try {
+                                       new 
File("b2buaSessionDoubleCallbackTest").createNewFile();
+                               } catch (IOException e) {
+                                       // TODO Auto-generated catch block
+                                       e.printStackTrace();
+                               }
+                       } else {
+                               
ev.getApplicationSession().setAttribute("double","");
+                       }
+                       try {
+                               Thread.sleep(1000*5);
+                       } catch (Exception e) {
+                               // TODO Auto-generated catch block
+                               e.printStackTrace();
+                       }
+                       logger.info("ev" + ev.getApplicationSession(), new 
RuntimeException());
+               }
Integer nbTimesCalled = (Integer) ev.getApplicationSession().getAttribute(TEST_SIP_APP_SESSION_READY_TO_BE_INVALIDATED);
                if(nbTimesCalled != null) {
ev.getApplicationSession().setAttribute(TEST_SIP_APP_SESSION_READY_TO_BE_INVALIDATED, Integer.valueOf(nbTimesCalled.intValue() + 1));
=======================================
--- /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java Thu Jan 6 05:29:29 2011 +++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/applications/shootist-sip-servlet/src/main/java/org/mobicents/servlet/sip/testsuite/ShootistSipServlet.java Fri Jan 7 03:52:40 2011
@@ -55,7 +55,10 @@
        private static final String CONTENT_TYPE = "text/plain;charset=UTF-8";
        private static final String ENCODE_URI = "encodedURI";
        private static final String TEST_ERROR_RESPONSE = "testErrorResponse";
- private static transient Logger logger = Logger.getLogger(ShootistSipServlet.class); + private static transient Logger logger = Logger.getLogger(ShootistSipServlet.class);
+
+       int numberOf183Responses = 0;
+
        @Resource
        TimerService timerService;
        @Resource
@@ -73,7 +76,8 @@

        @Override
        protected void doProvisionalResponse(SipServletResponse resp)
-                       throws ServletException, IOException {
+                       throws ServletException, IOException {
+               if(resp.getStatus() == 183) numberOf183Responses++;
                if(resp.getHeader("require") != null) {
                        SipServletRequest prack = resp.createPrack();
SipFactory sipFactory = (SipFactory) getServletContext().getAttribute(SIP_FACTORY);
@@ -241,7 +245,7 @@
                                return;
                        }
                } else {
- sipServletRequest = sipFactory.createRequest(sipApplicationSession, method, fromURI, toURI); + sipServletRequest = sipFactory.createRequest(sipApplicationSession, method, sipFactory.createAddress(fromURI, "from display"), sipFactory.createAddress(toURI,"to display"));
                }

String authHeader = ce.getServletContext().getInitParameter("auth-header");
@@ -433,6 +437,8 @@
                        sipServletRequest.setRequestURI(sipUri);
                        sipServletRequest.setContentLength(content.length());
                        sipServletRequest.setContent(content, CONTENT_TYPE);
+ sipServletRequest.setHeader("EarlyMediaResponses", new Integer(numberOf183Responses).toString());
+
                        sipServletRequest.send();
                } catch (ServletParseException e) {
                        logger.error("Exception occured while parsing the 
addresses",e);
=======================================
--- /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/AllTests.java Thu Jan 6 05:29:29 2011 +++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/AllTests.java Fri Jan 7 03:52:40 2011
@@ -23,6 +23,7 @@
 import org.mobicents.servlet.sip.testsuite.address.SipURITest;
 import org.mobicents.servlet.sip.testsuite.address.TelURLTest;
 import org.mobicents.servlet.sip.testsuite.annotations.AnnotationTest;
+import org.mobicents.servlet.sip.testsuite.b2bua.B2BUASessionCallbackTest;
 import org.mobicents.servlet.sip.testsuite.b2bua.B2BUASipUnitTest;
 import org.mobicents.servlet.sip.testsuite.b2bua.B2BUATcpUdpTest;
import org.mobicents.servlet.sip.testsuite.b2bua.prack.CallForwardingB2BUAPrackTest;
@@ -109,6 +110,7 @@
                suite.addTestSuite(ShootistSipServletAuthTest.class);
                suite.addTestSuite(B2BUASipUnitTest.class);
                suite.addTestSuite(B2BUATcpUdpTest.class);
+               suite.addTestSuite(B2BUASessionCallbackTest.class);
                suite.addTestSuite(CallBlockingTest.class);
                suite.addTestSuite(CallForwardingJunitTest.class);
                suite.addTestSuite(CallForwardingSipUnitTest.class);
=======================================
--- /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java Thu Jan 6 05:29:29 2011 +++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java Fri Jan 7 03:52:40 2011
@@ -1101,6 +1101,9 @@
                                
Thread.sleep(getTimeToWaitBetweenProvisionnalResponse());
                                Response response = 
protocolObjects.messageFactory.createResponse(
                                                provisionalResponseToSend, 
request);
+                               if(response.getStatusCode() == 183) {
+                                       response.setReasonPhrase("different" + 
System.nanoTime());
+                               }
if(provisionalResponseToSend >= Response.TRYING && provisionalResponseToSend < Response.OK) {
                                        ToHeader toHeader = (ToHeader) 
response.getHeader(ToHeader.NAME);
if(provisionalResponseToSend != Response.TRYING && toHeader.getTag() == null) {
=======================================
--- /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java Thu Jan 6 05:29:29 2011 +++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/simple/ShootistSipServletTest.java Fri Jan 7 03:52:40 2011
@@ -17,6 +17,7 @@
 package org.mobicents.servlet.sip.testsuite.simple;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -168,6 +169,37 @@
assertTrue("sipSessionReadyToInvalidate", allMessagesContent.contains("sipSessionReadyToInvalidate")); assertTrue("sipAppSessionReadyToInvalidate", allMessagesContent.contains("sipAppSessionReadyToInvalidate"));
        }
+
+       public void testShootistEarlyMediaChange() throws Exception {
+//             receiver.sendInvite();
+               receiverProtocolObjects =new ProtocolObjects(
+                               "sender", "gov.nist", TRANSPORT, AUTODIALOG, 
null, null, null);
+
+               LinkedList<Integer> responses = new LinkedList<Integer>();
+               responses.add(180);
+               responses.add(183);
+               responses.add(183);
+               responses.add(183);
+ receiver = new TestSipListener(5080, 5070, receiverProtocolObjects, false);
+
+               receiver.setProvisionalResponsesToSend(responses);
+               receiver.setWaitForCancel(true);
+               SipProvider senderProvider = receiver.createProvider();
+
+               senderProvider.addSipListener(receiver);
+
+               receiverProtocolObjects.start();
+               tomcat.startTomcat();
+               deployApplication("cancel", "true");
+               Thread.sleep(DIALOG_TIMEOUT + TIMEOUT);
+               assertTrue(receiver.isCancelReceived());
+               List<String> allMessagesContent = 
receiver.getAllMessagesContent();
+
+ assertTrue("earlyMedia", receiver.getMessageRequest().getHeader("EarlyMediaResponses").toString().contains("3"));
+               assertTrue(allMessagesContent.size() >= 2);
+ assertTrue("sipSessionReadyToInvalidate", allMessagesContent.contains("sipSessionReadyToInvalidate")); + assertTrue("sipAppSessionReadyToInvalidate", allMessagesContent.contains("sipAppSessionReadyToInvalidate"));
+       }

        public void testShootistSetContact() throws Exception {
 //             receiver.sendInvite();
@@ -429,6 +461,9 @@
                assertTrue(receiver.getByeReceived());
ContactHeader contactHeader = (ContactHeader) receiver.getInviteRequest().getHeader(ContactHeader.NAME); assertFalse(((SipURI)contactHeader.getAddress().getURI()).toString().contains("transport=udp"));
+               String contact = contactHeader.getAddress().toString();
+               assertTrue(contact.contains("BigGuy@"));
+               assertTrue(contact.contains("from display"));
        }

        public void testShootistContactTlsTransport() throws Exception {
=======================================
--- /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/resources/log4j.xml Fri Jul 11 23:45:59 2008 +++ /branches/jbcp/5.x-mead/sip-servlets/sip-servlets-test-suite/testsuite/src/test/resources/log4j.xml Fri Jan 7 03:52:40 2011
@@ -8,14 +8,14 @@
     <!-- Keep one backup file -->
     <param name="MaxBackupIndex" value="20"/>
     <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%p %t %l - %m%n"/>
+      <param name="ConversionPattern" value="%d %p %t %l - %m%n"/>
     </layout>
   </appender>

   <appender name="console" class="org.apache.log4j.ConsoleAppender">
     <param name="Target" value="System.out"/>
     <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%p %t %l - %m%n"/>
+      <param name="ConversionPattern" value="%d %p %t %l - %m%n"/>
     </layout>
   </appender>
   <root>

Reply via email to