Refactor agent class names; use ASM API version correctly in Proxy Agent; remove unnecessary code in ContinuableClassLoader; rename Ant & Maven artifacts

vsilaev · vsilaev · commit 6cbc02a2021d · 2022-01-07T12:22:00.000+03:00
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ There is a separate Ant task for applying JavaFlow instrumentation at build-time
 It's possibe to instrument compiled Java classes as below:
 ```xml
     <target name="instrument-classes" description="JavaFlow Instrumentation" depends="compile">
-        <taskdef name="javaflow" classname="org.apache.commons.javaflow.tools.ant.AntRewriteTask" 
+        <taskdef name="javaflow" classname="org.apache.commons.javaflow.tools.ant.ContinuableClassesInstrumentationTask" 
         classpathref="ant-lib-classpath"/>
         <echo message="JavaFlow instrumentation of compiled classes in ${classes.dir}" />
         <javaflow srcdir="${classes.dir}" destdir="${i-classes.dir}" classpathref="classpath"/>
@@ -87,7 +87,7 @@ It's possibe to instrument compiled Java classes as below:
 ... as well as re-write packaged JAR file:
 ```xml
     <target name="instrument-jar" description="JavaFlow Instrumentation" depends="jar">
-        <taskdef name="javaflow" classname="org.apache.commons.javaflow.tools.ant.AntRewriteTask" 
+        <taskdef name="javaflow" classname="org.apache.commons.javaflow.tools.ant.ContinuableClassesInstrumentationTask" 
         classpathref="ant-lib-classpath"/>
         <echo message="JavaFlow instrumentation of compiled classes in ${jar.dir}/${ant.project.name}.jar" />
         <javaflow srcdir="${jar.dir}" destdir="${i-jar.dir}" classpathref="classpath"/>
diff --git a/net.tascalate.javaflow.agent.core/pom.xml b/net.tascalate.javaflow.agent.core/pom.xml
@@ -11,11 +11,11 @@
 	<artifactId>net.tascalate.javaflow.agent.core</artifactId>
 	<packaging>jar</packaging>
 
-	<name>Tascalate JavaFlow / Agent / Continuations Instrumentation Agent</name>
+	<name>Tascalate JavaFlow / Agent / Continuable Classes Instrumentation Agent</name>
 
 	<properties>
 		<license.header>../HEADER-ORIGINAL.txt</license.header>
-		<java-agent.class>org.apache.commons.javaflow.agent.core.JavaFlowInstrumentationAgent</java-agent.class>
+		<java-agent.class>org.apache.commons.javaflow.agent.core.ContinuableClassesInstrumentationAgent</java-agent.class>
 	</properties>
 
 	<dependencies>
diff --git a/net.tascalate.javaflow.agent.core/src/main/java/org/apache/commons/javaflow/agent/core/ContinuableClassBytecodeTransformer.java b/net.tascalate.javaflow.agent.core/src/main/java/org/apache/commons/javaflow/agent/core/ContinuableClassBytecodeTransformer.java
@@ -18,8 +18,8 @@
 import org.apache.commons.javaflow.agent.common.ConfigurableClassFileTransformer;
 import org.apache.commons.javaflow.providers.asmx.AsmxResourceTransformationFactory;
 
