Skip to content

Commit 90084f3

Browse files
author
[email protected]
committed
Fixes Issue 2466
git-svn-id: https://mobicents.googlecode.com/svn/trunk/servers/sip-servlets@17728 bf0df8d0-2c1f-0410-b170-bd30377b63dc
1 parent 6021494 commit 90084f3

25 files changed

+8
-31
lines changed

‎sip-servlets-bootstrap/release/server-jboss-5.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
<Service name="jboss.web"
1010
className="org.mobicents.servlet.sip.startup.SipStandardService"
1111
sipPathName="org.mobicents.ha"
12-
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
13-
concurrencyControlMode="None"
12+
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
1413
congestionControlCheckingInterval="-1"
1514
darConfigurationFileLocation="conf/dars/mobicents-dar.properties"
1615
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-bootstrap/release/server-jboss.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
<Service name="jboss.web"
1414
className="org.mobicents.servlet.sip.startup.SipStandardService"
1515
sipPathName="org.mobicents.ha"
16-
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
17-
concurrencyControlMode="None"
16+
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
1817
darConfigurationFileLocation="conf/dars/mobicents-dar.properties"
1918
sipStackPropertiesFile="conf/mss-sip-stack.properties">
2019

‎sip-servlets-bootstrap/release/server-tomcat-6.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
-->
5353
<Service name="Sip-Servlets"
5454
className="org.mobicents.servlet.sip.startup.SipStandardService"
55-
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
56-
concurrencyControlMode="None"
55+
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
5756
congestionControlCheckingInterval="-1"
5857
darConfigurationFileLocation="conf/dars/mobicents-dar.properties"
5958
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-impl/docs/failover-server-jboss.xml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
balancers="127.0.0.1"
1414
sipPathName="org.mobicents.ha"
1515
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
16-
concurrencyControlMode="None"
1716
darConfigurationFileLocation="conf/dars/mobicents-dar.properties">
1817

1918
<!-- A "Connector" represents an endpoint by which requests are received

‎sip-servlets-impl/docs/failover-server-tomcat-6.xml

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<Service name="Sip-Servlets"
5454
className="org.mobicents.servlet.sip.startup.SipStandardService"
5555
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
56-
concurrencyControlMode="None"
5756
balancers="127.0.0.1"
5857
darConfigurationFileLocation="conf/dars/mobicents-dar.properties"
5958
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-impl/docs/jboss5/failover-server-jboss-5.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
className="org.mobicents.servlet.sip.startup.SipStandardService"
1111
sipPathName="org.mobicents.ha"
1212
balancers="127.0.0.1"
13-
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
14-
concurrencyControlMode="None"
13+
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
1514
congestionControlCheckingInterval="-1"
1615
darConfigurationFileLocation="conf/dars/mobicents-dar.properties"
1716
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-impl/docs/jboss5/server-jboss-5.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
<Service name="jboss.web"
1010
className="org.mobicents.servlet.sip.startup.SipStandardService"
1111
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
12-
sipPathName="org.mobicents.ha"
13-
concurrencyControlMode="None"
12+
sipPathName="org.mobicents.ha"
1413
congestionControlCheckingInterval="-1"
1514
darConfigurationFileLocation="conf/dars/mobicents-dar.properties"
1615
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-impl/docs/server-jboss.xml

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
className="org.mobicents.servlet.sip.startup.SipStandardService"
1515
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
1616
sipPathName="org.mobicents.ha"
17-
concurrencyControlMode="None"
1817
darConfigurationFileLocation="conf/dars/mobicents-dar.properties"
1918
sipStackPropertiesFile="conf/mss-sip-stack.properties">
2019

