From 2075bfc425c2c5f941cd2ff8ad520e1a0be893b8 Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Wed, 7 Jul 2010 20:00:04 +0000
Subject: [PATCH] HHH-5358 - Merge jmx module back into core

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@19911 1b8cb986-b30d-0410-93ca-fae66ebed9b2
---
 .../org/hibernate/jmx/HibernateService.java   |  0
 .../hibernate/jmx/HibernateServiceMBean.java  |  0
 .../org/hibernate/jmx/SessionFactoryStub.java |  0
 .../org/hibernate/jmx/StatisticsService.java  |  0
 .../hibernate/jmx/StatisticsServiceMBean.java |  0
 .../main/java/org/hibernate/jmx/package.html  |  0
 .../java/org/hibernate/jmx/Entity.hbm.xml     |  0
 .../test/java/org/hibernate/jmx/Entity.java   |  0
 .../java/org/hibernate/jmx/TrivialTest.java   |  0
 jmx/pom.xml                                   | 50 -------------------
 pom.xml                                       |  1 -
 11 files changed, 51 deletions(-)
 rename {jmx => core}/src/main/java/org/hibernate/jmx/HibernateService.java (100%)
 rename {jmx => core}/src/main/java/org/hibernate/jmx/HibernateServiceMBean.java (100%)
 rename {jmx => core}/src/main/java/org/hibernate/jmx/SessionFactoryStub.java (100%)
 rename {jmx => core}/src/main/java/org/hibernate/jmx/StatisticsService.java (100%)
 rename {jmx => core}/src/main/java/org/hibernate/jmx/StatisticsServiceMBean.java (100%)
 rename {jmx => core}/src/main/java/org/hibernate/jmx/package.html (100%)
 rename {jmx => core}/src/test/java/org/hibernate/jmx/Entity.hbm.xml (100%)
 rename {jmx => core}/src/test/java/org/hibernate/jmx/Entity.java (100%)
 rename {jmx => core}/src/test/java/org/hibernate/jmx/TrivialTest.java (100%)
 delete mode 100644 jmx/pom.xml

diff --git a/jmx/src/main/java/org/hibernate/jmx/HibernateService.java b/core/src/main/java/org/hibernate/jmx/HibernateService.java
similarity index 100%
rename from jmx/src/main/java/org/hibernate/jmx/HibernateService.java
rename to core/src/main/java/org/hibernate/jmx/HibernateService.java
diff --git a/jmx/src/main/java/org/hibernate/jmx/HibernateServiceMBean.java b/core/src/main/java/org/hibernate/jmx/HibernateServiceMBean.java
similarity index 100%
rename from jmx/src/main/java/org/hibernate/jmx/HibernateServiceMBean.java
rename to core/src/main/java/org/hibernate/jmx/HibernateServiceMBean.java
diff --git a/jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java b/core/src/main/java/org/hibernate/jmx/SessionFactoryStub.java
similarity index 100%
rename from jmx/src/main/java/org/hibernate/jmx/SessionFactoryStub.java
rename to core/src/main/java/org/hibernate/jmx/SessionFactoryStub.java
diff --git a/jmx/src/main/java/org/hibernate/jmx/StatisticsService.java b/core/src/main/java/org/hibernate/jmx/StatisticsService.java
similarity index 100%
rename from jmx/src/main/java/org/hibernate/jmx/StatisticsService.java
rename to core/src/main/java/org/hibernate/jmx/StatisticsService.java
diff --git a/jmx/src/main/java/org/hibernate/jmx/StatisticsServiceMBean.java b/core/src/main/java/org/hibernate/jmx/StatisticsServiceMBean.java
similarity index 100%
rename from jmx/src/main/java/org/hibernate/jmx/StatisticsServiceMBean.java
rename to core/src/main/java/org/hibernate/jmx/StatisticsServiceMBean.java
diff --git a/jmx/src/main/java/org/hibernate/jmx/package.html b/core/src/main/java/org/hibernate/jmx/package.html
similarity index 100%
rename from jmx/src/main/java/org/hibernate/jmx/package.html
rename to core/src/main/java/org/hibernate/jmx/package.html
diff --git a/jmx/src/test/java/org/hibernate/jmx/Entity.hbm.xml b/core/src/test/java/org/hibernate/jmx/Entity.hbm.xml
similarity index 100%
rename from jmx/src/test/java/org/hibernate/jmx/Entity.hbm.xml
rename to core/src/test/java/org/hibernate/jmx/Entity.hbm.xml
diff --git a/jmx/src/test/java/org/hibernate/jmx/Entity.java b/core/src/test/java/org/hibernate/jmx/Entity.java
similarity index 100%
rename from jmx/src/test/java/org/hibernate/jmx/Entity.java
rename to core/src/test/java/org/hibernate/jmx/Entity.java
diff --git a/jmx/src/test/java/org/hibernate/jmx/TrivialTest.java b/core/src/test/java/org/hibernate/jmx/TrivialTest.java
similarity index 100%
rename from jmx/src/test/java/org/hibernate/jmx/TrivialTest.java
rename to core/src/test/java/org/hibernate/jmx/TrivialTest.java
diff --git a/jmx/pom.xml b/jmx/pom.xml
deleted file mode 100644
index fecd7f9831..0000000000
--- a/jmx/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ Hibernate, Relational Persistence for Idiomatic Java
-  ~
-  ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
-  ~ indicated by the @author tags or express copyright attribution
-  ~ statements applied by the authors.  All third-party contributions are
-  ~ distributed under license by Red Hat Middleware LLC.
-  ~
-  ~ This copyrighted material is made available to anyone wishing to use, modify,
-  ~ copy, or redistribute it subject to the terms and conditions of the GNU
-  ~ Lesser General Public License, as published by the Free Software Foundation.
-  ~
-  ~ This program 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 distribution; if not, write to:
-  ~ Free Software Foundation, Inc.
-  ~ 51 Franklin Street, Fifth Floor
-  ~ Boston, MA  02110-1301  USA
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-parent</artifactId>
-        <version>3.6.0-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.hibernate</groupId>
-    <artifactId>hibernate-jmx</artifactId>
-    <packaging>jar</packaging>
-
-    <name>Hibernate JMX Module</name>
-    <description>Defines Hibernate JMX capabilities</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>${groupId}</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${version}</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/pom.xml b/pom.xml
index 61ebf98a6b..6f4386acd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,6 @@
         <module>connection-proxool</module>
         <module>annotations</module>
         <module>envers</module>
-        <module>jmx</module>
         <module>jdbc3-testing</module>
         <module>cache-infinispan</module>
 <!--