Refactor Proxies agent (extract functionality in separate reusable ar…

…tifact); update copyright years

net.tascalate.javaflow.agent.core/.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">

net.tascalate.javaflow.agent.core/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,16 @@
 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.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.6

net.tascalate.javaflow.agent.core/pom.xml

@@ -35,14 +35,14 @@
 		</dependency>
 		<dependency>
 			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.providers.asmx</artifactId>
+			<artifactId>net.tascalate.javaflow.agent.common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.agent.common</artifactId>
+			<artifactId>net.tascalate.javaflow.providers.core</artifactId>
 			<version>${project.version}</version>
-		</dependency>
+		</dependency>		
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

net.tascalate.javaflow.agent.core/src/main/java/module-info.java

@@ -16,14 +16,10 @@
 module net.tascalate.javaflow.agent.core {
     requires transitive java.instrument;
 
-    requires org.slf4j;
-
     requires net.tascalate.instrument.agent;
-
-    requires net.tascalate.javaflow.spi;
-    requires net.tascalate.javaflow.providers.asmx;
 
-    requires transitive net.tascalate.javaflow.agent.common;
-
-    exports org.apache.commons.javaflow.agent.core; 
+    requires net.tascalate.javaflow.agent.common;
+    requires net.tascalate.javaflow.providers.core;
+
+    exports org.apache.commons.javaflow.agent.core;
 }

net.tascalate.javaflow.agent.core/src/main/java/org/apache/commons/javaflow/agent/core/ContinuableClassBytecodeTransformer.java

@@ -16,10 +16,10 @@
 package org.apache.commons.javaflow.agent.core;
 
 import org.apache.commons.javaflow.agent.common.ConfigurableClassFileTransformer;
-import org.apache.commons.javaflow.providers.asmx.AsmxResourceTransformationFactory;
+import org.apache.commons.javaflow.providers.core.ContinuableClassTransformationFactory;
 
 class ContinuableClassBytecodeTransformer extends ConfigurableClassFileTransformer {
     public ContinuableClassBytecodeTransformer() {
-        super(new AsmxResourceTransformationFactory());
+        super(new ContinuableClassTransformationFactory());
     }
 }

net.tascalate.javaflow.agent.proxy/.settings/org.eclipse.jdt.core.prefs

@@ -11,6 +11,6 @@ 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.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.6

net.tascalate.javaflow.agent.proxy/pom.xml

@@ -19,39 +19,25 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
 			<scope>runtime</scope>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>net.tascalate</groupId>
-			<artifactId>net.tascalate.asmx.plus</artifactId>
-			<version>${tascalate.asmx.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>net.tascalate</groupId>
-			<artifactId>net.tascalate.asmx.commons</artifactId>
-			<version>${tascalate.asmx.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>net.tascalate.instrument</groupId>
 			<artifactId>net.tascalate.instrument.agent</artifactId>
 			<version>${tascalate.instrument.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.providers.asmx</artifactId>
+			<artifactId>net.tascalate.javaflow.agent.common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>net.tascalate.javaflow</groupId>
-			<artifactId>net.tascalate.javaflow.agent.common</artifactId>
+			<artifactId>net.tascalate.javaflow.providers.proxy</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>

net.tascalate.javaflow.agent.proxy/src/main/java/module-info.java

@@ -16,20 +16,10 @@
 module net.tascalate.javaflow.agent.proxy {
     requires transitive java.instrument;
 
-    requires org.slf4j;
-
-    requires net.tascalate.asmx;
-    requires net.tascalate.asmx.commons;
-    requires net.tascalate.asmx.plus;
-    requires net.tascalate.asmx.tree;
-    requires net.tascalate.asmx.tree.analysis;
-
     requires net.tascalate.instrument.agent;
-
-    requires transitive net.tascalate.javaflow.spi;
-    requires transitive net.tascalate.javaflow.providers.asmx;
 
-    requires transitive net.tascalate.javaflow.agent.common;
-
+    requires net.tascalate.javaflow.agent.common;
+    requires net.tascalate.javaflow.providers.proxy;
+
     exports org.apache.commons.javaflow.agent.proxy;
 }

net.tascalate.javaflow.agent.proxy/src/main/java/org/apache/commons/javaflow/agent/proxy/ContinuableProxyBytecodeTransformer.java

@@ -16,6 +16,7 @@
 package org.apache.commons.javaflow.agent.proxy;
 
 import org.apache.commons.javaflow.agent.common.ConfigurableClassFileTransformer;
+import org.apache.commons.javaflow.providers.proxy.ContinuableProxyTransformationFactory;
 
 class ContinuableProxyBytecodeTransformer extends ConfigurableClassFileTransformer {
 

net.tascalate.javaflow.api/src/main/java/module-info.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.api/src/main/java/org/apache/commons/javaflow/api/ContinuableAnnotation.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.api/src/main/java/org/apache/commons/javaflow/api/Continuation.java

@@ -7,7 +7,7 @@
  * See the NOTICE file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Modified work: copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Modified work: copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.api/src/main/java/org/apache/commons/javaflow/api/InterceptorSupport.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.api/src/main/java/org/apache/commons/javaflow/api/ccs.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.api/src/main/java/org/apache/commons/javaflow/api/continuable.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.api/src/main/java/org/apache/commons/javaflow/core/ContinuableProxy.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.api/src/main/java/org/apache/commons/javaflow/core/CustomContinuableProxy.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.api/src/main/java/org/apache/commons/javaflow/core/ResumeParameter.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.api/src/main/java/org/apache/commons/javaflow/core/Skip.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.api/src/main/java/org/apache/commons/javaflow/core/Stack.java

@@ -7,7 +7,7 @@
  * See the NOTICE file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Modified work: copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Modified work: copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.api/src/main/java/org/apache/commons/javaflow/core/StackRecorder.java

@@ -7,7 +7,7 @@
  * See the NOTICE file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Modified work: copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Modified work: copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.api/src/main/java/org/apache/commons/javaflow/core/SuspendResult.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.providers.asm3/.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"/>

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/AbstractResourceTransformationFactory.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/Asm3ResourceTransformationFactory.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ClassHierarchy.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableClassInfo.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableClassInfoResolver.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableClassTransformer.java

@@ -7,7 +7,7 @@
  * See the NOTICE file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Modified work: copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Modified work: copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableClassVisitor.java

@@ -7,7 +7,7 @@
  * See the NOTICE file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Modified work: copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Modified work: copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableMethodNode.java

@@ -7,7 +7,7 @@
  * See the NOTICE file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Modified work: copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Modified work: copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/ContinuableMethodVisitor.java

@@ -7,7 +7,7 @@
  * See the NOTICE file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Modified work: copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Modified work: copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/FastClassVerifier.java

@@ -7,7 +7,7 @@
  * See the NOTICE file distributed with this work for additional
  * information regarding copyright ownership.
  *
- * Modified work: copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Modified work: copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/IContinuableClassInfo.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/MaybeContinuableAnnotationVisitor.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

net.tascalate.javaflow.providers.asm3/src/main/java/org/apache/commons/javaflow/providers/asm3/OfflineClassWriter.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2019 Valery Silaev (http://vsilaev.com)
+ * Copyright 2013-2021 Valery Silaev (http://vsilaev.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.