Revision: d1b13c118fc4
Author:   Jean Deruelle <[email protected]>
Date:     Tue Jul 17 09:32:13 2012
Log:      Update Issue 133

Moving CongestionControlPolicy class to client modules to avoid having to export the libs modules for management console

http://code.google.com/p/sipservlets/source/detail?r=d1b13c118fc4

Added:
/sip-servlets-client/src/main/java/org/mobicents/javax/servlet/CongestionControlPolicy.java
Deleted:
/sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/CongestionControlPolicy.java
Modified:
 /containers/sip-servlets-as7-drop-in/build-mobicents-modules/build.xml
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/SipStandardService.java /containers/sip-servlets-catalina-7/src/main/java/org/mobicents/servlet/sip/catalina/SipStandardService.java /containers/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/SipStandardService.java /management/sip-servlets-management/src/main/java/org/mobicents/servlet/management/server/configuration/ConfigurationServiceImpl.java /sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcher.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java /sip-servlets-impl/src/main/resources/org/mobicents/servlet/sip/core/mbeans-descriptors.xml /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/concurrency/CongestionControlTest.java

=======================================
--- /dev/null
+++ /sip-servlets-client/src/main/java/org/mobicents/javax/servlet/CongestionControlPolicy.java Tue Jul 17 09:32:13 2012
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2011, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.mobicents.javax.servlet;
+
+/**
+ * Congestion Control Policy for the Mobicents Sip Servlets Server. <br/>
+ *
+ * The congestion control policy defines how an incoming message is handled when the server is overloaded. The following parameters are configurable :
+ *
+ * <ul>
+ * <li>DropMessage - drop any incoming message</li>
+ * <li>ErrorResponse - send a 503 - Service Unavailable response to any incoming request (Default).</li>
+ * </ul>
+ * @author [email protected]
+ *
+ */
+public enum CongestionControlPolicy {
+       ErrorResponse,
+       DropMessage
+}
=======================================
--- /sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/CongestionControlPolicy.java Thu Sep 8 06:23:02 2011
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.mobicents.servlet.sip.core;
-
-/**
- * Congestion Control Policy for the Mobicents Sip Servlets Server. <br/>
- *
- * The congestion control policy defines how an incoming message is handled when the server is overloaded. The following parameters are configurable :
- *
- * <ul>
- * <li>DropMessage - drop any incoming message</li>
- * <li>ErrorResponse - send a 503 - Service Unavailable response to any incoming request (Default).</li>
- * </ul>
- * @author [email protected]
- *
- */
-public enum CongestionControlPolicy {
-       ErrorResponse,
-       DropMessage
-}
=======================================
--- /containers/sip-servlets-as7-drop-in/build-mobicents-modules/build.xml Sun Jul 15 06:24:42 2012 +++ /containers/sip-servlets-as7-drop-in/build-mobicents-modules/build.xml Tue Jul 17 09:32:13 2012
@@ -54,7 +54,7 @@

         <module-def name="org.mobicents.libs">
<maven-resource group="org.mobicents.servlet.sip.containers" artifact="sip-servlets-as7"/> - <maven-resource group="org.mobicents.servlet.sip" artifact="sip-servlets-core-api"/> + <maven-resource group="org.mobicents.servlet.sip" artifact="sip-servlets-core-api"/> <maven-resource group="org.mobicents.servlet.sip" artifact="sip-servlets-impl"/>
             <maven-resource group="javax.sip" artifact="jain-sip-api"/>
<maven-resource group="org.mobicents.javax.sip" artifact="mobicents-jain-sip-ext"/>
=======================================
--- /containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/SipStandardService.java Sun Jul 8 12:14:07 2012 +++ /containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/SipStandardService.java Tue Jul 17 09:32:13 2012
@@ -64,10 +64,10 @@
 import org.mobicents.ha.javax.sip.LoadBalancerHeartBeatingService;
 import org.mobicents.ha.javax.sip.LoadBalancerHeartBeatingServiceImpl;
 import org.mobicents.ha.javax.sip.ReplicationStrategy;
+import org.mobicents.javax.servlet.CongestionControlPolicy;
 import org.mobicents.servlet.sip.JainSipUtils;
 import org.mobicents.servlet.sip.SipConnector;
 import org.mobicents.servlet.sip.annotation.ConcurrencyControlMode;
-import org.mobicents.servlet.sip.core.CongestionControlPolicy;
 import org.mobicents.servlet.sip.core.ExtendedListeningPoint;
 import org.mobicents.servlet.sip.core.MobicentsExtendedListeningPoint;
 import org.mobicents.servlet.sip.core.SipApplicationDispatcher;
=======================================
--- /containers/sip-servlets-catalina-7/src/main/java/org/mobicents/servlet/sip/catalina/SipStandardService.java Fri May 25 05:43:04 2012 +++ /containers/sip-servlets-catalina-7/src/main/java/org/mobicents/servlet/sip/catalina/SipStandardService.java Tue Jul 17 09:32:13 2012
@@ -64,10 +64,10 @@
 import org.mobicents.ha.javax.sip.LoadBalancerHeartBeatingService;
 import org.mobicents.ha.javax.sip.LoadBalancerHeartBeatingServiceImpl;
 import org.mobicents.ha.javax.sip.ReplicationStrategy;
