Revision: 16426
Author: [email protected]
Date: Fri Jan 14 07:34:35 2011
Log: Update Issue 674
Removing more dependencies on internal jain sip classes and moving to Ext
interfaces that will be standardized in the next rev of the spec
http://code.google.com/p/mobicents/source/detail?r=16426
Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/RequestDispatcher.java
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/ResponseDispatcher.java
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyUtils.java
/trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheClusteredSipSession.java
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java
Mon Dec 20 06:05:51 2010
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java
Fri Jan 14 07:34:35 2011
@@ -1048,18 +1048,17 @@
SipSessionKey sipSessionKey =
sipServletMessage.getSipSessionKey();
MobicentsSipSession sipSession =
sipServletMessage.getSipSession();
boolean appNotifiedOfPrackNotReceived =
false;
+ // session can be null if a message was sent outside of the container
by the container itself during Initial request dispatching
+ // but the external host doesn't send any response so we call out to
the application only if the session is not null
if(sipSession != null) {
SipContext sipContext =
findSipApplication(sipSessionKey.getApplicationName());
//the context can be null if
the server is being shutdown
if(sipContext != null) {
try {
sipContext.enterSipApp(sipSession.getSipApplicationSession(),
sipSession);
- // session can be null if a message was sent outside of the
container by the container itself during Initial request dispatching
- // but the external host doesn't send any response so we call out
to the applicationonly if the session is not null
// naoki : Fix for Issue 1618
http://code.google.com/p/mobicents/issues/detail?id=1618 on Timeout don't
do the 408 processing for Server Transactions
if(sipServletMessage instanceof SipServletRequestImpl
&& !timeoutEvent.isServerTransaction()) {
try {
-
boolean finalizedProxy = false;
ProxyBranchImpl proxyBranchImpl = tad.getProxyBranch();
if(proxyBranchImpl != null) {
ProxyImpl proxy = (ProxyImpl) proxyBranchImpl.getProxy();
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/RequestDispatcher.java
Mon Dec 6 06:38:50 2010
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/RequestDispatcher.java
Fri Jan 14 07:34:35 2011
@@ -17,11 +17,10 @@
package org.mobicents.servlet.sip.core.dispatchers;
import gov.nist.javax.sip.TransactionExt;
-import gov.nist.javax.sip.message.SIPMessage;
+import gov.nist.javax.sip.message.MessageExt;
import java.text.ParseException;
-import javax.servlet.sip.SipURI;
import javax.servlet.sip.ar.SipRouteModifier;
import javax.sip.ClientTransaction;
import javax.sip.Dialog;
@@ -77,7 +76,7 @@
//Add via header
String transport = JainSipUtils.findTransport(clonedRequest);
- ((SIPMessage)clonedRequest).setApplicationData(null);
+ ((MessageExt)clonedRequest).setApplicationData(null);
MobicentsSipSession session = sipServletRequest.getSipSession();
String outboundInterface = null;
if(session != null) {
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/ResponseDispatcher.java
Thu Jan 6 13:34:01 2011
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/ResponseDispatcher.java
Fri Jan 14 07:34:35 2011
@@ -16,7 +16,7 @@
*/
package org.mobicents.servlet.sip.core.dispatchers;
-import gov.nist.javax.sip.message.SIPMessage;
+import gov.nist.javax.sip.message.MessageExt;
import gov.nist.javax.sip.stack.SIPTransaction;
import java.io.IOException;
@@ -413,7 +413,7 @@
final ClientTransaction clientTransaction = (ClientTransaction)
sipServletResponse.getTransaction();
final Dialog dialog = sipServletResponse.getDialog();
final Response newResponse = (Response)
response.clone();
- ((SIPMessage)newResponse).setApplicationData(null);
+ ((MessageExt)newResponse).setApplicationData(null);
newResponse.removeFirst(ViaHeader.NAME);
//forward it statefully
//TODO should decrease the max forward header to avoid
infinite loop
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
Fri Jan 14 03:08:28 2011
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
Fri Jan 14 07:34:35 2011
@@ -19,8 +19,6 @@
import gov.nist.javax.sip.ServerTransactionExt;
import gov.nist.javax.sip.address.SipUri;
import gov.nist.javax.sip.message.MessageExt;
-import gov.nist.javax.sip.message.SIPMessage;
-import gov.nist.javax.sip.message.SIPRequest;
import java.io.IOException;
import java.io.Serializable;
@@ -429,9 +427,13 @@
Request request = (Request)
sessionCreatingTransactionRequest.getMessage().clone();
// Issue 1524 : Caused by: java.text.ParseException: CSEQ method
mismatch with Request-Line
javax.sip.address.URI requestUri = (javax.sip.address.URI)
request.getRequestURI().clone();
- ((SIPRequest)request).setMethod(method);
-
((SIPRequest)request).setRequestURI(requestUri);
-
((SIPMessage)request).setApplicationData(null);
+ try {
+ request.setMethod(method);
+ } catch (ParseException e) {
+ throw new IllegalArgumentException("Unexpected exception happened on
setting method " + method, e);
+ }
+ request.setRequestURI(requestUri);
+
((MessageExt)request).setApplicationData(null);
final CSeqHeader cSeqHeader = (CSeqHeader)
request.getHeader((CSeqHeader.NAME));
try {
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java
Tue Dec 28 18:56:39 2010
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java
Fri Jan 14 07:34:35 2011
@@ -18,7 +18,7 @@
import gov.nist.javax.sip.header.HeaderExt;
import gov.nist.javax.sip.header.ims.PathHeader;
-import gov.nist.javax.sip.message.SIPMessage;
+import gov.nist.javax.sip.message.MessageExt;
import java.io.Serializable;
import java.text.ParseException;
@@ -143,7 +143,7 @@
try {
final SipServletRequestImpl origRequestImpl = (SipServletRequestImpl)
origRequest;
Request newRequest = (Request)
origRequestImpl.message.clone();
- ((SIPMessage)newRequest).setApplicationData(null);
+ ((MessageExt)newRequest).setApplicationData(null);
//content should be copied too, so commented out
// newRequest.removeContent();
//removing the via header from original request
@@ -722,7 +722,7 @@
try {
final SipServletRequestImpl origRequestImpl = (SipServletRequestImpl)
origRequest;
final Request newRequest = (Request)
origRequestImpl.message.clone();
- ((SIPMessage)newRequest).setApplicationData(null);
+ ((MessageExt)newRequest).setApplicationData(null);
//removing the via header from original request
newRequest.removeHeader(ViaHeader.NAME);
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java
Fri Dec 17 07:07:41 2010
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java
Fri Jan 14 07:34:35 2011
@@ -18,7 +18,7 @@
import gov.nist.javax.sip.TransactionExt;
import gov.nist.javax.sip.header.Via;
-import gov.nist.javax.sip.message.SIPMessage;
+import gov.nist.javax.sip.message.MessageExt;
import gov.nist.javax.sip.stack.SIPClientTransaction;
import java.io.Externalizable;
@@ -145,7 +145,7 @@
// will clone this request (with it's custome headers and routes), but
we will override
// the modified RR and Path parameters (as defined in the spec).
Request cloned = (Request)originalRequest.getMessage().clone();
- ((SIPMessage)cloned).setApplicationData(null);
+ ((MessageExt)cloned).setApplicationData(null);
this.outgoingRequest = new SipServletRequestImpl(
cloned,
proxy.getSipFactoryImpl(),
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyUtils.java
Fri Dec 17 05:56:48 2010
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyUtils.java
Fri Jan 14 07:34:35 2011
@@ -19,7 +19,6 @@
import gov.nist.javax.sip.header.HeaderFactoryExt;
import gov.nist.javax.sip.header.ims.PathHeader;
import gov.nist.javax.sip.message.MessageExt;
-import gov.nist.javax.sip.message.SIPMessage;
import gov.nist.javax.sip.stack.SIPTransaction;
import java.util.Iterator;
@@ -63,7 +62,7 @@
final String method = clonedRequest.getMethod();
final ProxyImpl proxy = (ProxyImpl)
proxyBranch.getProxy();
final SipFactoryImpl sipFactoryImpl =
proxy.getSipFactoryImpl();
- ((SIPMessage)clonedRequest).setApplicationData(null);
+ ((MessageExt)clonedRequest).setApplicationData(null);
String outboundTransport =
JainSipUtils.findTransport(clonedRequest);
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheClusteredSipSession.java
Fri Oct 8 00:53:57 2010
+++
/trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheClusteredSipSession.java
Fri Jan 14 07:34:35 2011
@@ -28,9 +28,7 @@
import org.apache.catalina.Container;
import org.apache.catalina.Engine;
import org.apache.catalina.Service;
-import org.apache.catalina.connector.Connector;
import org.apache.log4j.Logger;
-import org.mobicents.servlet.sip.core.session.DistributableSipManager;
import
org.mobicents.servlet.sip.core.session.MobicentsSipApplicationSession;
import org.mobicents.servlet.sip.core.session.SessionManagerUtil;
import org.mobicents.servlet.sip.core.session.SipSessionKey;