-public class JavaFlowClassTransformer extends ConfigurableClassFileTransformer {
-    public JavaFlowClassTransformer() {
+class ContinuableClassBytecodeTransformer extends ConfigurableClassFileTransformer {
+    public ContinuableClassBytecodeTransformer() {
         super(new AsmxResourceTransformationFactory());
     }
 }
diff --git a/net.tascalate.javaflow.agent.core/src/main/java/org/apache/commons/javaflow/agent/core/ContinuableClassesInstrumentationAgent.java b/net.tascalate.javaflow.agent.core/src/main/java/org/apache/commons/javaflow/agent/core/ContinuableClassesInstrumentationAgent.java
@@ -27,11 +27,11 @@
 
 import net.tascalate.instrument.agent.AbstractLambdaAwareInstrumentationAgent;
 
-public class JavaFlowInstrumentationAgent extends AbstractLambdaAwareInstrumentationAgent {
+public class ContinuableClassesInstrumentationAgent extends AbstractLambdaAwareInstrumentationAgent {
 
-    private final ClassFileTransformer javaFlowClassTransformer = new JavaFlowClassTransformer();
+    private final ClassFileTransformer continuableClassTransformer = new ContinuableClassBytecodeTransformer();
     
-    protected JavaFlowInstrumentationAgent(String arguments, Instrumentation instrumentation) {
+    protected ContinuableClassesInstrumentationAgent(String arguments, Instrumentation instrumentation) {
         super(arguments, instrumentation);
     }
 
@@ -46,7 +46,7 @@ protected JavaFlowInstrumentationAgent(String arguments, Instrumentation instrum
      * @throws Exception
      */
     public static void premain(String args, Instrumentation instrumentation) throws Exception {
-        JavaFlowInstrumentationAgent agent = new JavaFlowInstrumentationAgent(args, instrumentation);
+        ContinuableClassesInstrumentationAgent agent = new ContinuableClassesInstrumentationAgent(args, instrumentation);
         agent.attachDefaultLambdaInstrumentationHook();
         agent.install();
     }
@@ -62,7 +62,7 @@ public static void premain(String args, Instrumentation instrumentation) throws
      * @throws Exception
      */
     public static void agentmain(String args, Instrumentation instrumentation) throws Exception {
-        JavaFlowInstrumentationAgent agent = new JavaFlowInstrumentationAgent(args, instrumentation);
+        ContinuableClassesInstrumentationAgent agent = new ContinuableClassesInstrumentationAgent(args, instrumentation);
         agent.attachDefaultLambdaInstrumentationHook();
         Set<String> nonRetransformPackages = new HashSet<String>(BASE_OWN_PACKAGES);
         nonRetransformPackages.addAll(
@@ -77,7 +77,7 @@ public static void agentmain(String args, Instrumentation instrumentation) throw
     @Override
     protected Collection<ClassFileTransformer> createTransformers(boolean canRetransform) {
         if (canRetransform) {
-            return Collections.singleton(javaFlowClassTransformer);
+            return Collections.singleton(continuableClassTransformer);
         } else {
             return Collections.emptySet();
         }
@@ -89,6 +89,6 @@ protected String readLambdaClassName(byte[] bytes) {
     }
 
     void attachDefaultLambdaInstrumentationHook() throws Exception {
-        attachLambdaInstrumentationHook(createLambdaClassTransformer(javaFlowClassTransformer));  
+        attachLambdaInstrumentationHook(createLambdaClassTransformer(continuableClassTransformer));  
     }
 }
diff --git a/net.tascalate.javaflow.agent.proxy/.classpath b/net.tascalate.javaflow.agent.proxy/.classpath
@@ -26,7 +26,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
-			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
diff --git a/net.tascalate.javaflow.agent.proxy/pom.xml b/net.tascalate.javaflow.agent.proxy/pom.xml
@@ -11,11 +11,11 @@
 	<artifactId>net.tascalate.javaflow.agent.proxy</artifactId>
 	<packaging>jar</packaging>
 
-	<name>Tascalate JavaFlow / Agent / Proxy (CDI, Spring, etc) Instrumentation JavaAgent</name>
+	<name>Tascalate JavaFlow / Agent / Continuable Proxies (CDI, Spring, etc) Instrumentation Agent</name>
 
 	<properties>
 		<license.header>../HEADER-ORIGINAL.txt</license.header>
-		<java-agent.class>org.apache.commons.javaflow.agent.proxy.CdiProxyInstrumentationAgent</java-agent.class>
+		<java-agent.class>org.apache.commons.javaflow.agent.proxy.ContinuableProxiesInstrumentationAgent</java-agent.class>
 	</properties>
 
 	<dependencies>
diff --git a/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ContinuableProxiesInstrumentationAgent.java b/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ContinuableProxiesInstrumentationAgent.java
@@ -27,9 +27,9 @@
 
 import net.tascalate.instrument.agent.AbstractInstrumentationAgent;
 
-public class CdiProxyInstrumentationAgent extends AbstractInstrumentationAgent {
+public class ContinuableProxiesInstrumentationAgent extends AbstractInstrumentationAgent {
     
-    protected CdiProxyInstrumentationAgent(String arguments, Instrumentation instrumentation) {
+    protected ContinuableProxiesInstrumentationAgent(String arguments, Instrumentation instrumentation) {
         super(arguments, instrumentation);
     }
 
@@ -44,7 +44,7 @@ protected CdiProxyInstrumentationAgent(String arguments, Instrumentation instrum
      * @throws Exception
      */
     public static void premain(String args, Instrumentation instrumentation) throws Exception {
-        CdiProxyInstrumentationAgent agent = new CdiProxyInstrumentationAgent(args, instrumentation);
+        ContinuableProxiesInstrumentationAgent agent = new ContinuableProxiesInstrumentationAgent(args, instrumentation);
         agent.install();
     }
 
@@ -59,7 +59,7 @@ public static void premain(String args, Instrumentation instrumentation) throws
      * @throws Exception
      */
     public static void agentmain(String args, Instrumentation instrumentation) throws Exception {
-        CdiProxyInstrumentationAgent agent = new CdiProxyInstrumentationAgent(args, instrumentation);
+        ContinuableProxiesInstrumentationAgent agent = new ContinuableProxiesInstrumentationAgent(args, instrumentation);
         Set<String> nonRetransformPackages = new HashSet<String>(BASE_OWN_PACKAGES);
         nonRetransformPackages.addAll(
             InstrumentationUtils.packagePrefixesOf(
@@ -73,7 +73,7 @@ public static void agentmain(String args, Instrumentation instrumentation) throw
     @Override
     protected Collection<ClassFileTransformer> createTransformers(boolean canRetransform) {
         if (canRetransform) {
-            ClassFileTransformer transformer = new CdiProxyClassTransformer();
+            ClassFileTransformer transformer = new ContinuableProxyBytecodeTransformer();
             return Collections.singleton(transformer);
         } else {
             return Collections.emptySet();
diff --git a/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ContinuableProxyAdapter.java b/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ContinuableProxyAdapter.java
@@ -38,11 +38,12 @@ class ContinuableProxyAdapter extends ExtendedClassVisitor {
     
     private ProxyClassProcessor processor;
 
-    ContinuableProxyAdapter(ClassVisitor delegate,
+    ContinuableProxyAdapter(int api,
+                            ClassVisitor delegate,
                             ClassHierarchy hierarchy,
                             ContinuableClassInfoResolver cciResolver, 
                             List<ProxyType> proxyTypes) {
-        super(delegate);
+        super(api, delegate);
         this.cciResolver = cciResolver;
         this.hierarchy = hierarchy;
         this.proxyTypes = proxyTypes;
diff --git a/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ContinuableProxyBytecodeTransformer.java b/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ContinuableProxyBytecodeTransformer.java
@@ -17,9 +17,9 @@
 
 import org.apache.commons.javaflow.agent.common.ConfigurableClassFileTransformer;
 
-class CdiProxyClassTransformer extends ConfigurableClassFileTransformer {
+class ContinuableProxyBytecodeTransformer extends ConfigurableClassFileTransformer {
 
-    CdiProxyClassTransformer() {
+    ContinuableProxyBytecodeTransformer() {
         super(new ContinuableProxyTransformationFactory());
     }
 }
diff --git a/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ContinuableProxyTransformer.java b/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ContinuableProxyTransformer.java
@@ -25,6 +25,7 @@
 import net.tascalate.asmx.ClassReader;
 import net.tascalate.asmx.ClassVisitor;
 import net.tascalate.asmx.ClassWriter;
+import net.tascalate.asmx.plus.AsmVersion;
 import net.tascalate.asmx.plus.ClassHierarchy;
 import net.tascalate.asmx.plus.OfflineClassWriter;
 
@@ -46,7 +47,7 @@ class ContinuableProxyTransformer extends AbstractResourceTransformer {
     public byte[] transform(byte[] original, Collection<String> retransformClasses) {
         ClassReader reader = new ClassReader(original);
         ClassWriter writer = new OfflineClassWriter(classHierarchy, reader, ClassWriter.COMPUTE_FRAMES + ClassWriter.COMPUTE_MAXS);
-        ClassVisitor visitor = new ContinuableProxyAdapter(writer, classHierarchy, cciResolver, proxyTypes);
+        ClassVisitor visitor = new ContinuableProxyAdapter(AsmVersion.CURRENT, writer, classHierarchy, cciResolver, proxyTypes);
         cciResolver.reset(retransformClasses);
         try {
             reader.accept(visitor, ClassReader.EXPAND_FRAMES);
diff --git a/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ExtendedClassVisitor.java b/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ExtendedClassVisitor.java
@@ -18,12 +18,11 @@
 import net.tascalate.asmx.ClassVisitor;
 import net.tascalate.asmx.FieldVisitor;
 import net.tascalate.asmx.MethodVisitor;
-import net.tascalate.asmx.plus.AsmVersion;
 
 public abstract class ExtendedClassVisitor extends ClassVisitor {
     
-    ExtendedClassVisitor(ClassVisitor delegate) {
-        super(AsmVersion.CURRENT, delegate);
+    ExtendedClassVisitor(int api, ClassVisitor delegate) {
+        super(api, delegate);
     }
     
     @SuppressWarnings("all") //"exports" in Java 9
diff --git a/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ProxyType.java b/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ProxyType.java
@@ -7,7 +7,7 @@
 
 import org.apache.commons.javaflow.agent.proxy.cglib.CGLibProxyClassProcessor;
 import org.apache.commons.javaflow.agent.proxy.custom.CustomProxyClassProcessor;
-import org.apache.commons.javaflow.agent.proxy.jproxy.JavaProxyClassProcessor;
+import org.apache.commons.javaflow.agent.proxy.jdk.JavaProxyClassProcessor;
 import org.apache.commons.javaflow.agent.proxy.owb.OwbProxyClassProcessor;
 import org.apache.commons.javaflow.agent.proxy.spring.SpringProxyClassProcessor;
 import org.apache.commons.javaflow.agent.proxy.weld.WeldProxyClassProcessor;
diff --git a/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/jdk/JavaProxyClassProcessor.java b/net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/jdk/JavaProxyClassProcessor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.javaflow.agent.proxy.jproxy;
+package org.apache.commons.javaflow.agent.proxy.jdk;
 
 import net.tascalate.asmx.MethodVisitor;
 import net.tascalate.asmx.Type;
diff --git a/net.tascalate.javaflow.providers.asm5/.classpath b/net.tascalate.javaflow.providers.asm5/.classpath
@@ -2,15 +2,15 @@
 <classpath>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="test" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="module-info.java" kind="src" output="target/classes" path="src/main/java">
@@ -26,10 +26,10 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="/net.tascalate.javaflow.spi"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/net.tascalate.javaflow.providers.asmx/src/main/java/org/apache/commons/javaflow/providers/asmx/ContinuableClassTransformer.java b/net.tascalate.javaflow.providers.asmx/src/main/java/org/apache/commons/javaflow/providers/asmx/ContinuableClassTransformer.java
@@ -30,6 +30,7 @@
 
 import net.tascalate.asmx.ClassReader;
 import net.tascalate.asmx.ClassWriter;
+import net.tascalate.asmx.plus.AsmVersion;
 import net.tascalate.asmx.plus.ClassHierarchy;
 import net.tascalate.asmx.plus.OfflineClassWriter;
 
@@ -50,9 +51,9 @@ class ContinuableClassTransformer extends AbstractResourceTransformer {
 
     public byte[] transform(byte[] original, Collection<String> retransformClasses) {
         ClassReader reader = new ClassReader(original);
-        OfflineClassWriter writer = new OfflineClassWriter(classHierarchy, reader, ClassWriter.COMPUTE_FRAMES);
+        ClassWriter writer = new OfflineClassWriter(classHierarchy, reader, ClassWriter.COMPUTE_FRAMES);
         ContinuableClassVisitor visitor = new ContinuableClassVisitor(
-            writer.api(),
+            AsmVersion.CURRENT,
             writer, /* BytecodeDebugUtils.decorateClassVisitor(cw, true, * System.err) -- DUMP*/ 
             classHierarchy,
             cciResolver,
diff --git a/net.tascalate.javaflow.tools.ant/.classpath b/net.tascalate.javaflow.tools.ant/.classpath
@@ -26,6 +26,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
@@ -34,15 +35,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="/net.tascalate.javaflow.spi">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/net.tascalate.javaflow.tools.jar">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/net.tascalate.javaflow.tools.ant/src/main/java/org/apache/commons/javaflow/tools/ant/ContinuableClassesInstrumentationTask.java b/net.tascalate.javaflow.tools.ant/src/main/java/org/apache/commons/javaflow/tools/ant/ContinuableClassesInstrumentationTask.java
@@ -42,7 +42,7 @@
 /**
  * Ant task that enhances class files with javaflow instrumentation.
  */
-public class AntRewriteTask extends MatchingTask {
+public class ContinuableClassesInstrumentationTask extends MatchingTask {
 
     private RewritingUtils.TransformerType transformerType;
 
diff --git a/net.tascalate.javaflow.tools.ant/src/main/resources/org/apache/commons/javaflow/ant/tasks.properties b/net.tascalate.javaflow.tools.ant/src/main/resources/org/apache/commons/javaflow/ant/tasks.properties
diff --git a/net.tascalate.javaflow.tools.ant/src/main/resources/org/apache/commons/javaflow/tools/ant/tasks.properties b/net.tascalate.javaflow.tools.ant/src/main/resources/org/apache/commons/javaflow/tools/ant/tasks.properties
@@ -0,0 +1 @@
+javaflow=org.apache.commons.javaflow.tools.ant.ContinuableClassesInstrumentationTask
diff --git a/net.tascalate.javaflow.tools.maven/.classpath b/net.tascalate.javaflow.tools.maven/.classpath
@@ -26,6 +26,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
@@ -34,20 +35,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="/net.tascalate.javaflow.providers.asmx">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/net.tascalate.javaflow.spi">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="/net.tascalate.javaflow.tools.jar">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/net.tascalate.javaflow.tools.maven/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.tools.maven/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
diff --git a/net.tascalate.javaflow.tools.maven/src/main/java/org/apache/commons/javaflow/tools/maven/ContinuableClassesInstrumentationMojo.java b/net.tascalate.javaflow.tools.maven/src/main/java/org/apache/commons/javaflow/tools/maven/ContinuableClassesInstrumentationMojo.java
@@ -55,7 +55,7 @@
  * 
  */
 @Mojo(name = "javaflow-enhance", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
-public class ContinuationEnhancerMojo extends AbstractMojo {
+public class ContinuableClassesInstrumentationMojo extends AbstractMojo {
 
     @Parameter(defaultValue = "${project}", property = "javaflow.enhancer.project", required = true, readonly = true)
     private MavenProject project;
diff --git a/net.tascalate.javaflow.tools.runtime/src/main/java/org/apache/commons/javaflow/tools/runtime/ContinuableClassLoader.java b/net.tascalate.javaflow.tools.runtime/src/main/java/org/apache/commons/javaflow/tools/runtime/ContinuableClassLoader.java

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@`
`18`	`18`	`import org.apache.commons.javaflow.agent.common.ConfigurableClassFileTransformer;`
`19`	`19`	`import org.apache.commons.javaflow.providers.asmx.AsmxResourceTransformationFactory;`
`20`	`20`
`21`		`-public class JavaFlowClassTransformer extends ConfigurableClassFileTransformer {`
`22`		`- public JavaFlowClassTransformer() {`
	`21`	`+class ContinuableClassBytecodeTransformer extends ConfigurableClassFileTransformer {`
	`22`	`+ public ContinuableClassBytecodeTransformer() {`
`23`	`23`	`super(new AsmxResourceTransformationFactory());`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@`
`17`	`17`
`18`	`18`	`import org.apache.commons.javaflow.agent.common.ConfigurableClassFileTransformer;`
`19`	`19`
`20`		`-class CdiProxyClassTransformer extends ConfigurableClassFileTransformer {`
	`20`	`+class ContinuableProxyBytecodeTransformer extends ConfigurableClassFileTransformer {`
`21`	`21`
`22`		`- CdiProxyClassTransformer() {`
	`22`	`+ ContinuableProxyBytecodeTransformer() {`
`23`	`23`	`super(new ContinuableProxyTransformationFactory());`
`24`	`24`	`}`
`25`	`25`	`}`