Skip to content

Commit c21a8bc

Browse files
author
Jean Deruelle
committed
Updating latest version of JAIN SIP, JAIN SIP Ext, Restcomm Commons and improving stats in JBoss version as property was not picked up
1 parent 27fcd54 commit c21a8bc

File tree

41 files changed

+525
-268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+525
-268
lines changed

‎containers/sip-servlets-as10-drop-in/build-restcomm-modules/build.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,11 @@
6363
<maven-resource group="org.mobicents.tools" artifact="sip-balancer-jar"/>
6464
<maven-resource group="dnsjava" artifact="dnsjava"/>
6565
<maven-resource group="net.java.stun4j" artifact="stun4j"/>
66-
<maven-resource group="org.mobicents.commons" artifact="commons-congestion"/>
66+
<maven-resource group="org.restcomm.commons" artifact="commons-congestion"/>
67+
<maven-resource group="org.restcomm.commons" artifact="restcomm-statistics"/>
6768
<maven-resource group="javolution" artifact="javolution"/>
6869
<maven-resource group="io.netty" artifact="netty-all"/>
70+
<maven-resource group="io.dropwizard.metrics" artifact="metrics-core"/>
6971
</module-def>
7072
</target>
7173

‎containers/sip-servlets-as10-drop-in/build-restcomm-modules/pom.xml

+13-1
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,22 @@
205205
</dependency>
206206

207207
<dependency>
208-
<groupId>org.mobicents.commons</groupId>
208+
<groupId>org.restcomm.commons</groupId>
209209
<artifactId>commons-congestion</artifactId>
210210
<version>${restcomm.commons.version}</version>
211211
</dependency>
212+
213+
<dependency>
214+
<groupId>org.restcomm.commons</groupId>
215+
<artifactId>restcomm-statistics</artifactId>
216+
<version>${restcomm.commons.version}</version>
217+
</dependency>
218+
219+
<dependency>
220+
<groupId>io.dropwizard.metrics</groupId>
221+
<artifactId>metrics-core</artifactId>
222+
<version>${metrics.version}</version>
223+
</dependency>
212224

213225
<dependency>
214226
<groupId>javolution</groupId>

