Revision: 1bd85da271a1
Author: Jean Deruelle <[email protected]>
Date: Tue Dec 18 09:29:50 2012
Log: Fixes Issue 87
http://code.google.com/p/sipservlets/source/detail?r=1bd85da271a1
Added:
/containers/sip-servlets-as7-drop-in/patches/patch.domain.sip.dropin.xml
Modified:
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipServerService.java
/containers/sip-servlets-as7-drop-in/patches/patch.standalone.sip.dropin.xml
=======================================
--- /dev/null
+++
/containers/sip-servlets-as7-drop-in/patches/patch.domain.sip.dropin.xml
Tue Dec 18 09:29:50 2012
@@ -0,0 +1,525 @@
+diff --git a/domain.xml b/domain-sip.xml
+index 172b505..b76aef2 100644
+--- a/domain.xml
++++ b/domain-sip.xml
+@@ -1,6 +1,7 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+
+ <domain xmlns="urn:jboss:domain:1.3">
++
+ <extensions>
+ <extension module="org.jboss.as.clustering.infinispan"/>
+ <extension module="org.jboss.as.clustering.jgroups"/>
+@@ -31,11 +32,13 @@
+ <extension module="org.jboss.as.web"/>
+ <extension module="org.jboss.as.webservices"/>
+ <extension module="org.jboss.as.weld"/>
++ <extension module="org.mobicents.as7"/>
+ </extensions>
++
+ <system-properties>
+- <!-- IPv4 is not required, but setting this helps avoid
unintended use of IPv6 -->
+ <property name="java.net.preferIPv4Stack" value="true"/>
+ </system-properties>
++
+ <profiles>
+ <profile name="default">
+ <subsystem xmlns="urn:jboss:domain:logging:1.1">
+@@ -96,7 +99,6 @@
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.1">
+
<spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
+-
<jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.3">
+ <session-bean>
+@@ -172,7 +174,6 @@
+ <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1">
+ <show-model value="true"/>
+- <!--<remoting-connector
use-management-endpoint="false"/>-->
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+ <jpa default-datasource=""/>
+@@ -187,14 +188,13 @@
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.2"
activation="lazy">
+ <properties>
+- <!-- Specifies the beginning start level of the
framework -->
+- <property
name="org.osgi.framework.startlevel.beginning">1</property>
++ <property
name="org.osgi.framework.startlevel.beginning">
++ 1
++ </property>
+ </properties>
+ <capabilities>
+- <!-- modules registered with the OSGi layer on
startup -->
+ <capability name="javax.servlet.api:v25"/>
+ <capability name="javax.transaction.api"/>
+- <!-- bundles started in startlevel 1 -->
+ <capability name="org.apache.felix.log"
startlevel="1"/>
+ <capability name="org.jboss.osgi.logging"
startlevel="1"/>
+ <capability name="org.apache.felix.configadmin"
startlevel="1"/>
+@@ -248,6 +248,12 @@
+ <alias name="example.com"/>
+ </virtual-server>
+ </subsystem>
++ <subsystem xmlns="urn:org.mobicents:sip-servlets-as7:1.0"
application-router="../../configuration/dars/mobicents-dar.properties"
stack-properties="../../configuration/mss-sip-stack.properties"
path-name="gov.nist"
app-dispatcher-class="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
concurrency-control-mode="SipApplicationSession"
congestion-control-interval="-1">
++ <connector name="sip-udp" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-udp"/>
++ <connector name="sip-tcp" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-tcp"/>
++ <connector name="sip-tls" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-tls"/>
++ <connector name="sip-ws" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-ws"/>
++ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.1">
+ <modify-wsdl-address>true</modify-wsdl-address>
+ <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
+@@ -319,7 +325,6 @@
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.1">
+
<spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
+-
<jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.3">
+ <session-bean>
+@@ -369,7 +374,7 @@
+ <file-store/>
+ </replicated-cache>
+ <replicated-cache name="sso" mode="SYNC"
batching="true"/>
+- <distributed-cache name="dist" mode="ASYNC"
batching="true" l1-lifespan="0">
++ <distributed-cache name="dist" l1-lifespan="0"
mode="ASYNC" batching="true">
+ <file-store/>
+ </distributed-cache>
+ </cache-container>
+@@ -379,12 +384,8 @@
+ <eviction strategy="LRU" max-entries="10000"/>
+ <file-store/>
+ </replicated-cache>
+- <!--
+- ~ Clustered cache used internally by EJB subsytem
for managing the client-mapping(s) of
+- ~ the socketbinding referenced by
the EJB remoting connector
+- -->
+ <replicated-cache
name="remote-connector-client-mappings" mode="SYNC" batching="true"/>
+- <distributed-cache name="dist" mode="ASYNC"
batching="true" l1-lifespan="0">
++ <distributed-cache name="dist" l1-lifespan="0"
mode="ASYNC" batching="true">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <file-store/>
+ </distributed-cache>
+@@ -466,7 +467,6 @@
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1">
+ <show-model value="true"/>
+- <!--<remoting-connector
use-management-endpoint="false"/>-->
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+ <jpa default-datasource=""/>
+@@ -488,14 +488,13 @@
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.2"
activation="lazy">
+ <properties>
+- <!-- Specifies the beginning start level of the
framework -->
+- <property
name="org.osgi.framework.startlevel.beginning">1</property>
++ <property
name="org.osgi.framework.startlevel.beginning">
++ 1
++ </property>
+ </properties>
+ <capabilities>
+- <!-- modules registered with the OSGi layer on
startup -->
+ <capability name="javax.servlet.api:v25"/>
+ <capability name="javax.transaction.api"/>
+- <!-- bundles started in startlevel 1 -->
+ <capability name="org.apache.felix.log"
startlevel="1"/>
+ <capability name="org.jboss.osgi.logging"
startlevel="1"/>
+ <capability name="org.apache.felix.configadmin"
startlevel="1"/>
+@@ -550,6 +549,12 @@
+ <alias name="example.com"/>
+ </virtual-server>
+ </subsystem>
++ <subsystem xmlns="urn:org.mobicents:sip-servlets-as7:1.0"
application-router="../../configuration/dars/mobicents-dar.properties"
stack-properties="../../configuration/mss-sip-stack.properties"
path-name="gov.nist"
app-dispatcher-class="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
concurrency-control-mode="SipApplicationSession"
congestion-control-interval="-1">
++ <connector name="sip-udp" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-udp"/>
++ <connector name="sip-tcp" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-tcp"/>
++ <connector name="sip-tls" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-tls"/>
++ <connector name="sip-ws" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-ws"/>
++ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.1">
+ <modify-wsdl-address>true</modify-wsdl-address>
+ <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
+@@ -622,7 +627,6 @@
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.1">
+
<spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
+-
<jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.3">
+ <session-bean>
+@@ -682,11 +686,12 @@
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jacorb:1.2">
+ <orb socket-binding="jacorb"
ssl-socket-binding="jacorb-ssl">
+- <initializers transactions="spec" security="on"/>
++ <initializers security="on" transactions="spec"/>
+ </orb>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxr:1.1">
+ <connection-factory
jndi-name="java:jboss/jaxr/ConnectionFactory"/>
++ <properties/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jca:1.1">
+@@ -711,7 +716,6 @@
+ <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1">
+ <show-model value="true"/>
+- <!--<remoting-connector
use-management-endpoint="false"/>-->
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+ <jpa default-datasource=""/>
+@@ -727,6 +731,7 @@
+ <persistence-enabled>true</persistence-enabled>
+ <journal-file-size>102400</journal-file-size>
+ <journal-min-files>2</journal-min-files>
++
+ <connectors>
+ <netty-connector name="netty"
socket-binding="messaging"/>
+ <netty-connector name="netty-throughput"
socket-binding="messaging-throughput">
+@@ -734,6 +739,7 @@
+ </netty-connector>
+ <in-vm-connector name="in-vm" server-id="0"/>
+ </connectors>
++
+ <acceptors>
+ <netty-acceptor name="netty"
socket-binding="messaging"/>
+ <netty-acceptor name="netty-throughput"
socket-binding="messaging-throughput">
+@@ -742,6 +748,7 @@
+ </netty-acceptor>
+ <in-vm-acceptor name="in-vm" server-id="0"/>
+ </acceptors>
++
+ <security-settings>
+ <security-setting match="#">
+ <permission type="send" roles="guest"/>
+@@ -750,8 +757,8 @@
+ <permission type="deleteNonDurableQueue"
roles="guest"/>
+ </security-setting>
+ </security-settings>
++
+ <address-settings>
+- <!--default for catch all-->
+ <address-setting match="#">
+
<dead-letter-address>jms.queue.DLQ</dead-letter-address>
+
<expiry-address>jms.queue.ExpiryQueue</expiry-address>
+@@ -761,6 +768,7 @@
+
<message-counter-history-day-limit>10</message-counter-history-day-limit>
+ </address-setting>
+ </address-settings>
++
+ <jms-connection-factories>
+ <connection-factory name="InVmConnectionFactory">
+ <connectors>
+@@ -788,21 +796,20 @@
+ </entries>
+ </pooled-connection-factory>
+ </jms-connection-factories>
+- </hornetq-server>
++</hornetq-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:naming:1.2">
+ <remote-naming/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.2"
activation="lazy">
+ <properties>
+- <!-- Specifies the beginning start level of the
framework -->
+- <property
name="org.osgi.framework.startlevel.beginning">1</property>
++ <property
name="org.osgi.framework.startlevel.beginning">
++ 1
++ </property>
+ </properties>
+ <capabilities>
+- <!-- modules registered with the OSGi layer on
startup -->
+ <capability name="javax.servlet.api:v25"/>
+ <capability name="javax.transaction.api"/>
+- <!-- bundles started in startlevel 1 -->
+ <capability name="org.apache.felix.log"
startlevel="1"/>
+ <capability name="org.jboss.osgi.logging"
startlevel="1"/>
+ <capability name="org.apache.felix.configadmin"
startlevel="1"/>
+@@ -856,6 +863,12 @@
+ <alias name="example.com"/>
+ </virtual-server>
+ </subsystem>
++ <subsystem xmlns="urn:org.mobicents:sip-servlets-as7:1.0"
application-router="../../configuration/dars/mobicents-dar.properties"
stack-properties="../../configuration/mss-sip-stack.properties"
path-name="gov.nist"
app-dispatcher-class="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
concurrency-control-mode="SipApplicationSession"
congestion-control-interval="-1">
++ <connector name="sip-udp" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-udp"/>
++ <connector name="sip-tcp" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-tcp"/>
++ <connector name="sip-tls" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-tls"/>
++ <connector name="sip-ws" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-ws"/>
++ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.1">
+ <modify-wsdl-address>true</modify-wsdl-address>
+ <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
+@@ -928,7 +941,6 @@
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.1">
+
<spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
+-
<jboss-descriptor-property-replacement>true</jboss-descriptor-property-replacement>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.3">
+ <session-bean>
+@@ -983,7 +995,7 @@
+ <file-store/>
+ </replicated-cache>
+ <replicated-cache name="sso" mode="SYNC"
batching="true"/>
+- <distributed-cache name="dist" mode="ASYNC"
batching="true" l1-lifespan="0">
++ <distributed-cache name="dist" l1-lifespan="0"
mode="ASYNC" batching="true">
+ <file-store/>
+ </distributed-cache>
+ </cache-container>
+@@ -993,12 +1005,8 @@
+ <eviction strategy="LRU" max-entries="10000"/>
+ <file-store/>
+ </replicated-cache>
+- <!--
+- ~ Clustered cache used internally by EJB subsytem
for managing the client-mapping(s) of
+- ~ the socketbinding referenced by
the EJB remoting connector
+- -->
+ <replicated-cache
name="remote-connector-client-mappings" mode="SYNC" batching="true"/>
+- <distributed-cache name="dist" mode="ASYNC"
batching="true" l1-lifespan="0">
++ <distributed-cache name="dist" l1-lifespan="0"
mode="ASYNC" batching="true">
+ <eviction strategy="LRU" max-entries="10000"/>
+ <file-store/>
+ </distributed-cache>
+@@ -1023,11 +1031,12 @@
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jacorb:1.2">
+ <orb socket-binding="jacorb"
ssl-socket-binding="jacorb-ssl">
+- <initializers transactions="spec" security="on"/>
++ <initializers security="on" transactions="spec"/>
+ </orb>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxr:1.1">
+ <connection-factory
jndi-name="java:jboss/jaxr/ConnectionFactory"/>
++ <properties/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:jca:1.1">
+@@ -1088,7 +1097,6 @@
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jmx:1.1">
+ <show-model value="true"/>
+- <!--<remoting-connector
use-management-endpoint="false"/>-->
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:jpa:1.0">
+ <jpa default-datasource=""/>
+@@ -1105,6 +1113,7 @@
+ <persistence-enabled>true</persistence-enabled>
+ <journal-file-size>102400</journal-file-size>
+ <journal-min-files>2</journal-min-files>
++
+ <connectors>
+ <netty-connector name="netty"
socket-binding="messaging"/>
+ <netty-connector name="netty-throughput"
socket-binding="messaging-throughput">
+@@ -1112,6 +1121,7 @@
+ </netty-connector>
+ <in-vm-connector name="in-vm" server-id="0"/>
+ </connectors>
++
+ <acceptors>
+ <netty-acceptor name="netty"
socket-binding="messaging"/>
+ <netty-acceptor name="netty-throughput"
socket-binding="messaging-throughput">
+@@ -1120,19 +1130,24 @@
+ </netty-acceptor>
+ <in-vm-acceptor name="in-vm" server-id="0"/>
+ </acceptors>
++
+ <broadcast-groups>
+ <broadcast-group name="bg-group1">
+
<socket-binding>messaging-group</socket-binding>
+ <broadcast-period>5000</broadcast-period>
+- <connector-ref>netty</connector-ref>
++ <connector-ref>
++ netty
++ </connector-ref>
+ </broadcast-group>
+ </broadcast-groups>
++
+ <discovery-groups>
+ <discovery-group name="dg-group1">
+
<socket-binding>messaging-group</socket-binding>
+ <refresh-timeout>10000</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
++
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+@@ -1140,6 +1155,7 @@
+ <discovery-group-ref
discovery-group-name="dg-group1"/>
+ </cluster-connection>
+ </cluster-connections>
++
+ <security-settings>
+ <security-setting match="#">
+ <permission type="send" roles="guest"/>
+@@ -1148,18 +1164,19 @@
+ <permission type="deleteNonDurableQueue"
roles="guest"/>
+ </security-setting>
+ </security-settings>
++
+ <address-settings>
+- <!--default for catch all-->
+ <address-setting match="#">
+
<dead-letter-address>jms.queue.DLQ</dead-letter-address>
+
<expiry-address>jms.queue.ExpiryQueue</expiry-address>
+ <redelivery-delay>0</redelivery-delay>
+-
<redistribution-delay>1000</redistribution-delay>
+ <max-size-bytes>10485760</max-size-bytes>
+
<address-full-policy>BLOCK</address-full-policy>
+
<message-counter-history-day-limit>10</message-counter-history-day-limit>
++
<redistribution-delay>1000</redistribution-delay>
+ </address-setting>
+ </address-settings>
++
+ <jms-connection-factories>
+ <connection-factory name="InVmConnectionFactory">
+ <connectors>
+@@ -1187,7 +1204,7 @@
+ </entries>
+ </pooled-connection-factory>
+ </jms-connection-factories>
+- </hornetq-server>
++</hornetq-server>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:modcluster:1.1">
+ <mod-cluster-config advertise-socket="modcluster"
connector="ajp">
+@@ -1201,14 +1218,13 @@
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:osgi:1.2"
activation="lazy">
+ <properties>
+- <!-- Specifies the beginning start level of the
framework -->
+- <property
name="org.osgi.framework.startlevel.beginning">1</property>
++ <property
name="org.osgi.framework.startlevel.beginning">
++ 1
++ </property>
+ </properties>
+ <capabilities>
+- <!-- modules registered with the OSGi layer on
startup -->
+ <capability name="javax.servlet.api:v25"/>
+ <capability name="javax.transaction.api"/>
+- <!-- bundles started in startlevel 1 -->
+ <capability name="org.apache.felix.log"
startlevel="1"/>
+ <capability name="org.jboss.osgi.logging"
startlevel="1"/>
+ <capability name="org.apache.felix.configadmin"
startlevel="1"/>
+@@ -1263,6 +1279,12 @@
+ <alias name="example.com"/>
+ </virtual-server>
+ </subsystem>
++ <subsystem xmlns="urn:org.mobicents:sip-servlets-as7:1.0"
application-router="../../configuration/dars/mobicents-dar.properties"
stack-properties="../../configuration/mss-sip-stack.properties"
path-name="gov.nist"
app-dispatcher-class="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
concurrency-control-mode="SipApplicationSession"
congestion-control-interval="-1">
++ <connector name="sip-udp" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-udp"/>
++ <connector name="sip-tcp" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-tcp"/>
++ <connector name="sip-tls" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-tls"/>
++ <connector name="sip-ws" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-ws"/>
++ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.1">
+ <modify-wsdl-address>true</modify-wsdl-address>
+ <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
+@@ -1276,26 +1298,22 @@
+ <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
+ </profile>
+ </profiles>
+- <!--
+- ~
+- ~ Named interfaces that can be referenced elsewhere in the
configuration. The configuration
+- ~ for how to associate these logical names with an actual
network interface can either
+- ~ be specified here or can be declared on a per-host basis
in the equivalent element in host.xml.
+- ~
+- ~ These default configurations require the binding
specification to be done in host.xml.
+- ~
+- -->
++
+ <interfaces>
+ <interface name="management"/>
+ <interface name="public"/>
+ <interface name="unsecure"/>
+ </interfaces>
++
+ <socket-binding-groups>
+ <socket-binding-group name="standard-sockets"
default-interface="public">
+- <!-- Needed for server groups using the 'default' profile -->
+ <socket-binding name="ajp" port="8009"/>
+ <socket-binding name="http" port="8080"/>
+ <socket-binding name="https" port="8443"/>
++ <socket-binding name="sip-udp" port="5080"/>
++ <socket-binding name="sip-tcp" port="5080"/>
++ <socket-binding name="sip-tls" port="5081"/>
++ <socket-binding name="sip-ws" port="5082"/>
+ <socket-binding name="osgi-http" interface="management"
port="8090"/>
+ <socket-binding name="remoting" port="4447"/>
+ <socket-binding name="txn-recovery-environment" port="4712"/>
+@@ -1305,10 +1323,13 @@
+ </outbound-socket-binding>
+ </socket-binding-group>
+ <socket-binding-group name="ha-sockets"
default-interface="public">
+- <!-- Needed for server groups using the 'ha' profile -->
+ <socket-binding name="ajp" port="8009"/>
+ <socket-binding name="http" port="8080"/>
+ <socket-binding name="https" port="8443"/>
++ <socket-binding name="sip-udp" port="5080"/>
++ <socket-binding name="sip-tcp" port="5080"/>
++ <socket-binding name="sip-tls" port="5081"/>
++ <socket-binding name="sip-ws" port="5082"/>
+ <socket-binding name="jgroups-diagnostics" port="0"
multicast-address="224.0.75.75" multicast-port="7500"/>
+ <socket-binding name="jgroups-mping" port="0"
multicast-address="${jboss.default.multicast.address:230.0.0.4}"
multicast-port="45700"/>
+ <socket-binding name="jgroups-tcp" port="7600"/>
+@@ -1325,10 +1346,13 @@
+ </outbound-socket-binding>
+ </socket-binding-group>
+ <socket-binding-group name="full-sockets"
default-interface="public">
+- <!-- Needed for server groups using the 'full' profile -->
+ <socket-binding name="ajp" port="8009"/>
+ <socket-binding name="http" port="8080"/>
+ <socket-binding name="https" port="8443"/>
++ <socket-binding name="sip-udp" port="5080"/>
++ <socket-binding name="sip-tcp" port="5080"/>
++ <socket-binding name="sip-tls" port="5081"/>
++ <socket-binding name="sip-ws" port="5082"/>
+ <socket-binding name="jacorb" interface="unsecure"
port="3528"/>
+ <socket-binding name="jacorb-ssl" interface="unsecure"
port="3529"/>
+ <socket-binding name="messaging" port="5445"/>
+@@ -1343,10 +1367,13 @@
+ </outbound-socket-binding>
+ </socket-binding-group>
+ <socket-binding-group name="full-ha-sockets"
default-interface="public">
+- <!-- Needed for server groups using the 'full-ha' profile -->
+ <socket-binding name="ajp" port="8009"/>
+ <socket-binding name="http" port="8080"/>
+ <socket-binding name="https" port="8443"/>
++ <socket-binding name="sip-udp" port="5080"/>
++ <socket-binding name="sip-tcp" port="5080"/>
++ <socket-binding name="sip-tls" port="5081"/>
++ <socket-binding name="sip-ws" port="5082"/>
+ <socket-binding name="jacorb" interface="unsecure"
port="3528"/>
+ <socket-binding name="jacorb-ssl" interface="unsecure"
port="3529"/>
+ <socket-binding name="jgroups-diagnostics" port="0"
multicast-address="224.0.75.75" multicast-port="7500"/>
+@@ -1368,18 +1395,22 @@
+ </outbound-socket-binding>
+ </socket-binding-group>
+ </socket-binding-groups>
++
+ <server-groups>
+ <server-group name="main-server-group" profile="full">
+ <jvm name="default">
+ <heap size="64m" max-size="512m"/>
++ <permgen/>
+ </jvm>
+- <socket-binding-group ref="full-sockets"/>
++ <socket-binding-group ref="full-sockets"/>
+ </server-group>
+ <server-group name="other-server-group" profile="full-ha">
+ <jvm name="default">
+ <heap size="64m" max-size="512m"/>
++ <permgen/>
+ </jvm>
+- <socket-binding-group ref="full-ha-sockets"/>
++ <socket-binding-group ref="full-ha-sockets"/>
+ </server-group>
+ </server-groups>
+-</domain>
+\ No newline at end of file
++
++</domain>
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipServerService.java
Sat Dec 8 11:11:30 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipServerService.java
Tue Dec 18 09:29:50 2012
@@ -173,10 +173,10 @@
sipService.setSipApplicationDispatcherClassName(SipApplicationDispatcherImpl.class.getName());
}
//
- final String configDir =
System.getProperty("jboss.server.config.dir");
+ final String baseDir =
System.getProperty("jboss.server.base.dir");
if(sipAppRouterFile != null) {
if(!sipAppRouterFile.startsWith(FILE_PREFIX_PATH)) {
- sipAppRouterFile =
FILE_PREFIX_PATH.concat(configDir).concat("/").concat(sipAppRouterFile);
+ sipAppRouterFile =
FILE_PREFIX_PATH.concat(baseDir).concat("/").concat(sipAppRouterFile);
}
System.setProperty("javax.servlet.sip.dar", sipAppRouterFile);
}
@@ -185,7 +185,7 @@
//
if(sipStackPropertiesFile != null) {
if(!sipStackPropertiesFile.startsWith(FILE_PREFIX_PATH)) {
- sipStackPropertiesFile =
FILE_PREFIX_PATH.concat(configDir).concat("/").concat(sipStackPropertiesFile);
+ sipStackPropertiesFile =
FILE_PREFIX_PATH.concat(baseDir).concat("/").concat(sipStackPropertiesFile);
}
}
sipService.setSipStackPropertiesFile(sipStackPropertiesFile);
=======================================
---
/containers/sip-servlets-as7-drop-in/patches/patch.standalone.sip.dropin.xml
Wed Sep 19 15:14:01 2012
+++
/containers/sip-servlets-as7-drop-in/patches/patch.standalone.sip.dropin.xml
Tue Dec 18 09:29:50 2012
@@ -33,7 +33,7 @@
<alias name="example.com"/>
</virtual-server>
</subsystem>
-+ <subsystem xmlns="urn:org.mobicents:sip-servlets-as7:1.0"
application-router="dars/mobicents-dar.properties"
stack-properties="mss-sip-stack.properties" path-name="gov.nist"
app-dispatcher-class="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
concurrency-control-mode="SipApplicationSession"
congestion-control-interval="-1">
++ <subsystem xmlns="urn:org.mobicents:sip-servlets-as7:1.0"
application-router="configuration/dars/mobicents-dar.properties"
stack-properties="configuration/mss-sip-stack.properties"
path-name="gov.nist"
app-dispatcher-class="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
concurrency-control-mode="SipApplicationSession"
congestion-control-interval="-1">
+ <connector name="sip-udp" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-udp"/>
+ <connector name="sip-tcp" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-tcp"/>
+ <connector name="sip-tls" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-tls"/>
