From 349a91ff433f0bc246ea616a057b3fdb4a34e644 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Thu, 4 Oct 2012 23:31:44 +0000
Subject: [PATCH] Rename package jmx to monitoring and move class ThreadDump to
 it.

SVN: 27039
---
 .../cisd/common/{jmx => monitoring}/JMXMemoryMonitor.java       | 2 +-
 .../common/{jmx => monitoring}/JMXMemoryMonitorSpringBean.java  | 2 +-
 .../cisd/common/{utilities => monitoring}/ThreadDump.java       | 2 +-
 datastore_server/source/java/dssApplicationContext.xml          | 2 +-
 .../generic/server/ServerExceptionTranslatingAdvisor.java       | 2 +-
 openbis/source/java/genericApplicationContext.xml               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename common/source/java/ch/systemsx/cisd/common/{jmx => monitoring}/JMXMemoryMonitor.java (99%)
 rename common/source/java/ch/systemsx/cisd/common/{jmx => monitoring}/JMXMemoryMonitorSpringBean.java (98%)
 rename common/source/java/ch/systemsx/cisd/common/{utilities => monitoring}/ThreadDump.java (98%)

diff --git a/common/source/java/ch/systemsx/cisd/common/jmx/JMXMemoryMonitor.java b/common/source/java/ch/systemsx/cisd/common/monitoring/JMXMemoryMonitor.java
similarity index 99%
rename from common/source/java/ch/systemsx/cisd/common/jmx/JMXMemoryMonitor.java
rename to common/source/java/ch/systemsx/cisd/common/monitoring/JMXMemoryMonitor.java
index 4488b01b885..14e1a4e2156 100644
--- a/common/source/java/ch/systemsx/cisd/common/jmx/JMXMemoryMonitor.java
+++ b/common/source/java/ch/systemsx/cisd/common/monitoring/JMXMemoryMonitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.jmx;
+package ch.systemsx.cisd.common.monitoring;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
diff --git a/common/source/java/ch/systemsx/cisd/common/jmx/JMXMemoryMonitorSpringBean.java b/common/source/java/ch/systemsx/cisd/common/monitoring/JMXMemoryMonitorSpringBean.java
similarity index 98%
rename from common/source/java/ch/systemsx/cisd/common/jmx/JMXMemoryMonitorSpringBean.java
rename to common/source/java/ch/systemsx/cisd/common/monitoring/JMXMemoryMonitorSpringBean.java
index 2e99113a8f0..9368b7c63b0 100644
--- a/common/source/java/ch/systemsx/cisd/common/jmx/JMXMemoryMonitorSpringBean.java
+++ b/common/source/java/ch/systemsx/cisd/common/monitoring/JMXMemoryMonitorSpringBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.jmx;
+package ch.systemsx.cisd.common.monitoring;
 
 import java.util.Properties;
 
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ThreadDump.java b/common/source/java/ch/systemsx/cisd/common/monitoring/ThreadDump.java
similarity index 98%
rename from common/source/java/ch/systemsx/cisd/common/utilities/ThreadDump.java
rename to common/source/java/ch/systemsx/cisd/common/monitoring/ThreadDump.java
index 757c6e3b66a..0de770b8396 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ThreadDump.java
+++ b/common/source/java/ch/systemsx/cisd/common/monitoring/ThreadDump.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.monitoring;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/datastore_server/source/java/dssApplicationContext.xml b/datastore_server/source/java/dssApplicationContext.xml
index 554a3fd6e10..c46cdf66f31 100644
--- a/datastore_server/source/java/dssApplicationContext.xml
+++ b/datastore_server/source/java/dssApplicationContext.xml
@@ -27,7 +27,7 @@
         factory-method="getResolvedProps">
     </bean>
     
-	<bean id="memory-monitor" class="ch.systemsx.cisd.common.jmx.JMXMemoryMonitorSpringBean" />
+	<bean id="memory-monitor" class="ch.systemsx.cisd.common.monitoring.JMXMemoryMonitorSpringBean" />
 
     <bean id="data-set-path-infos-provider" class="ch.systemsx.cisd.openbis.dss.generic.server.DatabaseBasedDataSetPathInfoProvider"/>
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServerExceptionTranslatingAdvisor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServerExceptionTranslatingAdvisor.java
index 0f0faf54db9..c1a12011167 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServerExceptionTranslatingAdvisor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ServerExceptionTranslatingAdvisor.java
@@ -32,7 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 import ch.systemsx.cisd.common.exception.UserFailureException;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.common.utilities.ThreadDump;
+import ch.systemsx.cisd.common.monitoring.ThreadDump;
 import ch.systemsx.cisd.openbis.generic.shared.IServer;
 
 /**
diff --git a/openbis/source/java/genericApplicationContext.xml b/openbis/source/java/genericApplicationContext.xml
index c86f31a93a2..0c17b542a90 100644
--- a/openbis/source/java/genericApplicationContext.xml
+++ b/openbis/source/java/genericApplicationContext.xml
@@ -17,7 +17,7 @@
 
     <bean id="exception-translator" class="ch.systemsx.cisd.openbis.generic.server.business.bo.NextExceptionFallbackExceptionTranslator" />
 
-	<bean id="memory-monitor" class="ch.systemsx.cisd.common.jmx.JMXMemoryMonitorSpringBean" />
+	<bean id="memory-monitor" class="ch.systemsx.cisd.common.monitoring.JMXMemoryMonitorSpringBean" />
 
     <bean id="transaction-manager"
         class="ch.systemsx.cisd.openbis.generic.server.dataaccess.db.OpenBISHibernateTransactionManager">
-- 
GitLab