‎containers/sip-servlets-as10-drop-in/jboss-as-restcomm/src/main/java/org/mobicents/as10/SipServerService.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ class SipServerService implements SipServer, Service<SipServer> {
5858
final String sipAppDispatcherClass;
5959
final String additionalParameterableHeaders;
6060
final String proxyTimerServiceImplementationType;
61+
final boolean gatherStatistics;
6162
final String sasTimerServiceImplementationType;
6263
final int sipCongestionControlInterval;
6364
final String congestionControlPolicy;
@@ -100,6 +101,7 @@ public SipServerService(
100101
String additionalParameterableHeaders,
101102
String proxyTimerServiceImplementationType,
102103
String sasTimerServiceImplementationType,
104+
boolean gatherStatistics,
103105
int sipCongestionControlInterval,
104106
String congestionControlPolicy,
105107
String sipConcurrencyControlMode,
@@ -130,6 +132,7 @@ public SipServerService(
130132
this.additionalParameterableHeaders = additionalParameterableHeaders;
131133
this.proxyTimerServiceImplementationType = proxyTimerServiceImplementationType;
132134
this.sasTimerServiceImplementationType = sasTimerServiceImplementationType;
135+
this.gatherStatistics = gatherStatistics;
133136
this.sipCongestionControlInterval = sipCongestionControlInterval;
134137
this.congestionControlPolicy = congestionControlPolicy;
135138
this.sipConcurrencyControlMode = sipConcurrencyControlMode;
@@ -225,7 +228,7 @@ public synchronized void start(StartContext context) throws StartException {
225228

226229
sipService.setProxyTimerServiceImplementationType(proxyTimerServiceImplementationType);
227230
sipService.setSasTimerServiceImplementationType(sasTimerServiceImplementationType);
228-
231+
sipService.setGatherStatistics(gatherStatistics);
229232
sipService.setCongestionControlCheckingInterval(sipCongestionControlInterval);
230233

231234
sipService.setUsePrettyEncoding(usePrettyEncoding);

‎containers/sip-servlets-as10-drop-in/jboss-as-restcomm/src/main/java/org/mobicents/as10/SipSubsystemAdd.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ protected void performBoottime(OperationContext context, ModelNode operation, Mo
194194
final int timerDInterval = timerDIntervalModel.isDefined() ? timerDIntervalModel.asInt() : 32000;
195195

196196
final ModelNode gatherStatisticsModel = SipDefinition.GATHER_STATISTICS.resolveModelAttribute(context, fullModel);
197-
final boolean gatherStatistics = gatherStatisticsModel.isDefined() ? gatherStatisticsModel.asBoolean() : false;
197+
final boolean gatherStatistics = gatherStatisticsModel.isDefined() ? gatherStatisticsModel.asBoolean() : true;
198198

199199
final ModelNode dialogPendingRequestCheckingModel = SipDefinition.DIALOG_PENDING_REQUEST_CHECKING
200200
.resolveModelAttribute(context, fullModel);
@@ -261,7 +261,7 @@ protected void performBoottime(OperationContext context, ModelNode operation, Mo
261261
}
262262

263263
final SipServerService service = new SipServerService(sipAppRouterFile, sipStackPropertiesFile, sipPathName,
264-
sipAppDispatcherClass, additionalParameterableHeaders, proxyTimerServiceImplementationType, sasTimerServiceImplementationType, sipCongestionControlInterval, congestionControlPolicy,
264+
sipAppDispatcherClass, additionalParameterableHeaders, proxyTimerServiceImplementationType, sasTimerServiceImplementationType, gatherStatistics, sipCongestionControlInterval, congestionControlPolicy,
265265
sipConcurrencyControlMode, usePrettyEncoding, baseTimerInterval, t2Interval, t4Interval, timerDInterval,
266266
dialogPendingRequestChecking, dnsServerLocatorClass, dnsTimeout, dnsResolverClass, callIdMaxLength,
267267
tagHashMaxLength, canceledTimerTasksPurgePeriod, memoryThreshold, backToNormalMemoryThreshold, outboundProxy,

‎containers/sip-servlets-as7-drop-in/build-restcomm-modules/build.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,11 @@
6363
<maven-resource group="org.mobicents.tools" artifact="sip-balancer-jar"/>
6464
<maven-resource group="dnsjava" artifact="dnsjava"/>
6565
<maven-resource group="net.java.stun4j" artifact="stun4j"/>
66-
<maven-resource group="org.mobicents.commons" artifact="commons-congestion"/>
66+
<maven-resource group="org.restcomm.commons" artifact="commons-congestion"/>
67+
<maven-resource group="org.restcomm.commons" artifact="restcomm-statistics"/>
6768
<maven-resource group="javolution" artifact="javolution"/>
6869
<maven-resource group="io.netty" artifact="netty-all"/>
70+
<maven-resource group="io.dropwizard.metrics" artifact="metrics-core"/>
6971
</module-def>
7072

7173
</target>

‎containers/sip-servlets-as7-drop-in/build-restcomm-modules/pom.xml

+13-1
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,23 @@
206206
</dependency>
207207

208208
<dependency>
209-
<groupId>org.mobicents.commons</groupId>
209+
<groupId>org.restcomm.commons</groupId>
210210
<artifactId>commons-congestion</artifactId>
211211
<version>${restcomm.commons.version}</version>
212+
</dependency>
213+
214+
<dependency>
215+
<groupId>org.restcomm.commons</groupId>
216+
<artifactId>restcomm-statistics</artifactId>
217+
<version>${restcomm.commons.version}</version>
212218
</dependency>
213219

220+
<dependency>
221+
<groupId>io.dropwizard.metrics</groupId>
222+
<artifactId>metrics-core</artifactId>
223+
<version>${metrics.version}</version>
224+
</dependency>
225+
214226
<dependency>
215227
<groupId>javolution</groupId>
216228
<artifactId>javolution</artifactId>

‎containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipServerService.java

+4
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ class SipServerService implements SipServer, Service<SipServer> {
6464
final String additionalParameterableHeaders;
6565
final String proxyTimerServiceImplementationType;
6666
final String sasTimerServiceImplementationType;
67+
final boolean gatherStatistics;
6768
final int sipCongestionControlInterval;
6869
final String congestionControlPolicy;
6970
final String sipConcurrencyControlMode;
@@ -104,6 +105,7 @@ public SipServerService(
104105
String additionalParameterableHeaders,
105106
String proxyTimerServiceImplementationType,
106107
String sasTimerServiceImplementationType,
108+
boolean gatherStatistics,
107109
int sipCongestionControlInterval,
108110
String congestionControlPolicy,
109111
String sipConcurrencyControlMode,
@@ -132,6 +134,7 @@ public SipServerService(
132134
this.additionalParameterableHeaders = additionalParameterableHeaders;
133135
this.proxyTimerServiceImplementationType = proxyTimerServiceImplementationType;
134136
this.sasTimerServiceImplementationType = sasTimerServiceImplementationType;
137+
this.gatherStatistics = gatherStatistics;
135138
this.sipCongestionControlInterval = sipCongestionControlInterval;
136139
this.congestionControlPolicy = congestionControlPolicy;
137140
this.sipConcurrencyControlMode = sipConcurrencyControlMode;
@@ -227,6 +230,7 @@ public synchronized void start(StartContext context) throws StartException {
227230

228231
sipService.setProxyTimerServiceImplementationType(proxyTimerServiceImplementationType);
229232
sipService.setSasTimerServiceImplementationType(sasTimerServiceImplementationType);
233+
sipService.setGatherStatistics(gatherStatistics);
230234
//
231235
sipService.setCongestionControlCheckingInterval(sipCongestionControlInterval);
232236
//

‎containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/SipSubsystemAdd.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ protected void performBoottime(OperationContext context, ModelNode operation, Mo
168168
final int timerDInterval = timerDIntervalModel.isDefined() ? timerDIntervalModel.asInt() : 32000;
169169

170170
final ModelNode gatherStatisticsModel = SipDefinition.GATHER_STATISTICS.resolveModelAttribute(context, fullModel);
171-
final boolean gatherStatistics = gatherStatisticsModel.isDefined() ? gatherStatisticsModel.asBoolean() : false;
171+
final boolean gatherStatistics = gatherStatisticsModel.isDefined() ? gatherStatisticsModel.asBoolean() : true;
172172

173173
final ModelNode dialogPendingRequestCheckingModel = SipDefinition.DIALOG_PENDING_REQUEST_CHECKING.resolveModelAttribute(context, fullModel);
174174
final boolean dialogPendingRequestChecking = dialogPendingRequestCheckingModel.isDefined() ? dialogPendingRequestCheckingModel.asBoolean() : false;
@@ -225,7 +225,8 @@ protected void performBoottime(OperationContext context, ModelNode operation, Mo
225225
sipAppDispatcherClass,
226226
additionalParameterableHeaders,
227227
proxyTimerServiceImplementationType,
228-
sasTimerServiceImplementationType,
228+
sasTimerServiceImplementationType,
229+
gatherStatistics,
229230
sipCongestionControlInterval,
230231
congestionControlPolicy,
231232
sipConcurrencyControlMode,

0 commit comments

Comments
 (0)