You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2019/05/18 00:46:11 UTC
[groovy] branch master updated (f37feca -> 6be8375)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from f37feca GROOVY-8647: Split package renaming (groovy.xml.QName -> groovy.namespace.QName)
new 0e45969 GROOVY-8647: Split package renaming (avoid groovy.xml package in groovy module tests to avoid confusion even though not a strict requirement)
new 60ace39 Split history main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - rename source-file to temp
new dd35308 Split history main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - rename file to target-name
new 3ec3765 Split history main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - resolve conflict and keep both files
new f5fa3bd Split history main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - restore name of source-file
new 6be8375 GROOVY-8647: Split package renaming (groovy-jmx)
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/test/groovy/{xml => util}/XmlAssert.java | 2 +-
.../org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java | 2 +-
.../codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java | 2 +-
src/test/org/codehaus/groovy/classgen/TestSupport.java | 8 ++++++--
.../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 ++
.../src/main/java/groovy/{util => jmx}/GroovyMBean.java | 2 +-
.../groovy-jmx/src/test/groovy/groovy/{util => jmx}/Dummy.java | 4 ++--
.../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 ++--
.../groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy | 2 +-
.../groovy-xml/src/test/groovy/groovy/xml}/bugs/SeansBug.java | 2 +-
.../src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy | 2 +-
16 files changed, 26 insertions(+), 14 deletions(-)
rename src/test/groovy/{xml => util}/XmlAssert.java (98%)
copy subprojects/groovy-jmx/src/main/java/groovy/{util => jmx}/GroovyMBean.java (99%)
rename subprojects/groovy-jmx/src/test/groovy/groovy/{util => jmx}/Dummy.java (95%)
rename subprojects/groovy-jmx/src/test/java/groovy/{util => jmx}/DummyMBean.java (97%)
rename subprojects/groovy-jmx/src/test/java/groovy/{util => jmx}/MBeanTest.java (94%)
rename {src/test/groovy => subprojects/groovy-xml/src/test/groovy/groovy/xml}/bugs/SeansBug.java (98%)
[groovy] 01/06: GROOVY-8647: Split package renaming (avoid
groovy.xml package in groovy module tests to avoid confusion even though
not a strict requirement)
Posted by pa...@apache.org.
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 0e4596914c9e6e446c258afa9c112c576ed73fd0
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat May 18 09:07:30 2019 +1000
GROOVY-8647: Split package renaming (avoid groovy.xml package in groovy module tests to avoid confusion even though not a strict requirement)
---
src/test/groovy/{xml => util}/XmlAssert.java | 2 +-
.../org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java | 2 +-
.../codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java | 2 +-
src/test/org/codehaus/groovy/classgen/TestSupport.java | 8 ++++++--
.../groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy | 2 +-
.../groovy-xml/src/test/groovy/groovy/xml}/bugs/SeansBug.java | 2 +-
.../src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy | 2 +-
7 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/test/groovy/xml/XmlAssert.java b/src/test/groovy/util/XmlAssert.java
similarity index 98%
rename from src/test/groovy/xml/XmlAssert.java
rename to src/test/groovy/util/XmlAssert.java
index f71e658..52b5cd5 100644
--- a/src/test/groovy/xml/XmlAssert.java
+++ b/src/test/groovy/util/XmlAssert.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.xml;
+package groovy.util;
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLUnit;
diff --git a/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java
index a62f59c..fd9dfef 100644
--- a/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java
+++ b/src/test/org/codehaus/groovy/antlr/treewalker/MindMapPrinterTest.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.codehaus.groovy.antlr.parser.GroovyTokenTypes;
-import static groovy.xml.XmlAssert.assertXmlEquals;
+import static groovy.util.XmlAssert.assertXmlEquals;
/**
* Testcases for the antlr AST visitor that prints groovy source code nodes as Freemind compatible XML.
diff --git a/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java b/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java
index 43ba85d..92f8a77 100644
--- a/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java
+++ b/src/test/org/codehaus/groovy/antlr/treewalker/NodeAsHTMLPrinterTest.java
@@ -20,7 +20,7 @@ package org.codehaus.groovy.antlr.treewalker;
import junit.framework.TestCase;
-import static groovy.xml.XmlAssert.assertXmlEquals;
+import static groovy.util.XmlAssert.assertXmlEquals;
/**
* Testcases for the antlr AST visitor that prints groovy source code nodes as HTML.
diff --git a/src/test/org/codehaus/groovy/classgen/TestSupport.java b/src/test/org/codehaus/groovy/classgen/TestSupport.java
index a984174..a6f19c8 100644
--- a/src/test/org/codehaus/groovy/classgen/TestSupport.java
+++ b/src/test/org/codehaus/groovy/classgen/TestSupport.java
@@ -18,8 +18,12 @@
*/
package org.codehaus.groovy.classgen;
-import groovy.lang.*;
-import groovy.util.GroovyTestCase;
+import groovy.lang.Binding;
+import groovy.lang.GroovyClassLoader;
+import groovy.lang.GroovyCodeSource;
+import groovy.lang.GroovyObject;
+import groovy.lang.Script;
+import groovy.test.GroovyTestCase;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.CompileUnit;
import org.codehaus.groovy.ast.FieldNode;
diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
index 31ee8e6..02f0df1 100644
--- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
+++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/XmlUtilTest.groovy
@@ -24,7 +24,7 @@ import org.xml.sax.InputSource
import javax.xml.transform.stream.StreamSource
-import static groovy.xml.XmlAssert.assertXmlEquals
+import static groovy.util.XmlAssert.assertXmlEquals
import static groovy.xml.XmlUtil.escapeControlCharacters
import static groovy.xml.XmlUtil.escapeXml
import static groovy.xml.XmlUtil.newSAXParser
diff --git a/src/test/groovy/bugs/SeansBug.java b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/SeansBug.java
similarity index 98%
rename from src/test/groovy/bugs/SeansBug.java
rename to subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/SeansBug.java
index 2bb7014..9eb3048 100644
--- a/src/test/groovy/bugs/SeansBug.java
+++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/bugs/SeansBug.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.bugs;
+package groovy.xml.bugs;
import groovy.lang.GroovyShell;
import org.codehaus.groovy.classgen.TestSupport;
diff --git a/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy b/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy
index 0fb0220..027817a 100644
--- a/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy
+++ b/subprojects/groovy-xml/src/test/groovy/groovy/xml/dom/NamespaceDOMTest.groovy
@@ -24,7 +24,7 @@ import groovy.xml.NamespaceBuilder
import groovy.xml.TestXmlSupport
import groovy.xml.XmlUtil
-import static groovy.xml.XmlAssert.assertXmlEquals
+import static groovy.util.XmlAssert.assertXmlEquals
class NamespaceDOMTest extends TestXmlSupport {
[groovy] 04/06: Split history
main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - resolve
conflict and keep both files
Posted by pa...@apache.org.
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 3ec376560eecef3f9f51a627925e9889840b8728
Merge: 60ace39 dd35308
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat May 18 09:11:31 2019 +1000
Split history main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - resolve conflict and keep both files
.../src/main/java/groovy/jmx/GroovyMBean.java | 391 +++++++++++++++++++++
1 file changed, 391 insertions(+)
[groovy] 02/06: Split history
main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - rename
file to target-name
Posted by pa...@apache.org.
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 dd353089c427523a91e6ef64da9352d8ad29ea2d
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat May 18 09:11:30 2019 +1000
Split history main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - rename file to target-name
---
.../groovy-jmx/src/main/java/groovy/{util => jmx}/GroovyMBean.java | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java b/subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java
similarity index 100%
rename from subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
rename to subprojects/groovy-jmx/src/main/java/groovy/jmx/GroovyMBean.java
[groovy] 06/06: GROOVY-8647: Split package renaming (groovy-jmx)
Posted by pa...@apache.org.
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 <pa...@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"));
[groovy] 05/06: Split history
main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - restore
name of source-file
Posted by pa...@apache.org.
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 f5fa3bdb5295dadf85115421d6fa7d9146b84350
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat May 18 09:11:31 2019 +1000
Split history main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - restore name of source-file
---
.../groovy-jmx/src/{temp => main/java/groovy/util/GroovyMBean.java} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-jmx/src/temp b/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
similarity index 100%
rename from subprojects/groovy-jmx/src/temp
rename to subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
[groovy] 03/06: Split history
main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - rename
source-file to temp
Posted by pa...@apache.org.
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 60ace39ced71d65f819b100c2683a9f493414aa6
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat May 18 09:11:31 2019 +1000
Split history main/java/groovy/util/GroovyMBean.java to main/java/groovy/jmx - rename source-file to temp
---
.../groovy-jmx/src/{main/java/groovy/util/GroovyMBean.java => temp} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java b/subprojects/groovy-jmx/src/temp
similarity index 100%
rename from subprojects/groovy-jmx/src/main/java/groovy/util/GroovyMBean.java
rename to subprojects/groovy-jmx/src/temp