+import org.mobicents.javax.servlet.CongestionControlPolicy;
 import org.mobicents.servlet.sip.JainSipUtils;
 import org.mobicents.servlet.sip.SipConnector;
 import org.mobicents.servlet.sip.annotation.ConcurrencyControlMode;
-import org.mobicents.servlet.sip.core.CongestionControlPolicy;
 import org.mobicents.servlet.sip.core.ExtendedListeningPoint;
 import org.mobicents.servlet.sip.core.MobicentsExtendedListeningPoint;
 import org.mobicents.servlet.sip.core.SipApplicationDispatcher;
=======================================
--- /containers/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/SipStandardService.java Fri May 25 05:43:04 2012 +++ /containers/sip-servlets-catalina/src/main/java/org/mobicents/servlet/sip/catalina/SipStandardService.java Tue Jul 17 09:32:13 2012
@@ -64,10 +64,10 @@
 import org.mobicents.ha.javax.sip.LoadBalancerHeartBeatingService;
 import org.mobicents.ha.javax.sip.LoadBalancerHeartBeatingServiceImpl;
 import org.mobicents.ha.javax.sip.ReplicationStrategy;
+import org.mobicents.javax.servlet.CongestionControlPolicy;
 import org.mobicents.servlet.sip.JainSipUtils;
 import org.mobicents.servlet.sip.SipConnector;
 import org.mobicents.servlet.sip.annotation.ConcurrencyControlMode;
-import org.mobicents.servlet.sip.core.CongestionControlPolicy;
 import org.mobicents.servlet.sip.core.ExtendedListeningPoint;
 import org.mobicents.servlet.sip.core.MobicentsExtendedListeningPoint;
 import org.mobicents.servlet.sip.core.SipApplicationDispatcher;
=======================================
--- /management/sip-servlets-management/src/main/java/org/mobicents/servlet/management/server/configuration/ConfigurationServiceImpl.java Mon Jul 9 14:42:23 2012 +++ /management/sip-servlets-management/src/main/java/org/mobicents/servlet/management/server/configuration/ConfigurationServiceImpl.java Tue Jul 17 09:32:13 2012
@@ -32,9 +32,9 @@
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;

+import org.mobicents.javax.servlet.CongestionControlPolicy;
import org.mobicents.servlet.management.client.configuration.ConfigurationService;
 import org.mobicents.servlet.sip.annotation.ConcurrencyControlMode;
-import org.mobicents.servlet.sip.core.CongestionControlPolicy;

 import com.google.gwt.user.server.rpc.RemoteServiceServlet;

=======================================
--- /sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcher.java Thu Oct 6 12:04:00 2011 +++ /sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcher.java Tue Jul 17 09:32:13 2012
@@ -38,6 +38,7 @@
 import javax.sip.header.ViaHeader;

 import org.mobicents.ext.javax.sip.dns.DNSServerLocator;
+import org.mobicents.javax.servlet.CongestionControlPolicy;
 import org.mobicents.servlet.sip.annotation.ConcurrencyControlMode;
 import org.mobicents.servlet.sip.core.message.MobicentsSipServletRequest;

=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Thu Feb 16 10:31:48 2012 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Tue Jul 17 09:32:13 2012
@@ -100,6 +100,7 @@
 import org.mobicents.ha.javax.sip.LoadBalancerHeartBeatingListener;
 import org.mobicents.ha.javax.sip.SipLoadBalancer;
 import org.mobicents.javax.servlet.CongestionControlEvent;
+import org.mobicents.javax.servlet.CongestionControlPolicy;
 import org.mobicents.javax.servlet.ContainerListener;
 import org.mobicents.servlet.sip.GenericUtils;
 import org.mobicents.servlet.sip.JainSipUtils;
=======================================
--- /sip-servlets-impl/src/main/resources/org/mobicents/servlet/sip/core/mbeans-descriptors.xml Sat Sep 17 13:15:48 2011 +++ /sip-servlets-impl/src/main/resources/org/mobicents/servlet/sip/core/mbeans-descriptors.xml Tue Jul 17 09:32:13 2012
@@ -18,7 +18,7 @@

                <attribute name="congestionControlPolicy"
description="Congestion control policy specifies if what should be done on server congestion"
-                       
type="org.mobicents.servlet.sip.core.CongestionControlPolicy"
+                       
type="org.mobicents.javax.servlet.CongestionControlPolicy"
                        writeable="false"/>

                <attribute name="congestionControlCheckingInterval"
=======================================
--- /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/concurrency/CongestionControlTest.java Tue Oct 25 16:19:29 2011 +++ /sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/concurrency/CongestionControlTest.java Tue Jul 17 09:32:13 2012
@@ -48,9 +48,9 @@

 import org.apache.catalina.LifecycleException;
 import org.apache.log4j.Logger;
+import org.mobicents.javax.servlet.CongestionControlPolicy;
 import org.mobicents.servlet.sip.SipServletTestCase;
 import org.mobicents.servlet.sip.annotation.ConcurrencyControlMode;
-import org.mobicents.servlet.sip.core.CongestionControlPolicy;
 import org.mobicents.servlet.sip.core.session.SipStandardManager;
 import org.mobicents.servlet.sip.startup.SipContextConfig;
 import org.mobicents.servlet.sip.startup.SipStandardContext;

Reply via email to