This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/master by this push:
new 6f8bf2f54 TAP5-2769: fixing release build and changing shadow ASM
package name
6f8bf2f54 is described below
commit 6f8bf2f54909ef0a6b3d72f379685d93a10bf98b
Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br>
AuthorDate: Sat Jan 27 12:46:32 2024 -0300
TAP5-2769: fixing release build and changing shadow ASM package name
to avoid having packages in more than one JAR, something
Java modules forbid
---
.../services/PlasticProxyFactoryImpl.java | 4 ++--
plastic-asm/build.gradle | 18 ++++++++++++------
.../plastic/AbstractAnnotationBuilder.java | 6 +++---
.../internal/plastic/InstructionBuilderImpl.java | 8 ++++----
.../internal/plastic/InstructionBuilderState.java | 6 +++---
.../internal/plastic/MethodAdviceManager.java | 6 +++---
.../internal/plastic/MethodParameterImpl.java | 2 +-
.../internal/plastic/PlasticClassImpl.java | 8 ++++----
.../internal/plastic/PlasticClassPool.java | 22 +++++++++++-----------
.../internal/plastic/PlasticFieldImpl.java | 8 ++++----
.../internal/plastic/PlasticInternalUtils.java | 10 +++++-----
.../tapestry5/internal/plastic/PlasticMember.java | 2 +-
.../internal/plastic/PlasticMethodImpl.java | 6 +++---
.../tapestry5/internal/plastic/PrimitiveType.java | 2 +-
.../internal/plastic/SwitchBlockImpl.java | 4 ++--
.../internal/plastic/TryCatchBlockImpl.java | 2 +-
.../apache/tapestry5/plastic/PlasticConstants.java | 2 +-
.../tapestry5/integration/reload/ReloadTests.java | 6 +++---
.../internal/services/ClassCreationHelper.java | 6 +++---
.../ComponentInstantiatorSourceImplTest.java | 8 ++++----
.../internal/AbstractReloadableObjectCreator.java | 6 +++---
21 files changed, 74 insertions(+), 68 deletions(-)
diff --git
a/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/services/PlasticProxyFactoryImpl.java
b/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/services/PlasticProxyFactoryImpl.java
index 1e6a50785..8e8508784 100644
---
a/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/services/PlasticProxyFactoryImpl.java
+++
b/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/services/PlasticProxyFactoryImpl.java
@@ -22,8 +22,8 @@ import
org.apache.tapestry5.commons.internal.util.InternalCommonsUtils;
import org.apache.tapestry5.commons.services.PlasticProxyFactory;
import org.apache.tapestry5.commons.util.CollectionFactory;
import org.apache.tapestry5.internal.plastic.PlasticInternalUtils;
-import org.apache.tapestry5.internal.plastic.asm.Type;
-import org.apache.tapestry5.internal.plastic.asm.tree.*;
+import org.apache.tapestry5.plastic.internal.asm.Type;
+import org.apache.tapestry5.plastic.internal.asm.tree.*;
import org.apache.tapestry5.plastic.*;
import org.slf4j.Logger;
diff --git a/plastic-asm/build.gradle b/plastic-asm/build.gradle
index 2d9578136..7c42a1f0c 100644
--- a/plastic-asm/build.gradle
+++ b/plastic-asm/build.gradle
@@ -2,18 +2,14 @@ plugins {
id "com.github.johnrengelman.shadow" version "8.1.1"
}
-description = "Shadow asm for plastic"
+description = "Shadow ASM for Plastic"
jar {
enabled = false
}
-tasks.withType(PublishToMavenRepository) {
- enabled = false
-}
-
shadowJar {
- relocate("org.objectweb.asm", "org.apache.tapestry5.internal.plastic.asm")
+ relocate("org.objectweb.asm", "org.apache.tapestry5.plastic.internal.asm")
archiveClassifier = ""
}
@@ -21,3 +17,13 @@ dependencies {
implementation("org.ow2.asm:asm-commons:${versions.asm}")
implementation("org.ow2.asm:asm-util:${versions.asm}")
}
+
+publishing {
+ publications {
+ mavenJava(MavenPublication) {
+ artifact shadowJar
+ }
+ }
+}
+
+project.tasks.publish.dependsOn shadowJar
\ No newline at end of file
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
index 4c97c872c..f764fe167 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java
@@ -14,9 +14,9 @@
package org.apache.tapestry5.internal.plastic;
-import org.apache.tapestry5.internal.plastic.asm.AnnotationVisitor;
-import org.apache.tapestry5.internal.plastic.asm.Opcodes;
-import org.apache.tapestry5.internal.plastic.asm.Type;
+import org.apache.tapestry5.plastic.internal.asm.AnnotationVisitor;
+import org.apache.tapestry5.plastic.internal.asm.Opcodes;
+import org.apache.tapestry5.plastic.internal.asm.Type;
import java.lang.reflect.Array;
import java.util.ArrayList;
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
index dd4488349..b1da5caa9 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java
@@ -15,10 +15,10 @@
package org.apache.tapestry5.internal.plastic;
import org.apache.tapestry5.internal.plastic.InstructionBuilderState.LVInfo;
-import org.apache.tapestry5.internal.plastic.asm.Label;
-import org.apache.tapestry5.internal.plastic.asm.MethodVisitor;
-import org.apache.tapestry5.internal.plastic.asm.Opcodes;
-import org.apache.tapestry5.internal.plastic.asm.Type;
+import org.apache.tapestry5.plastic.internal.asm.Label;
+import org.apache.tapestry5.plastic.internal.asm.MethodVisitor;
+import org.apache.tapestry5.plastic.internal.asm.Opcodes;
+import org.apache.tapestry5.plastic.internal.asm.Type;
import org.apache.tapestry5.plastic.*;
import java.lang.reflect.Method;
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderState.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderState.java
index 02ec8d264..8bb693aa2 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderState.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderState.java
@@ -16,9 +16,9 @@ package org.apache.tapestry5.internal.plastic;
import java.util.Map;
-import org.apache.tapestry5.internal.plastic.asm.Label;
-import org.apache.tapestry5.internal.plastic.asm.MethodVisitor;
-import org.apache.tapestry5.internal.plastic.asm.Opcodes;
+import org.apache.tapestry5.plastic.internal.asm.Label;
+import org.apache.tapestry5.plastic.internal.asm.MethodVisitor;
+import org.apache.tapestry5.plastic.internal.asm.Opcodes;
import org.apache.tapestry5.plastic.LocalVariable;
import org.apache.tapestry5.plastic.MethodDescription;
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
index 6c977b51d..036d03187 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodAdviceManager.java
@@ -14,9 +14,9 @@
package org.apache.tapestry5.internal.plastic;
-import org.apache.tapestry5.internal.plastic.asm.Opcodes;
-import org.apache.tapestry5.internal.plastic.asm.tree.ClassNode;
-import org.apache.tapestry5.internal.plastic.asm.tree.MethodNode;
+import org.apache.tapestry5.plastic.internal.asm.Opcodes;
+import org.apache.tapestry5.plastic.internal.asm.tree.ClassNode;
+import org.apache.tapestry5.plastic.internal.asm.tree.MethodNode;
import org.apache.tapestry5.plastic.*;
import java.util.List;
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
index 569a67e0e..7cbfa3669 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/MethodParameterImpl.java
@@ -1,6 +1,6 @@
package org.apache.tapestry5.internal.plastic;
-import org.apache.tapestry5.internal.plastic.asm.tree.AnnotationNode;
+import org.apache.tapestry5.plastic.internal.asm.tree.AnnotationNode;
import org.apache.tapestry5.plastic.MethodParameter;
import java.util.List;
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
index f66398cad..f67554529 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java
@@ -12,10 +12,10 @@
package org.apache.tapestry5.internal.plastic;
-import org.apache.tapestry5.internal.plastic.asm.AnnotationVisitor;
-import org.apache.tapestry5.internal.plastic.asm.Opcodes;
-import org.apache.tapestry5.internal.plastic.asm.Type;
-import org.apache.tapestry5.internal.plastic.asm.tree.*;
+import org.apache.tapestry5.plastic.internal.asm.AnnotationVisitor;
+import org.apache.tapestry5.plastic.internal.asm.Opcodes;
+import org.apache.tapestry5.plastic.internal.asm.Type;
+import org.apache.tapestry5.plastic.internal.asm.tree.*;
import org.apache.tapestry5.plastic.*;
import java.io.IOException;
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
index 9daa47d51..3e65e9f74 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
@@ -30,16 +30,16 @@ import java.util.Set;
import java.util.Stack;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.apache.tapestry5.internal.plastic.asm.ClassReader;
-import org.apache.tapestry5.internal.plastic.asm.ClassWriter;
-import org.apache.tapestry5.internal.plastic.asm.Opcodes;
-import org.apache.tapestry5.internal.plastic.asm.tree.AbstractInsnNode;
-import org.apache.tapestry5.internal.plastic.asm.tree.AnnotationNode;
-import org.apache.tapestry5.internal.plastic.asm.tree.ClassNode;
-import org.apache.tapestry5.internal.plastic.asm.tree.FieldInsnNode;
-import org.apache.tapestry5.internal.plastic.asm.tree.InsnList;
-import org.apache.tapestry5.internal.plastic.asm.tree.MethodInsnNode;
-import org.apache.tapestry5.internal.plastic.asm.tree.MethodNode;
+import org.apache.tapestry5.plastic.internal.asm.ClassReader;
+import org.apache.tapestry5.plastic.internal.asm.ClassWriter;
+import org.apache.tapestry5.plastic.internal.asm.Opcodes;
+import org.apache.tapestry5.plastic.internal.asm.tree.AbstractInsnNode;
+import org.apache.tapestry5.plastic.internal.asm.tree.AnnotationNode;
+import org.apache.tapestry5.plastic.internal.asm.tree.ClassNode;
+import org.apache.tapestry5.plastic.internal.asm.tree.FieldInsnNode;
+import org.apache.tapestry5.plastic.internal.asm.tree.InsnList;
+import org.apache.tapestry5.plastic.internal.asm.tree.MethodInsnNode;
+import org.apache.tapestry5.plastic.internal.asm.tree.MethodNode;
import org.apache.tapestry5.plastic.AnnotationAccess;
import org.apache.tapestry5.plastic.ClassInstantiator;
import org.apache.tapestry5.plastic.ClassType;
@@ -556,7 +556,7 @@ public class PlasticClassPool implements
ClassLoaderDelegate, Opcodes, PlasticCl
/**
* Constructs a class node by reading the raw bytecode for a class and
instantiating a ClassNode
- * (via {@link
ClassReader#accept(org.apache.tapestry5.internal.plastic.asm.ClassVisitor,
int)}).
+ * (via {@link
ClassReader#accept(org.apache.tapestry5.plastic.internal.asm.ClassVisitor,
int)}).
*
* @param className
* fully qualified class name
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
index d490750d6..5f8f066ec 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticFieldImpl.java
@@ -14,10 +14,10 @@
package org.apache.tapestry5.internal.plastic;
-import org.apache.tapestry5.internal.plastic.asm.Opcodes;
-import org.apache.tapestry5.internal.plastic.asm.Type;
-import org.apache.tapestry5.internal.plastic.asm.tree.FieldNode;
-import org.apache.tapestry5.internal.plastic.asm.tree.MethodNode;
+import org.apache.tapestry5.plastic.internal.asm.Opcodes;
+import org.apache.tapestry5.plastic.internal.asm.Type;
+import org.apache.tapestry5.plastic.internal.asm.tree.FieldNode;
+import org.apache.tapestry5.plastic.internal.asm.tree.MethodNode;
import org.apache.tapestry5.plastic.*;
import java.lang.reflect.Modifier;
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java
index 2a337e49c..a50ccc0d7 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java
@@ -12,11 +12,11 @@
package org.apache.tapestry5.internal.plastic;
-import org.apache.tapestry5.internal.plastic.asm.*;
-import org.apache.tapestry5.internal.plastic.asm.commons.JSRInlinerAdapter;
-import org.apache.tapestry5.internal.plastic.asm.tree.ClassNode;
-import org.apache.tapestry5.internal.plastic.asm.tree.MethodNode;
-import org.apache.tapestry5.internal.plastic.asm.util.TraceClassVisitor;
+import org.apache.tapestry5.plastic.internal.asm.*;
+import org.apache.tapestry5.plastic.internal.asm.commons.JSRInlinerAdapter;
+import org.apache.tapestry5.plastic.internal.asm.tree.ClassNode;
+import org.apache.tapestry5.plastic.internal.asm.tree.MethodNode;
+import org.apache.tapestry5.plastic.internal.asm.util.TraceClassVisitor;
import org.apache.tapestry5.plastic.InstanceContext;
import org.apache.tapestry5.plastic.MethodDescription;
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
index bf99bc973..9fe7c5eb0 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMember.java
@@ -14,7 +14,7 @@
package org.apache.tapestry5.internal.plastic;
-import org.apache.tapestry5.internal.plastic.asm.tree.AnnotationNode;
+import org.apache.tapestry5.plastic.internal.asm.tree.AnnotationNode;
import org.apache.tapestry5.plastic.AnnotationAccess;
import java.lang.annotation.Annotation;
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
index 4bb27cc6a..df2a92229 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticMethodImpl.java
@@ -12,8 +12,8 @@
package org.apache.tapestry5.internal.plastic;
-import org.apache.tapestry5.internal.plastic.asm.Opcodes;
-import org.apache.tapestry5.internal.plastic.asm.tree.MethodNode;
+import org.apache.tapestry5.plastic.internal.asm.Opcodes;
+import org.apache.tapestry5.plastic.internal.asm.tree.MethodNode;
import org.apache.tapestry5.plastic.*;
import java.lang.reflect.Modifier;
@@ -134,7 +134,7 @@ class PlasticMethodImpl extends PlasticMember implements
PlasticMethod, Comparab
// If the method is currently abstract, clear that flag.
if (Modifier.isAbstract(node.access))
{
- node.access = node.access &
~org.apache.tapestry5.internal.plastic.asm.Opcodes.ACC_ABSTRACT;
+ node.access = node.access &
~org.apache.tapestry5.plastic.internal.asm.Opcodes.ACC_ABSTRACT;
description = description.withModifiers(node.access);
}
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PrimitiveType.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PrimitiveType.java
index 8e582c7e0..9df8e949d 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PrimitiveType.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PrimitiveType.java
@@ -17,7 +17,7 @@ package org.apache.tapestry5.internal.plastic;
import java.util.HashMap;
import java.util.Map;
-import org.apache.tapestry5.internal.plastic.asm.Opcodes;
+import org.apache.tapestry5.plastic.internal.asm.Opcodes;
/**
* Collects together information needed to write code that involves primitive
types, including
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
index b6b28a780..2f3c085ff 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java
@@ -14,8 +14,8 @@
package org.apache.tapestry5.internal.plastic;
-import org.apache.tapestry5.internal.plastic.asm.Label;
-import org.apache.tapestry5.internal.plastic.asm.Opcodes;
+import org.apache.tapestry5.plastic.internal.asm.Label;
+import org.apache.tapestry5.plastic.internal.asm.Opcodes;
import org.apache.tapestry5.plastic.InstructionBuilder;
import org.apache.tapestry5.plastic.InstructionBuilderCallback;
import org.apache.tapestry5.plastic.SwitchBlock;
diff --git
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
index 77aad77c3..c7d93a75b 100644
---
a/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
+++
b/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java
@@ -14,7 +14,7 @@
package org.apache.tapestry5.internal.plastic;
-import org.apache.tapestry5.internal.plastic.asm.Label;
+import org.apache.tapestry5.plastic.internal.asm.Label;
import org.apache.tapestry5.plastic.InstructionBuilder;
import org.apache.tapestry5.plastic.InstructionBuilderCallback;
import org.apache.tapestry5.plastic.TryCatchBlock;
diff --git
a/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticConstants.java
b/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticConstants.java
index 192c0a522..4466e19ad 100644
--- a/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticConstants.java
+++ b/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticConstants.java
@@ -12,7 +12,7 @@
package org.apache.tapestry5.plastic;
-import org.apache.tapestry5.internal.plastic.asm.Opcodes;
+import org.apache.tapestry5.plastic.internal.asm.Opcodes;
public final class PlasticConstants
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java
index 3caa9e7c7..599413c77 100644
---
a/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java
@@ -16,8 +16,8 @@ package org.apache.tapestry5.integration.reload;
import org.apache.tapestry5.integration.TapestryCoreTestCase;
import org.apache.tapestry5.internal.TapestryInternalUtils;
-import org.apache.tapestry5.internal.plastic.asm.ClassWriter;
-import org.apache.tapestry5.internal.plastic.asm.MethodVisitor;
+import org.apache.tapestry5.plastic.internal.asm.ClassWriter;
+import org.apache.tapestry5.plastic.internal.asm.MethodVisitor;
import org.apache.tapestry5.internal.services.ClassCreationHelper;
import org.apache.tapestry5.test.TapestryTestConstants;
import org.testng.annotations.BeforeTest;
@@ -26,7 +26,7 @@ import org.testng.xml.XmlTest;
import java.io.*;
-import static org.apache.tapestry5.internal.plastic.asm.Opcodes.*;
+import static org.apache.tapestry5.plastic.internal.asm.Opcodes.*;
/**
* Integration tests designed to test Tapestry's ability to dynamically reload
component classes,
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClassCreationHelper.java
b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClassCreationHelper.java
index 4c68c6edb..ff9f09e0f 100644
---
a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClassCreationHelper.java
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClassCreationHelper.java
@@ -15,8 +15,8 @@
package org.apache.tapestry5.internal.services;
import org.apache.tapestry5.internal.plastic.PlasticInternalUtils;
-import org.apache.tapestry5.internal.plastic.asm.ClassWriter;
-import org.apache.tapestry5.internal.plastic.asm.MethodVisitor;
+import org.apache.tapestry5.plastic.internal.asm.ClassWriter;
+import org.apache.tapestry5.plastic.internal.asm.MethodVisitor;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -26,7 +26,7 @@ import java.net.URL;
import java.net.URLConnection;
import java.util.UUID;
-import static org.apache.tapestry5.internal.plastic.asm.Opcodes.*;
+import static org.apache.tapestry5.plastic.internal.asm.Opcodes.*;
public class ClassCreationHelper
{
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java
b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java
index f5ba51584..f382dbd6f 100644
---
a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java
@@ -15,8 +15,8 @@
package org.apache.tapestry5.internal.services;
import org.apache.tapestry5.internal.InternalComponentResources;
-import org.apache.tapestry5.internal.plastic.asm.ClassWriter;
-import org.apache.tapestry5.internal.plastic.asm.MethodVisitor;
+import org.apache.tapestry5.plastic.internal.asm.ClassWriter;
+import org.apache.tapestry5.plastic.internal.asm.MethodVisitor;
import org.apache.tapestry5.internal.t5internal.pages.BasicComponent;
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.apache.tapestry5.ioc.Registry;
@@ -32,8 +32,8 @@ import java.io.File;
import java.net.URL;
import java.net.URLClassLoader;
-import static org.apache.tapestry5.internal.plastic.asm.Opcodes.ACC_PUBLIC;
-import static org.apache.tapestry5.internal.plastic.asm.Opcodes.ARETURN;
+import static org.apache.tapestry5.plastic.internal.asm.Opcodes.ACC_PUBLIC;
+import static org.apache.tapestry5.plastic.internal.asm.Opcodes.ARETURN;
/**
* Tests for {@link
org.apache.tapestry5.internal.services.ComponentInstantiatorSourceImpl}.
Several of these tests are
diff --git
a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java
b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java
index fa9d56b0e..eaf5fe0ba 100644
---
a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java
+++
b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractReloadableObjectCreator.java
@@ -21,9 +21,9 @@ import org.apache.tapestry5.commons.util.ExceptionUtils;
import org.apache.tapestry5.internal.plastic.ClassLoaderDelegate;
import org.apache.tapestry5.internal.plastic.PlasticClassLoader;
import org.apache.tapestry5.internal.plastic.PlasticInternalUtils;
-import org.apache.tapestry5.internal.plastic.asm.ClassReader;
-import org.apache.tapestry5.internal.plastic.asm.ClassVisitor;
-import org.apache.tapestry5.internal.plastic.asm.Opcodes;
+import org.apache.tapestry5.plastic.internal.asm.ClassReader;
+import org.apache.tapestry5.plastic.internal.asm.ClassVisitor;
+import org.apache.tapestry5.plastic.internal.asm.Opcodes;
import org.apache.tapestry5.ioc.Invokable;
import org.apache.tapestry5.ioc.OperationTracker;
import org.apache.tapestry5.ioc.ReloadAware;
