Update to latest JAIN SIP Merge

(cherry picked from commit b6fe31f)

Conflicts:
	sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/mss-sip-stack-jboss-trying.properties
	sip-servlets-test-suite/sipp-scenarios/performance/mss-sip-stack-trying.properties

Author: deruelle

sip-servlets-impl/docs/jboss5/mss-sip-stack.properties

@@ -8,4 +8,5 @@ gov.nist.javax.sip.DELIVER_UNSOLICITED_NOTIFY=true
 gov.nist.javax.sip.THREAD_POOL_SIZE=64
 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.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

@@ -13,4 +13,5 @@ gov.nist.javax.sip.SEND_UDP_BUFFER_SIZE=65536
 gov.nist.javax.sip.AGGRESSIVE_CLEANUP=true
 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.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

@@ -1901,7 +1901,7 @@ public void setCurrentApplicationName(String currentApplicationName) {
 	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

@@ -19,4 +19,5 @@ org.mobicents.ha.javax.sip.cache.MobicentsSipCache.cacheName=standard-session-ca
 # 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
-org.mobicents.ha.javax.sip.REPLICATION_STRATEGY=EarlyDialog
+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

@@ -21,4 +21,5 @@ org.mobicents.ha.javax.sip.cache.MobicentsSipCache.cacheName=standard-session-ca
 #gov.nist.javax.sip.MESSAGE_PARSER_FACTORY=gov.nist.javax.sip.parser.chars.CharsMsgParserFactory
 # 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.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

@@ -18,4 +18,5 @@ org.mobicents.ha.javax.sip.cache.MobicentsSipCache.cacheName=standard-session-ca
 #gov.nist.javax.sip.MESSAGE_PARSER_FACTORY=gov.nist.javax.sip.parser.chars.CharsMsgParserFactory
 # 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.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

@@ -15,4 +15,5 @@ gov.nist.javax.sip.RECEIVE_UDP_BUFFER_SIZE=65536
 gov.nist.javax.sip.SEND_UDP_BUFFER_SIZE=65536
 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.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

@@ -13,4 +13,5 @@ gov.nist.javax.sip.SEND_UDP_BUFFER_SIZE=65536
 gov.nist.javax.sip.AGGRESSIVE_CLEANUP=true
 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.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

@@ -27,3 +27,4 @@ org.mobicents.ha.javax.sip.CACHE_CLASS_NAME=org.mobicents.ha.javax.sip.cache.NoC
 # 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

@@ -13,4 +13,5 @@ gov.nist.javax.sip.SEND_UDP_BUFFER_SIZE=65536
 gov.nist.javax.sip.AGGRESSIVE_CLEANUP=true
 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.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.properties

@@ -16,4 +16,5 @@ gov.nist.javax.sip.SEND_UDP_BUFFER_SIZE=65536
 gov.nist.javax.sip.AGGRESSIVE_CLEANUP=true
 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.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

@@ -14,4 +14,5 @@ gov.nist.javax.sip.MAX_LISTENER_RESPONSE_TIME=120
 gov.nist.javax.sip.MAX_MESSAGE_SIZE=10000
 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.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

@@ -9,4 +9,5 @@ gov.nist.javax.sip.THREAD_POOL_SIZE=64
 gov.nist.javax.sip.REENTRANT_LISTENER=true
 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.AUTOMATIC_DIALOG_ERROR_HANDLING=false
+gov.nist.javax.sip.MESSAGE_PROCESSOR_FACTORY=gov.nist.javax.sip.stack.NioMessageProcessorFactory