You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2012/06/07 13:57:45 UTC

svn commit: r1347579 - in /qpid/branches/java-config-and-management/qpid/java/broker/src: main/java/org/apache/qpid/server/management/ main/java/org/apache/qpid/server/protocol/ main/java/org/apache/qpid/server/transport/ test/java/org/apache/qpid/serv...

Author: robbie
Date: Thu Jun  7 11:57:45 2012
New Revision: 1347579

URL: http://svn.apache.org/viewvc?rev=1347579&view=rev
Log:
remove old connection mbeans/tests

Removed:
    qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQProtocolSessionMBean.java
    qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ServerConnectionMBean.java
    qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
    qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerConnectionMBeanTest.java
Modified:
    qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
    qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
    qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java

Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=1347579&r1=1347578&r2=1347579&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java Thu Jun  7 11:57:45 2012
@@ -34,7 +34,6 @@ import java.util.concurrent.ConcurrentHa
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.management.JMException;
 import javax.security.auth.Subject;
 import javax.security.sasl.SaslServer;
 import org.apache.log4j.Logger;
@@ -78,9 +77,6 @@ import org.apache.qpid.server.logging.ac
 import org.apache.qpid.server.logging.actors.ManagementActor;
 import org.apache.qpid.server.logging.messages.ConnectionMessages;
 import org.apache.qpid.server.logging.subjects.ConnectionLogSubject;
-import org.apache.qpid.server.management.AMQProtocolSessionMBean;
-import org.apache.qpid.server.management.Managable;
-import org.apache.qpid.server.management.ManagedObject;
 import org.apache.qpid.server.output.ProtocolOutputConverter;
 import org.apache.qpid.server.output.ProtocolOutputConverterRegistry;
 import org.apache.qpid.server.queue.QueueEntry;
@@ -99,7 +95,7 @@ import org.apache.qpid.transport.Transpo
 import org.apache.qpid.transport.network.NetworkConnection;
 import org.apache.qpid.util.BytesDataOutput;
 
-public class AMQProtocolEngine implements ServerProtocolEngine, Managable, AMQProtocolSession, ConnectionConfig
+public class AMQProtocolEngine implements ServerProtocolEngine, AMQProtocolSession, ConnectionConfig
 {
     private static final Logger _logger = Logger.getLogger(AMQProtocolEngine.class);
 
@@ -124,8 +120,6 @@ public class AMQProtocolEngine implement
 
     private AMQCodecFactory _codecFactory;
 
-    private AMQProtocolSessionMBean _managedObject;
-
     private SaslServer _saslServer;
 
     private Object _lastReceived;
@@ -166,7 +160,6 @@ public class AMQProtocolEngine implement
     private final ConfigStore _configStore;
     private long _createTime = System.currentTimeMillis();
 
-    private ApplicationRegistry _registry;
     private StatisticsCounter _messagesDelivered, _dataDelivered, _messagesReceived, _dataReceived;
 
     private NetworkConnection _network;
@@ -176,11 +169,6 @@ public class AMQProtocolEngine implement
     private long _lastReceivedTime;
     private boolean _blocking;
 
-    public ManagedObject getManagedObject()
-    {
-        return _managedObject;
-    }
-
     public AMQProtocolEngine(VirtualHostRegistry virtualHostRegistry, NetworkConnection network, final long connectionId)
     {
         _stateManager = new AMQStateManager(virtualHostRegistry, this);
@@ -198,7 +186,6 @@ public class AMQProtocolEngine implement
 
         _actor.message(ConnectionMessages.OPEN(null, null, null, false, false, false));
 
-        _registry = virtualHostRegistry.getApplicationRegistry();
         initialiseStatistics();
 
     }
@@ -214,11 +201,6 @@ public class AMQProtocolEngine implement
         _sender = sender;
     }
 
-    private AMQProtocolSessionMBean createMBean() throws JMException
-    {
-        return new AMQProtocolSessionMBean(this);
-    }
-
     public long getSessionID()
     {
         return _connectionID;
@@ -667,17 +649,6 @@ public class AMQProtocolEngine implement
         {
             _cachedChannels[channelId] = channel;
         }
-
-        checkForNotification();
-    }
-
-    private void checkForNotification()
-    {
-        int channelsCount = _channelMap.size();
-        if (_managedObject != null && channelsCount >= _maxNoOfChannels)
-        {
-            _managedObject.notifyClients("Channel count (" + channelsCount + ") has reached the threshold value");
-        }
     }
 
     public Long getMaximumNumberOfChannels()
@@ -829,13 +800,6 @@ public class AMQProtocolEngine implement
 
                 getConfigStore().removeConfiguredObject(this);
 
-                if (_managedObject != null)
-                {
-                    _managedObject.unregister();
-                    // Ensure we only do this once.
-                    _managedObject = null;
-                }
-
                 for (Task task : _taskList)
                 {
                     task.doTask(this);
@@ -1022,16 +986,6 @@ public class AMQProtocolEngine implement
         _virtualHost.getConnectionRegistry().registerConnection(this);
 
         _configStore.addConfiguredObject(this);
-
-        try
-        {
-            _managedObject = createMBean();
-            _managedObject.register();
-        }
-        catch (JMException e)
-        {
-            _logger.error(e);
-        }
     }
 
     public void addSessionCloseTask(Task task)

Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java?rev=1347579&r1=1347578&r2=1347579&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java Thu Jun  7 11:57:45 2012
@@ -28,9 +28,6 @@ import org.apache.qpid.server.logging.Lo
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.actors.GenericActor;
 import org.apache.qpid.server.logging.messages.ConnectionMessages;
-import org.apache.qpid.server.management.Managable;
-import org.apache.qpid.server.management.ManagedObject;
-import org.apache.qpid.server.management.ServerConnectionMBean;
 import org.apache.qpid.server.protocol.AMQConnectionModel;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.security.AuthorizationHolder;
@@ -49,7 +46,6 @@ import static org.apache.qpid.server.log
 import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.SOCKET_FORMAT;
 import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.USER_FORMAT;
 
-import javax.management.JMException;
 import javax.security.auth.Subject;
 import java.security.Principal;
 import java.text.MessageFormat;
@@ -59,7 +55,7 @@ import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-public class ServerConnection extends Connection implements Managable, AMQConnectionModel, LogSubject, AuthorizationHolder
+public class ServerConnection extends Connection implements AMQConnectionModel, LogSubject, AuthorizationHolder
 {
     private ConnectionConfig _config;
     private Runnable _onOpenTask;
@@ -71,7 +67,6 @@ public class ServerConnection extends Co
     private StatisticsCounter _messagesDelivered, _dataDelivered, _messagesReceived, _dataReceived;
     private final long _connectionId;
     private final Object _reference = new Object();
-    private ServerConnectionMBean _mBean;
     private VirtualHost _virtualHost;
     private AtomicLong _lastIoTime = new AtomicLong();
     private boolean _blocking;
@@ -119,7 +114,6 @@ public class ServerConnection extends Co
             {
                 _virtualHost.getConnectionRegistry().deregisterConnection(this);
             }
-            unregisterConnectionMbean();
         }
 
         if (state == State.CLOSED)
@@ -157,8 +151,6 @@ public class ServerConnection extends Co
         _virtualHost = virtualHost;
 
         initialiseStatistics();
-
-        registerConnectionMbean();
     }
 
     public void setConnectionConfig(final ConnectionConfig config)
@@ -274,7 +266,6 @@ public class ServerConnection extends Co
     public void close(AMQConstant cause, String message) throws AMQException
     {
         closeSubscriptions();
-        unregisterConnectionMbean();
         ConnectionCloseCode replyCode = ConnectionCloseCode.NORMAL;
         try
         {
@@ -463,12 +454,6 @@ public class ServerConnection extends Co
         }
     }
 
-
-    public ManagedObject getManagedObject()
-    {
-        return _mBean;
-    }
-
     @Override
     public void send(ProtocolEvent event)
     {
@@ -481,41 +466,6 @@ public class ServerConnection extends Co
         return _lastIoTime.longValue();
     }
 
-    void checkForNotification()
-    {
-        int channelsCount = getSessionModels().size();
-        if (_mBean != null && channelsCount >= getConnectionDelegate().getChannelMax())
-        {
-            _mBean.notifyClients("Channel count (" + channelsCount + ") has reached the threshold value");
-        }
-    }
-
-    private void registerConnectionMbean()
-    {
-        try
-        {
-            _mBean = new ServerConnectionMBean(this);
-            _mBean.register();
-        }
-        catch (JMException jme)
-        {
-            log.error("Unable to register mBean for ServerConnection", jme);
-        }
-    }
-
-    private void unregisterConnectionMbean()
-    {
-        if (_mBean != null)
-        {
-            if (log.isDebugEnabled())
-            {
-                log.debug("Unregistering mBean for ServerConnection" + _mBean);
-            }
-            _mBean.unregister();
-            _mBean = null;
-        }
-    }
-
     public String getClientId()
     {
         return getConnectionDelegate().getClientId();

Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java?rev=1347579&r1=1347578&r2=1347579&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java Thu Jun  7 11:57:45 2012
@@ -269,9 +269,6 @@ public class ServerConnectionDelegate ex
         if(isSessionNameUnique(atc.getName(), conn))
         {
             super.sessionAttach(conn, atc);
-            final ServerConnection serverConnection = (ServerConnection) conn;
-
-            serverConnection.checkForNotification();
         }
         else
         {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org