‎sip-servlets-impl/docs/server-tomcat-6.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
-->
5353
<Service name="Sip-Servlets"
5454
className="org.mobicents.servlet.sip.startup.SipStandardService"
55-
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
56-
concurrencyControlMode="None"
55+
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
5756
congestionControlCheckingInterval="-1"
5857
darConfigurationFileLocation="conf/dars/mobicents-dar.properties"
5958
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/startup/SipStandardService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public class SipStandardService extends StandardService implements SipService {
114114
protected int dispatcherThreadPoolSize = 15;
115115
private boolean md5ContactUserPart = false;
116116

117-
protected String concurrencyControlMode = ConcurrencyControlMode.None.toString();
117+
protected String concurrencyControlMode = ConcurrencyControlMode.SipApplicationSession.toString();
118118
protected String congestionControlPolicy = CongestionControlPolicy.ErrorResponse.toString();
119119
protected String additionalParameterableHeaders;
120120
protected boolean bypassResponseExecutor = true;

‎sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/server-jboss-5-failover-cc-sas-port-1.xml

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
balancers="127.0.0.1"
1212
sipPathName="org.mobicents.ha"
1313
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
14-
concurrencyControlMode="SipApplicationSession"
1514
congestionControlCheckingInterval="-1"
1615
darConfigurationFileLocation="conf/dars/distributable-dar.properties"
1716
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/server-jboss-5-failover-cc-sas-port-2.xml

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
balancers="127.0.0.1"
1212
sipPathName="org.mobicents.ha"
1313
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
14-
concurrencyControlMode="SipApplicationSession"
1514
congestionControlCheckingInterval="-1"
1615
darConfigurationFileLocation="conf/dars/distributable-dar.properties"
1716
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/server-jboss-5-failover-cc-sas-port-3.xml

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
balancers="127.0.0.1"
1212
sipPathName="org.mobicents.ha"
1313
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
14-
concurrencyControlMode="SipApplicationSession"
1514
congestionControlCheckingInterval="-1"
1615
darConfigurationFileLocation="conf/dars/distributable-dar.properties"
1716
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/server-jboss-5-failover-port-1.xml

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
balancers="127.0.0.1"
1212
sipPathName="org.mobicents.ha"
1313
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
14-
concurrencyControlMode="None"
1514
congestionControlCheckingInterval="-1"
1615
darConfigurationFileLocation="conf/dars/distributable-dar.properties"
1716
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss-5/server-jboss-5-failover-port-2.xml

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
balancers="127.0.0.1"
1212
sipPathName="org.mobicents.ha"
1313
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
14-
concurrencyControlMode="None"
1514
congestionControlCheckingInterval="-1"
1615
darConfigurationFileLocation="conf/dars/distributable-dar.properties"
1716
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss/performance/server-jboss-failover-port-1.xml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
balancers="127.0.0.1"
1616
sipPathName="org.mobicents.ha"
1717
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
18-
concurrencyControlMode="None"
1918
congestionControlCheckingInterval="-1"
2019
darConfigurationFileLocation="conf/dars/distributable-dar.properties"
2120
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss/performance/server-jboss-failover-port-2.xml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
balancers="127.0.0.1"
1616
sipPathName="org.mobicents.ha"
1717
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
18-
concurrencyControlMode="None"
1918
congestionControlCheckingInterval="-1"
2019
darConfigurationFileLocation="conf/dars/distributable-dar.properties"
2120
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss/server-jboss-failover-all.xml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
balancers="192.168.0.10"
1616
sipPathName="org.mobicents.ha"
1717
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
18-
concurrencyControlMode="None"
1918
darConfigurationFileLocation="conf/dars/distributable-dar.properties"
2019
sipStackPropertiesFile="conf/mss-sip-stack.properties">
2120

‎sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss/server-jboss-failover-port-1.xml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
balancers="127.0.0.1"
1616
sipPathName="org.mobicents.ha"
1717
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
18-
concurrencyControlMode="None"
1918
darConfigurationFileLocation="conf/dars/distributable-dar.properties"
2019
sipStackPropertiesFile="conf/mss-sip-stack.properties">
2120

‎sip-servlets-test-suite/sipp-scenarios/clustering/setup/jboss/server-jboss-failover-port-2.xml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
balancers="127.0.0.1"
1616
sipPathName="org.mobicents.ha"
1717
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
18-
concurrencyControlMode="None"
1918
darConfigurationFileLocation="conf/dars/distributable-dar.properties"
2019
sipStackPropertiesFile="conf/mss-sip-stack.properties">
2120

‎sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/server-jboss-5.xml

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
sipPathName="org.mobicents.ha"
1111
className="org.mobicents.servlet.sip.startup.SipStandardService"
1212
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
13-
concurrencyControlMode="None"
1413
congestionControlCheckingInterval="-1"
1514
darConfigurationFileLocation="conf/dars/mobicents-dar.properties"
1615
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-test-suite/sipp-scenarios/performance/jboss-setup/server-jboss.xml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<Service name="jboss.web"
1414
className="org.mobicents.servlet.sip.startup.SipStandardService"
1515
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
16-
concurrencyControlMode="None"
1716
sipPathName="org.mobicents.ha"
1817
congestionControlCheckingInterval="-1"
1918
darConfigurationFileLocation="conf/dars/mobicents-dar.properties"

‎sip-servlets-test-suite/sipp-scenarios/performance/simple-flow/performance-uac.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<recv response="100" optional="true">
3535
</recv>
3636

37-
<recv response="180" optional="true">
37+
<recv response="180" rtd="true" optional="true">
3838
</recv>
3939

4040
<recv response="200" rtd="true" rrs="true">

‎sip-servlets-test-suite/sipp-scenarios/performance/tomcat-setup/server.xml

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
<Service name="Catalina"
4848
className="org.mobicents.servlet.sip.startup.SipStandardService"
4949
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
50-
concurrencyControlMode="None"
5150
congestionControlCheckingInterval="-1"
5251
darConfigurationFileLocation="conf/dars/mobicents-dar.properties"
5352
sipStackPropertiesFile="conf/mss-sip-stack.properties">

‎sip-servlets-test-suite/tck/server.xml

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<Service name="Sip-Servlets"
5454
className="org.mobicents.servlet.sip.startup.SipStandardService"
5555
sipApplicationDispatcherClassName="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
56-
concurrencyControlMode="None"
5756
darConfigurationFileLocation="conf/dars/mobicents-dar.properties"
5857
sipStackPropertiesFile="conf/mss-sip-stack.properties">
5958

0 commit comments

Comments
 (0)