groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [groovy] 06/06: GROOVY-8647: Split package renaming (groovy-jmx)
Date Sat, 18 May 2019 00:46:17 GMT
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 6be83758a4d0498f22718232e1e571dd89db00fe
Author: Paul King <paulk@asert.com.au>
AuthorDate: Sat May 18 10:46:01 2019 +1000

    GROOVY-8647: Split package renaming (groovy-jmx)
---
 .../src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy         | 2 ++
 .../src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy       | 2 ++
 .../src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy         | 2 ++
 subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java      | 2 +-
 .../groovy-jmx/src/test/groovy/groovy/{util => jmx}/Dummy.java        | 4 ++--
 .../test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy    | 1 +
 .../src/test/groovy/groovy/jmx/builder/JmxTimerFactoryTest.groovy     | 1 +
 .../groovy-jmx/src/test/java/groovy/{util => jmx}/DummyMBean.java     | 2 +-
 .../groovy-jmx/src/test/java/groovy/{util => jmx}/MBeanTest.java      | 4 ++--
 9 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
index b4b4df1..71f75f7 100644
--- a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
+++ b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxBuilderTools.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.jmx.builder
 
+import groovy.jmx.GroovyMBean
+
 import javax.management.DynamicMBean
 import javax.management.MBeanServerConnection
 import javax.management.MBeanServerFactory
diff --git a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy
index 1689b45..123b401 100644
--- a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy
+++ b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxEmitterFactory.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.jmx.builder
 
+import groovy.jmx.GroovyMBean
+
 import javax.management.MBeanServer
 import javax.management.NotificationFilterSupport
 import javax.management.ObjectName
diff --git a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
index f8a738b..160b7df 100644
--- a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
+++ b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxTimerFactory.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.jmx.builder
 
+import groovy.jmx.GroovyMBean
+
 import javax.management.MBeanServer
 import javax.management.NotificationFilter
 import javax.management.NotificationFilterSupport
diff --git a/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java b/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java
index 8f48699..27fd6ac 100644
--- a/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java
+++ b/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.util;
+package groovy.jmx;
 
 import groovy.lang.GroovyObjectSupport;
 import groovy.lang.GroovyRuntimeException;
diff --git a/subprojects/groovy-jmx/src/test/groovy/groovy/util/Dummy.java b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/Dummy.java
similarity index 95%
rename from subprojects/groovy-jmx/src/test/groovy/groovy/util/Dummy.java
rename to subprojects/groovy-jmx/src/test/groovy/groovy/jmx/Dummy.java
index 5827f99..8b4b146 100644
--- a/subprojects/groovy-jmx/src/test/groovy/groovy/util/Dummy.java
+++ b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/Dummy.java
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.util;
+package groovy.jmx;
 
-public class Dummy implements DummyMBean {
+public class Dummy implements groovy.jmx.DummyMBean {
 
     private String name = "James";
     private String location = "London";
diff --git a/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy
b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy
index a962093..dc21e31 100644
--- a/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy
+++ b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxBeanExportFactoryTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.jmx.builder
 
+import groovy.jmx.GroovyMBean
 import groovy.test.GroovyTestCase
 
 import javax.management.MBeanServerConnection
diff --git a/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxTimerFactoryTest.groovy
b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxTimerFactoryTest.groovy
index 39504ef..4cb386b 100644
--- a/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxTimerFactoryTest.groovy
+++ b/subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxTimerFactoryTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.jmx.builder
 
+import groovy.jmx.GroovyMBean
 import groovy.test.GroovyTestCase
 
 import javax.management.MBeanServer
diff --git a/subprojects/groovy-jmx/src/test/java/groovy/util/DummyMBean.java b/subprojects/groovy-jmx/src/test/java/groovy/jmx/DummyMBean.java
similarity index 97%
rename from subprojects/groovy-jmx/src/test/java/groovy/util/DummyMBean.java
rename to subprojects/groovy-jmx/src/test/java/groovy/jmx/DummyMBean.java
index c8d4618..3b48507 100644
--- a/subprojects/groovy-jmx/src/test/java/groovy/util/DummyMBean.java
+++ b/subprojects/groovy-jmx/src/test/java/groovy/jmx/DummyMBean.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.util;
+package groovy.jmx;
 
 public interface DummyMBean {
     void start();
diff --git a/subprojects/groovy-jmx/src/test/java/groovy/util/MBeanTest.java b/subprojects/groovy-jmx/src/test/java/groovy/jmx/MBeanTest.java
similarity index 94%
rename from subprojects/groovy-jmx/src/test/java/groovy/util/MBeanTest.java
rename to subprojects/groovy-jmx/src/test/java/groovy/jmx/MBeanTest.java
index 1df37ff..57849e7 100644
--- a/subprojects/groovy-jmx/src/test/java/groovy/util/MBeanTest.java
+++ b/subprojects/groovy-jmx/src/test/java/groovy/jmx/MBeanTest.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.util;
+package groovy.jmx;
 
 import groovy.test.GroovyTestCase;
 
@@ -37,7 +37,7 @@ public class MBeanTest extends GroovyTestCase {
         MBeanServer mbeanServer = MBeanServerFactory.createMBeanServer();
         ObjectName name = new ObjectName("groovy.test:role=TestMBean,type=Dummy");
         // use Class.forName instead of new Dummy() to allow separate compilation
-        mbeanServer.registerMBean(Class.forName("groovy.util.Dummy").getDeclaredConstructor().newInstance(),
name);
+        mbeanServer.registerMBean(Class.forName("groovy.jmx.Dummy").getDeclaredConstructor().newInstance(),
name);
 
         assertEquals("JMX value of Name", "James", mbeanServer.getAttribute(name, "Name"));
 


Mime
View raw message