Revision: b6fe31f1f14a
Author: Jean Deruelle <[email protected]>
Date: Sun Dec 9 04:25:23 2012
Log: Update to latest JAIN SIP Merge
http://code.google.com/p/sipservlets/source/detail?r=b6fe31f1f14a
Modified:
/sip-servlets-impl/docs/jboss5/mss-sip-stack.properties
/sip-servlets-impl/docs/mss-sip-stack.properties
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/mss-sip-stack-jboss-early-failover.properties
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/mss-sip-stack-jboss.properties
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/performance/mss-sip-stack-jboss.properties
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss/mss-sip-stack.properties
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss/performance/mss-sip-stack.properties
/sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/mss-sip-stack-jboss-trying.properties
/sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/mss-sip-stack-jboss.properties
/sip-servlets-test-suite/sipp-scenarios/performance/jboss-setup/mss-sip-stack.properties
/sip-servlets-test-suite/sipp-scenarios/performance/mss-sip-stack-trying.properties
/sip-servlets-test-suite/sipp-scenarios/performance/mss-sip-stack.properties
/sip-servlets-test-suite/sipp-scenarios/performance/tomcat-setup/mss-sip-stack.properties
/sip-servlets-test-suite/testsuite/src/test/resources/mss-sip-stack.properties
=======================================
--- /sip-servlets-impl/docs/jboss5/mss-sip-stack.properties Mon Oct 11
04:41:47 2010
+++ /sip-servlets-impl/docs/jboss5/mss-sip-stack.properties Sun Dec 9
04:25:23 2012
@@ -9,3 +9,4 @@
gov.nist.javax.sip.REENTRANT_LISTENER=true
gov.nist.javax.sip.MAX_FORK_TIME_SECONDS=0
gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING=false
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
=======================================
--- /sip-servlets-impl/docs/mss-sip-stack.properties Mon Oct 11 04:41:47
2010
+++ /sip-servlets-impl/docs/mss-sip-stack.properties Sun Dec 9 04:25:23
2012
@@ -14,3 +14,4 @@
gov.nist.javax.sip.MAX_FORK_TIME_SECONDS=0
org.mobicents.ha.javax.sip.CACHE_CLASS_NAME=org.mobicents.ha.javax.sip.cache.NoCache
gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING=false
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java
Mon Aug 13 12:29:49 2012
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java
Sun Dec 9 04:25:23 2012
@@ -1894,7 +1894,7 @@
public String getLocalAddr() {
final SIPTransaction sipTransaction =
(SIPTransaction)getTransaction();
if(sipTransaction != null) {
- return
sipTransaction.getHostPort().getHost().getIpAddress();
+ return sipTransaction.getHost();
} else {
final String transport =
JainSipUtils.findTransport(message);
final MobicentsExtendedListeningPoint listeningPoint =
sipFactoryImpl.getSipNetworkInterfaceManager().findMatchingListeningPoint(transport,
false);
=======================================
---
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/mss-sip-stack-jboss-early-failover.properties
Thu Dec 2 08:02:51 2010
+++
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/mss-sip-stack-jboss-early-failover.properties
Sun Dec 9 04:25:23 2012
@@ -20,3 +20,4 @@
# but won't work on chained applications so false by default
gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING=false
org.mobicents.ha.javax.sip.REPLICATION_STRATEGY=EarlyDialog
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
=======================================
---
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/mss-sip-stack-jboss.properties
Wed Aug 10 02:19:02 2011
+++
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/mss-sip-stack-jboss.properties
Sun Dec 9 04:25:23 2012
@@ -22,3 +22,4 @@
# set to true so that the stack do more validation on dialog,
# but won't work on chained applications so false by default
gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING=false
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
=======================================
---
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/performance/mss-sip-stack-jboss.properties
Mon Oct 11 04:41:47 2010
+++
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/performance/mss-sip-stack-jboss.properties
Sun Dec 9 04:25:23 2012
@@ -19,3 +19,4 @@
# set to true so that the stack do more validation on dialog,
# but won't work on chained applications so false by default
gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING=false
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
=======================================
---
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss/mss-sip-stack.properties
Wed Aug 10 02:19:02 2011
+++
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss/mss-sip-stack.properties
Sun Dec 9 04:25:23 2012
@@ -16,3 +16,4 @@
gov.nist.javax.sip.AGGRESSIVE_CLEANUP=true
gov.nist.javax.sip.MAX_FORK_TIME_SECONDS=0
gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING=false
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
=======================================
---
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss/performance/mss-sip-stack.properties
Mon Oct 11 04:41:47 2010
+++
/sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss/performance/mss-sip-stack.properties
Sun Dec 9 04:25:23 2012
@@ -14,3 +14,4 @@
gov.nist.javax.sip.MAX_FORK_TIME_SECONDS=0
org.mobicents.ha.javax.sip.CACHE_CLASS_NAME=org.mobicents.ha.javax.sip.cache.NoCache
gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING=false
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
=======================================
---
/sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/mss-sip-stack-jboss-trying.properties
Fri Aug 31 09:25:53 2012
+++
/sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/mss-sip-stack-jboss-trying.properties
Sun Dec 9 04:25:23 2012
@@ -27,3 +27,4 @@
# set to true so that the stack do more validation on dialog,
# but won't work on chained applications so false by default
gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING=false
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
=======================================
---
/sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/mss-sip-stack-jboss.properties
Thu Jul 26 07:35:52 2012
+++
/sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/mss-sip-stack-jboss.properties
Sun Dec 9 04:25:23 2012
@@ -27,3 +27,4 @@
# set to true so that the stack do more validation on dialog,
# but won't work on chained applications so false by default
gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING=false
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
=======================================
---
/sip-servlets-test-suite/sipp-scenarios/performance/jboss-setup/mss-sip-stack.properties
Mon Oct 11 04:41:47 2010
+++
/sip-servlets-test-suite/sipp-scenarios/performance/jboss-setup/mss-sip-stack.properties
Sun Dec 9 04:25:23 2012
@@ -14,3 +14,4 @@
gov.nist.javax.sip.MAX_FORK_TIME_SECONDS=0
org.mobicents.ha.javax.sip.CACHE_CLASS_NAME=org.mobicents.ha.javax.sip.cache.NoCache
gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING=false
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
=======================================
---
/sip-servlets-test-suite/sipp-scenarios/performance/mss-sip-stack-trying.properties
Fri Aug 31 09:25:53 2012
+++
/sip-servlets-test-suite/sipp-scenarios/performance/mss-sip-stack-trying.properties
Sun Dec 9 04:25:23 2012
@@ -20,3 +20,4 @@
org.mobicents.ext.java.sip.TRANSACTION_FACTORY=org.mobicents.ext.javax.sip.MobicentsTransactionFactory
org.mobicents.ext.java.sip.SIP_PROVIDER_FACTORY=org.mobicents.ext.javax.sip.MobicentsSipProviderFactory
org.mobicents.ext.java.sip.SEND_TRYING_RIGHT_AWAY=true
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
=======================================
---
/sip-servlets-test-suite/sipp-scenarios/performance/mss-sip-stack.properties
Wed Aug 10 02:19:02 2011
+++
/sip-servlets-test-suite/sipp-scenarios/performance/mss-sip-stack.properties
Sun Dec 9 04:25:23 2012
@@ -17,3 +17,4 @@
gov.nist.javax.sip.MAX_FORK_TIME_SECONDS=0
org.mobicents.ha.javax.sip.CACHE_CLASS_NAME=org.mobicents.ha.javax.sip.cache.NoCache
gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING=false
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
=======================================
---
/sip-servlets-test-suite/sipp-scenarios/performance/tomcat-setup/mss-sip-stack.properties
Wed Aug 10 02:19:02 2011
+++
/sip-servlets-test-suite/sipp-scenarios/performance/tomcat-setup/mss-sip-stack.properties
Sun Dec 9 04:25:23 2012
@@ -15,3 +15,4 @@
gov.nist.javax.sip.AGGRESSIVE_CLEANUP=true
gov.nist.javax.sip.MAX_FORK_TIME_SECONDS=0
gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING=false
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
=======================================
---
/sip-servlets-test-suite/testsuite/src/test/resources/mss-sip-stack.properties
Mon Oct 11 04:41:47 2010
+++
/sip-servlets-test-suite/testsuite/src/test/resources/mss-sip-stack.properties
Sun Dec 9 04:25:23 2012
@@ -10,3 +10,4 @@
gov.nist.javax.sip.AGGRESSIVE_CLEANUP=true
gov.nist.javax.sip.MAX_FORK_TIME_SECONDS=0
gov.nist.javax.sip.AUTOMATIC_DIALOG_ERROR_HANDLING=false
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory
