# HG changeset patch # User Omair Majid # Date 1385424209 18000 # Node ID b1f82879e6a9322c491faaca7c0c0ab52868e877 # Parent 07becc24f34d03f6e99e021ba73e717159d7b35b Rename c.r.t.utils.management to c.r.t.agent.utils.management Reviewed-by: vanaltj Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-November/008945.html diff -r 07becc24f34d -r b1f82879e6a9 README.api --- a/README.api Mon Nov 25 19:02:01 2013 -0500 +++ b/README.api Mon Nov 25 19:03:29 2013 -0500 @@ -8,6 +8,7 @@ - com.redhat.thermostat.agent.config - com.redhat.thermostat.agent.utils - com.redhat.thermostat.agent.utils.hostname + - com.redhat.thermostat.agent.utils.management - com.redhat.thermostat.annotations - com.redhat.thermostat.backend - com.redhat.thermostat.client.cli @@ -41,7 +42,6 @@ - com.redhat.thermostat.storage.monitor - com.redhat.thermostat.storage.query - com.redhat.thermostat.utils.keyring - - com.redhat.thermostat.utils.management - com.redhat.thermostat.utils.username diff -r 07becc24f34d -r b1f82879e6a9 agent/core/pom.xml --- a/agent/core/pom.xml Mon Nov 25 19:02:01 2013 -0500 +++ b/agent/core/pom.xml Mon Nov 25 19:03:29 2013 -0500 @@ -127,8 +127,8 @@ com.redhat.thermostat.agent.config, com.redhat.thermostat.agent.utils, com.redhat.thermostat.agent.utils.hostname, + com.redhat.thermostat.agent.utils.management, com.redhat.thermostat.backend, - com.redhat.thermostat.utils.management, com.redhat.thermostat.utils.username, diff -r 07becc24f34d -r b1f82879e6a9 agent/core/src/main/java/com/redhat/thermostat/agent/internal/Activator.java --- a/agent/core/src/main/java/com/redhat/thermostat/agent/internal/Activator.java Mon Nov 25 19:02:01 2013 -0500 +++ b/agent/core/src/main/java/com/redhat/thermostat/agent/internal/Activator.java Mon Nov 25 19:03:29 2013 -0500 @@ -43,8 +43,8 @@ import com.redhat.thermostat.agent.RMIRegistry; import com.redhat.thermostat.agent.VmBlacklist; import com.redhat.thermostat.agent.config.AgentConfigsUtils; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.shared.config.CommonPaths; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.utils.management.internal.AgentProxyFilter; import com.redhat.thermostat.utils.management.internal.MXBeanConnectionPoolImpl; import com.redhat.thermostat.utils.username.UserNameUtil; diff -r 07becc24f34d -r b1f82879e6a9 agent/core/src/main/java/com/redhat/thermostat/agent/utils/management/MXBeanConnection.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/agent/core/src/main/java/com/redhat/thermostat/agent/utils/management/MXBeanConnection.java Mon Nov 25 19:03:29 2013 -0500 @@ -0,0 +1,48 @@ +/* + * Copyright 2012, 2013 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * . + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.agent.utils.management; + +import javax.management.MBeanServerConnection; +import javax.management.MalformedObjectNameException; + +public interface MXBeanConnection { + + E createProxy(String name, Class proxyClass) throws MalformedObjectNameException; + + MBeanServerConnection get(); + +} diff -r 07becc24f34d -r b1f82879e6a9 agent/core/src/main/java/com/redhat/thermostat/agent/utils/management/MXBeanConnectionPool.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/agent/core/src/main/java/com/redhat/thermostat/agent/utils/management/MXBeanConnectionPool.java Mon Nov 25 19:03:29 2013 -0500 @@ -0,0 +1,50 @@ +/* + * Copyright 2012, 2013 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * . + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.agent.utils.management; + +import com.redhat.thermostat.annotations.Service; + +/** + * A pool for caching and reusing MXBeanConnections. + */ +@Service +public interface MXBeanConnectionPool { + + MXBeanConnection acquire(int pid) throws Exception; + + void release(int pid, MXBeanConnection connection) throws Exception; +} diff -r 07becc24f34d -r b1f82879e6a9 agent/core/src/main/java/com/redhat/thermostat/utils/management/MXBeanConnection.java --- a/agent/core/src/main/java/com/redhat/thermostat/utils/management/MXBeanConnection.java Mon Nov 25 19:02:01 2013 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* - * Copyright 2012, 2013 Red Hat, Inc. - * - * This file is part of Thermostat. - * - * Thermostat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2, or (at your - * option) any later version. - * - * Thermostat 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Thermostat; see the file COPYING. If not see - * . - * - * Linking this code with other modules is making a combined work - * based on this code. Thus, the terms and conditions of the GNU - * General Public License cover the whole combination. - * - * As a special exception, the copyright holders of this code give - * you permission to link this code with independent modules to - * produce an executable, regardless of the license terms of these - * independent modules, and to copy and distribute the resulting - * executable under terms of your choice, provided that you also - * meet, for each linked independent module, the terms and conditions - * of the license of that module. An independent module is a module - * which is not derived from or based on this code. If you modify - * this code, you may extend this exception to your version of the - * library, but you are not obligated to do so. If you do not wish - * to do so, delete this exception statement from your version. - */ - -package com.redhat.thermostat.utils.management; - -import javax.management.MBeanServerConnection; -import javax.management.MalformedObjectNameException; - -public interface MXBeanConnection { - - E createProxy(String name, Class proxyClass) throws MalformedObjectNameException; - - MBeanServerConnection get(); - -} diff -r 07becc24f34d -r b1f82879e6a9 agent/core/src/main/java/com/redhat/thermostat/utils/management/MXBeanConnectionPool.java --- a/agent/core/src/main/java/com/redhat/thermostat/utils/management/MXBeanConnectionPool.java Mon Nov 25 19:02:01 2013 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -/* - * Copyright 2012, 2013 Red Hat, Inc. - * - * This file is part of Thermostat. - * - * Thermostat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2, or (at your - * option) any later version. - * - * Thermostat 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Thermostat; see the file COPYING. If not see - * . - * - * Linking this code with other modules is making a combined work - * based on this code. Thus, the terms and conditions of the GNU - * General Public License cover the whole combination. - * - * As a special exception, the copyright holders of this code give - * you permission to link this code with independent modules to - * produce an executable, regardless of the license terms of these - * independent modules, and to copy and distribute the resulting - * executable under terms of your choice, provided that you also - * meet, for each linked independent module, the terms and conditions - * of the license of that module. An independent module is a module - * which is not derived from or based on this code. If you modify - * this code, you may extend this exception to your version of the - * library, but you are not obligated to do so. If you do not wish - * to do so, delete this exception statement from your version. - */ - -package com.redhat.thermostat.utils.management; - -import com.redhat.thermostat.annotations.Service; - -/** - * A pool for caching and reusing MXBeanConnections. - */ -@Service -public interface MXBeanConnectionPool { - - MXBeanConnection acquire(int pid) throws Exception; - - void release(int pid, MXBeanConnection connection) throws Exception; -} diff -r 07becc24f34d -r b1f82879e6a9 agent/core/src/main/java/com/redhat/thermostat/utils/management/internal/MXBeanConnectionImpl.java --- a/agent/core/src/main/java/com/redhat/thermostat/utils/management/internal/MXBeanConnectionImpl.java Mon Nov 25 19:02:01 2013 -0500 +++ b/agent/core/src/main/java/com/redhat/thermostat/utils/management/internal/MXBeanConnectionImpl.java Mon Nov 25 19:03:29 2013 -0500 @@ -44,7 +44,7 @@ import javax.management.ObjectName; import javax.management.remote.JMXConnector; -import com.redhat.thermostat.utils.management.MXBeanConnection; +import com.redhat.thermostat.agent.utils.management.MXBeanConnection; class MXBeanConnectionImpl implements MXBeanConnection { diff -r 07becc24f34d -r b1f82879e6a9 agent/core/src/main/java/com/redhat/thermostat/utils/management/internal/MXBeanConnectionPoolImpl.java --- a/agent/core/src/main/java/com/redhat/thermostat/utils/management/internal/MXBeanConnectionPoolImpl.java Mon Nov 25 19:02:01 2013 -0500 +++ b/agent/core/src/main/java/com/redhat/thermostat/utils/management/internal/MXBeanConnectionPoolImpl.java Mon Nov 25 19:03:29 2013 -0500 @@ -46,11 +46,11 @@ import com.redhat.thermostat.agent.RMIRegistry; import com.redhat.thermostat.agent.internal.RMIRegistryImpl; +import com.redhat.thermostat.agent.utils.management.MXBeanConnection; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.common.Pair; import com.redhat.thermostat.common.tools.ApplicationException; import com.redhat.thermostat.common.utils.LoggingUtils; -import com.redhat.thermostat.utils.management.MXBeanConnection; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; public class MXBeanConnectionPoolImpl implements MXBeanConnectionPool { diff -r 07becc24f34d -r b1f82879e6a9 agent/core/src/test/java/com/redhat/thermostat/agent/internal/ActivatorTest.java --- a/agent/core/src/test/java/com/redhat/thermostat/agent/internal/ActivatorTest.java Mon Nov 25 19:02:01 2013 -0500 +++ b/agent/core/src/test/java/com/redhat/thermostat/agent/internal/ActivatorTest.java Mon Nov 25 19:03:29 2013 -0500 @@ -47,10 +47,10 @@ import com.redhat.thermostat.agent.RMIRegistry; import com.redhat.thermostat.agent.VmBlacklist; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.shared.config.CommonPaths; import com.redhat.thermostat.shared.config.NativeLibraryResolver; import com.redhat.thermostat.testutils.StubBundleContext; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.utils.management.internal.MXBeanConnectionPoolImpl; import com.redhat.thermostat.utils.username.UserNameUtil; import com.redhat.thermostat.utils.username.internal.UserNameUtilImpl; diff -r 07becc24f34d -r b1f82879e6a9 agent/core/src/test/java/com/redhat/thermostat/utils/management/internal/MXBeanConnectionPoolImplTest.java --- a/agent/core/src/test/java/com/redhat/thermostat/utils/management/internal/MXBeanConnectionPoolImplTest.java Mon Nov 25 19:02:01 2013 -0500 +++ b/agent/core/src/test/java/com/redhat/thermostat/utils/management/internal/MXBeanConnectionPoolImplTest.java Mon Nov 25 19:03:29 2013 -0500 @@ -51,7 +51,7 @@ import org.junit.Test; import com.redhat.thermostat.agent.internal.RMIRegistryImpl; -import com.redhat.thermostat.utils.management.MXBeanConnection; +import com.redhat.thermostat.agent.utils.management.MXBeanConnection; import com.redhat.thermostat.utils.management.internal.MXBeanConnectionPoolImpl.ConnectorCreator; public class MXBeanConnectionPoolImplTest { diff -r 07becc24f34d -r b1f82879e6a9 thread/harvester/src/main/java/com/redhat/thermostat/thread/harvester/Harvester.java --- a/thread/harvester/src/main/java/com/redhat/thermostat/thread/harvester/Harvester.java Mon Nov 25 19:02:01 2013 -0500 +++ b/thread/harvester/src/main/java/com/redhat/thermostat/thread/harvester/Harvester.java Mon Nov 25 19:03:29 2013 -0500 @@ -49,6 +49,8 @@ import javax.management.MalformedObjectNameException; +import com.redhat.thermostat.agent.utils.management.MXBeanConnection; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.common.Clock; import com.redhat.thermostat.common.SystemClock; import com.redhat.thermostat.common.utils.LoggingUtils; @@ -58,8 +60,6 @@ import com.redhat.thermostat.thread.model.ThreadSummary; import com.redhat.thermostat.thread.model.VMThreadCapabilities; import com.redhat.thermostat.thread.model.VmDeadLockData; -import com.redhat.thermostat.utils.management.MXBeanConnection; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; @SuppressWarnings("restriction") class Harvester { diff -r 07becc24f34d -r b1f82879e6a9 thread/harvester/src/main/java/com/redhat/thermostat/thread/harvester/ThreadHarvester.java --- a/thread/harvester/src/main/java/com/redhat/thermostat/thread/harvester/ThreadHarvester.java Mon Nov 25 19:02:01 2013 -0500 +++ b/thread/harvester/src/main/java/com/redhat/thermostat/thread/harvester/ThreadHarvester.java Mon Nov 25 19:03:29 2013 -0500 @@ -47,6 +47,7 @@ import java.util.logging.Logger; import com.redhat.thermostat.agent.command.RequestReceiver; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.common.Clock; import com.redhat.thermostat.common.Pair; import com.redhat.thermostat.common.SystemClock; @@ -58,7 +59,6 @@ import com.redhat.thermostat.thread.collector.HarvesterCommand; import com.redhat.thermostat.thread.dao.ThreadDao; import com.redhat.thermostat.thread.model.ThreadHarvestingStatus; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; public class ThreadHarvester implements RequestReceiver { diff -r 07becc24f34d -r b1f82879e6a9 thread/harvester/src/main/java/com/redhat/thermostat/thread/harvester/osgi/Activator.java --- a/thread/harvester/src/main/java/com/redhat/thermostat/thread/harvester/osgi/Activator.java Mon Nov 25 19:02:01 2013 -0500 +++ b/thread/harvester/src/main/java/com/redhat/thermostat/thread/harvester/osgi/Activator.java Mon Nov 25 19:03:29 2013 -0500 @@ -48,6 +48,7 @@ import com.redhat.thermostat.agent.VmStatusListenerRegistrar; import com.redhat.thermostat.agent.command.ReceiverRegistry; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.backend.Backend; import com.redhat.thermostat.common.MultipleServiceTracker; import com.redhat.thermostat.common.MultipleServiceTracker.Action; @@ -56,7 +57,6 @@ import com.redhat.thermostat.thread.dao.ThreadDao; import com.redhat.thermostat.thread.harvester.ThreadBackend; import com.redhat.thermostat.thread.harvester.ThreadHarvester; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; public class Activator implements BundleActivator { diff -r 07becc24f34d -r b1f82879e6a9 thread/harvester/src/test/java/com/redhat/thermostat/thread/harvester/HarvesterTest.java --- a/thread/harvester/src/test/java/com/redhat/thermostat/thread/harvester/HarvesterTest.java Mon Nov 25 19:02:01 2013 -0500 +++ b/thread/harvester/src/test/java/com/redhat/thermostat/thread/harvester/HarvesterTest.java Mon Nov 25 19:03:29 2013 -0500 @@ -61,6 +61,8 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; +import com.redhat.thermostat.agent.utils.management.MXBeanConnection; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.common.Clock; import com.redhat.thermostat.storage.core.WriterID; import com.redhat.thermostat.thread.dao.ThreadDao; @@ -68,8 +70,6 @@ import com.redhat.thermostat.thread.model.ThreadSummary; import com.redhat.thermostat.thread.model.VMThreadCapabilities; import com.redhat.thermostat.thread.model.VmDeadLockData; -import com.redhat.thermostat.utils.management.MXBeanConnection; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; public class HarvesterTest { diff -r 07becc24f34d -r b1f82879e6a9 thread/harvester/src/test/java/com/redhat/thermostat/thread/harvester/ThreadHarvesterTest.java --- a/thread/harvester/src/test/java/com/redhat/thermostat/thread/harvester/ThreadHarvesterTest.java Mon Nov 25 19:02:01 2013 -0500 +++ b/thread/harvester/src/test/java/com/redhat/thermostat/thread/harvester/ThreadHarvesterTest.java Mon Nov 25 19:03:29 2013 -0500 @@ -49,6 +49,7 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.common.Clock; import com.redhat.thermostat.common.Pair; import com.redhat.thermostat.common.command.Request; @@ -58,7 +59,6 @@ import com.redhat.thermostat.thread.collector.HarvesterCommand; import com.redhat.thermostat.thread.dao.ThreadDao; import com.redhat.thermostat.thread.model.ThreadHarvestingStatus; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; public class ThreadHarvesterTest { diff -r 07becc24f34d -r b1f82879e6a9 vm-gc/remote-collector-command/src/main/java/com/redhat/thermostat/gc/remote/command/GCCommandReceiver.java --- a/vm-gc/remote-collector-command/src/main/java/com/redhat/thermostat/gc/remote/command/GCCommandReceiver.java Mon Nov 25 19:02:01 2013 -0500 +++ b/vm-gc/remote-collector-command/src/main/java/com/redhat/thermostat/gc/remote/command/GCCommandReceiver.java Mon Nov 25 19:03:29 2013 -0500 @@ -40,6 +40,7 @@ import java.util.logging.Logger; import com.redhat.thermostat.agent.command.RequestReceiver; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.common.command.Request; import com.redhat.thermostat.common.command.Response; import com.redhat.thermostat.common.command.Response.ResponseType; @@ -47,7 +48,6 @@ import com.redhat.thermostat.gc.remote.command.internal.GC; import com.redhat.thermostat.gc.remote.command.internal.GCException; import com.redhat.thermostat.gc.remote.common.command.GCCommand; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; public class GCCommandReceiver implements RequestReceiver { diff -r 07becc24f34d -r b1f82879e6a9 vm-gc/remote-collector-command/src/main/java/com/redhat/thermostat/gc/remote/command/internal/GC.java --- a/vm-gc/remote-collector-command/src/main/java/com/redhat/thermostat/gc/remote/command/internal/GC.java Mon Nov 25 19:02:01 2013 -0500 +++ b/vm-gc/remote-collector-command/src/main/java/com/redhat/thermostat/gc/remote/command/internal/GC.java Mon Nov 25 19:03:29 2013 -0500 @@ -41,9 +41,9 @@ import java.util.logging.Level; import java.util.logging.Logger; +import com.redhat.thermostat.agent.utils.management.MXBeanConnection; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.common.utils.LoggingUtils; -import com.redhat.thermostat.utils.management.MXBeanConnection; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; public class GC { diff -r 07becc24f34d -r b1f82879e6a9 vm-gc/remote-collector-command/src/main/java/com/redhat/thermostat/gc/remote/command/osgi/GCCommandReceiverActivator.java --- a/vm-gc/remote-collector-command/src/main/java/com/redhat/thermostat/gc/remote/command/osgi/GCCommandReceiverActivator.java Mon Nov 25 19:02:01 2013 -0500 +++ b/vm-gc/remote-collector-command/src/main/java/com/redhat/thermostat/gc/remote/command/osgi/GCCommandReceiverActivator.java Mon Nov 25 19:03:29 2013 -0500 @@ -42,8 +42,8 @@ import org.osgi.util.tracker.ServiceTracker; import com.redhat.thermostat.agent.command.ReceiverRegistry; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.gc.remote.command.GCCommandReceiver; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; public class GCCommandReceiverActivator implements BundleActivator { diff -r 07becc24f34d -r b1f82879e6a9 vm-heap-analysis/agent/src/main/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/Activator.java --- a/vm-heap-analysis/agent/src/main/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/Activator.java Mon Nov 25 19:02:01 2013 -0500 +++ b/vm-heap-analysis/agent/src/main/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/Activator.java Mon Nov 25 19:03:29 2013 -0500 @@ -42,7 +42,7 @@ import org.osgi.framework.BundleContext; import com.redhat.thermostat.agent.command.ReceiverRegistry; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.common.MultipleServiceTracker; import com.redhat.thermostat.common.MultipleServiceTracker.Action; import com.redhat.thermostat.storage.core.WriterID; diff -r 07becc24f34d -r b1f82879e6a9 vm-heap-analysis/agent/src/main/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/HeapDumpReceiver.java --- a/vm-heap-analysis/agent/src/main/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/HeapDumpReceiver.java Mon Nov 25 19:02:01 2013 -0500 +++ b/vm-heap-analysis/agent/src/main/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/HeapDumpReceiver.java Mon Nov 25 19:03:29 2013 -0500 @@ -43,12 +43,12 @@ import java.util.logging.Logger; import com.redhat.thermostat.agent.command.RequestReceiver; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.common.command.Request; import com.redhat.thermostat.common.command.Response; import com.redhat.thermostat.common.command.Response.ResponseType; import com.redhat.thermostat.common.utils.LoggingUtils; import com.redhat.thermostat.storage.core.WriterID; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.vm.heap.analysis.common.HeapDAO; import com.redhat.thermostat.vm.heap.analysis.common.HistogramLoader; import com.redhat.thermostat.vm.heap.analysis.common.ObjectHistogram; diff -r 07becc24f34d -r b1f82879e6a9 vm-heap-analysis/agent/src/main/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/JMXHeapDumper.java --- a/vm-heap-analysis/agent/src/main/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/JMXHeapDumper.java Mon Nov 25 19:02:01 2013 -0500 +++ b/vm-heap-analysis/agent/src/main/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/JMXHeapDumper.java Mon Nov 25 19:03:29 2013 -0500 @@ -39,8 +39,8 @@ import javax.management.MBeanServerConnection; import javax.management.ObjectName; -import com.redhat.thermostat.utils.management.MXBeanConnection; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; +import com.redhat.thermostat.agent.utils.management.MXBeanConnection; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; class JMXHeapDumper { diff -r 07becc24f34d -r b1f82879e6a9 vm-heap-analysis/agent/src/test/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/ActivatorTest.java --- a/vm-heap-analysis/agent/src/test/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/ActivatorTest.java Mon Nov 25 19:02:01 2013 -0500 +++ b/vm-heap-analysis/agent/src/test/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/ActivatorTest.java Mon Nov 25 19:03:29 2013 -0500 @@ -44,9 +44,9 @@ import org.junit.Test; import com.redhat.thermostat.agent.command.RequestReceiver; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.storage.core.WriterID; import com.redhat.thermostat.testutils.StubBundleContext; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.vm.heap.analysis.common.HeapDAO; public class ActivatorTest { diff -r 07becc24f34d -r b1f82879e6a9 vm-heap-analysis/agent/src/test/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/JMXHeapDumperTest.java --- a/vm-heap-analysis/agent/src/test/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/JMXHeapDumperTest.java Mon Nov 25 19:02:01 2013 -0500 +++ b/vm-heap-analysis/agent/src/test/java/com/redhat/thermostat/vm/heap/analysis/agent/internal/JMXHeapDumperTest.java Mon Nov 25 19:03:29 2013 -0500 @@ -45,8 +45,8 @@ import org.junit.Test; -import com.redhat.thermostat.utils.management.MXBeanConnection; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; +import com.redhat.thermostat.agent.utils.management.MXBeanConnection; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; public class JMXHeapDumperTest { diff -r 07becc24f34d -r b1f82879e6a9 vm-jmx/agent/src/main/java/com/redhat/thermostat/vm/jmx/agent/internal/Activator.java --- a/vm-jmx/agent/src/main/java/com/redhat/thermostat/vm/jmx/agent/internal/Activator.java Mon Nov 25 19:02:01 2013 -0500 +++ b/vm-jmx/agent/src/main/java/com/redhat/thermostat/vm/jmx/agent/internal/Activator.java Mon Nov 25 19:03:29 2013 -0500 @@ -43,11 +43,11 @@ import org.osgi.framework.ServiceRegistration; import com.redhat.thermostat.agent.command.ReceiverRegistry; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.backend.Backend; import com.redhat.thermostat.common.MultipleServiceTracker; import com.redhat.thermostat.common.Version; import com.redhat.thermostat.storage.core.WriterID; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.vm.jmx.common.JmxNotificationDAO; public class Activator implements BundleActivator { diff -r 07becc24f34d -r b1f82879e6a9 vm-jmx/agent/src/main/java/com/redhat/thermostat/vm/jmx/agent/internal/JmxBackend.java --- a/vm-jmx/agent/src/main/java/com/redhat/thermostat/vm/jmx/agent/internal/JmxBackend.java Mon Nov 25 19:02:01 2013 -0500 +++ b/vm-jmx/agent/src/main/java/com/redhat/thermostat/vm/jmx/agent/internal/JmxBackend.java Mon Nov 25 19:03:29 2013 -0500 @@ -55,14 +55,14 @@ import com.redhat.thermostat.agent.command.ReceiverRegistry; import com.redhat.thermostat.agent.command.RequestReceiver; +import com.redhat.thermostat.agent.utils.management.MXBeanConnection; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.backend.BaseBackend; import com.redhat.thermostat.common.Clock; import com.redhat.thermostat.common.SystemClock; import com.redhat.thermostat.common.Version; import com.redhat.thermostat.common.utils.LoggingUtils; import com.redhat.thermostat.storage.core.WriterID; -import com.redhat.thermostat.utils.management.MXBeanConnection; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.vm.jmx.common.JmxNotification; import com.redhat.thermostat.vm.jmx.common.JmxNotificationDAO; import com.redhat.thermostat.vm.jmx.common.JmxNotificationStatus; diff -r 07becc24f34d -r b1f82879e6a9 vm-jmx/agent/src/test/java/com/redhat/thermostat/vm/jmx/agent/internal/ActivatorTest.java --- a/vm-jmx/agent/src/test/java/com/redhat/thermostat/vm/jmx/agent/internal/ActivatorTest.java Mon Nov 25 19:02:01 2013 -0500 +++ b/vm-jmx/agent/src/test/java/com/redhat/thermostat/vm/jmx/agent/internal/ActivatorTest.java Mon Nov 25 19:03:29 2013 -0500 @@ -45,10 +45,10 @@ import org.osgi.framework.Bundle; import org.osgi.framework.Version; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.backend.Backend; import com.redhat.thermostat.storage.core.WriterID; import com.redhat.thermostat.testutils.StubBundleContext; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.vm.jmx.agent.internal.Activator; import com.redhat.thermostat.vm.jmx.agent.internal.JmxBackend; import com.redhat.thermostat.vm.jmx.common.JmxNotificationDAO; diff -r 07becc24f34d -r b1f82879e6a9 vm-jmx/agent/src/test/java/com/redhat/thermostat/vm/jmx/agent/internal/JmxBackendTest.java --- a/vm-jmx/agent/src/test/java/com/redhat/thermostat/vm/jmx/agent/internal/JmxBackendTest.java Mon Nov 25 19:02:01 2013 -0500 +++ b/vm-jmx/agent/src/test/java/com/redhat/thermostat/vm/jmx/agent/internal/JmxBackendTest.java Mon Nov 25 19:03:29 2013 -0500 @@ -65,11 +65,11 @@ import com.redhat.thermostat.agent.command.ReceiverRegistry; import com.redhat.thermostat.agent.command.RequestReceiver; +import com.redhat.thermostat.agent.utils.management.MXBeanConnection; +import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.common.Ordered; import com.redhat.thermostat.common.Version; import com.redhat.thermostat.storage.core.WriterID; -import com.redhat.thermostat.utils.management.MXBeanConnection; -import com.redhat.thermostat.utils.management.MXBeanConnectionPool; import com.redhat.thermostat.vm.jmx.common.JmxNotification; import com.redhat.thermostat.vm.jmx.common.JmxNotificationDAO;