Author: mbenson
Date: Thu Mar 27 16:31:04 2014
New Revision: 1582384
URL: http://svn.apache.org/r1582384
Log:
rename asm4 module to asm
Added:
commons/proper/proxy/trunk/asm/
- copied from r1582374, commons/proper/proxy/trunk/asm4/
commons/proper/proxy/trunk/asm/src/main/java/org/apache/commons/proxy2/asm/
- copied from r1582374,
commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/
commons/proper/proxy/trunk/asm/src/main/java/org/apache/commons/proxy2/asm/ASMProxyFactory.java
- copied, changed from r1582374,
commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java
commons/proper/proxy/trunk/asm/src/test/java/org/apache/commons/proxy2/asm/
- copied from r1582374,
commons/proper/proxy/trunk/asm4/src/test/java/org/apache/commons/proxy2/asm4/
commons/proper/proxy/trunk/asm/src/test/java/org/apache/commons/proxy2/asm/TestAsmProxyFactory.java
- copied, changed from r1582374,
commons/proper/proxy/trunk/asm4/src/test/java/org/apache/commons/proxy2/asm4/TestAsm4ProxyFactory.java
Removed:
commons/proper/proxy/trunk/asm/src/main/java/org/apache/commons/proxy2/asm/ASM4ProxyFactory.java
commons/proper/proxy/trunk/asm/src/main/java/org/apache/commons/proxy2/asm4/
commons/proper/proxy/trunk/asm/src/test/java/org/apache/commons/proxy2/asm/TestAsm4ProxyFactory.java
commons/proper/proxy/trunk/asm/src/test/java/org/apache/commons/proxy2/asm4/
commons/proper/proxy/trunk/asm4/
Modified:
commons/proper/proxy/trunk/asm/pom.xml
commons/proper/proxy/trunk/asm/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory
commons/proper/proxy/trunk/dist/pom.xml
commons/proper/proxy/trunk/pom.xml
commons/proper/proxy/trunk/test/pom.xml
commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/AbstractProxyFactoryAgnosticTest.java
Modified: commons/proper/proxy/trunk/asm/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/asm/pom.xml?rev=1582384&r1=1582374&r2=1582384&view=diff
==============================================================================
--- commons/proper/proxy/trunk/asm/pom.xml (original)
+++ commons/proper/proxy/trunk/asm/pom.xml Thu Mar 27 16:31:04 2014
@@ -26,9 +26,9 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>commons-proxy2-asm4</artifactId>
- <name>Commons Proxy ASM4 Proxies Module</name>
- <description>Proxies based on classes dynamically generated using ASM v4
+ <artifactId>commons-proxy2-asm</artifactId>
+ <name>Commons Proxy ASM Proxies Module</name>
+ <description>Proxies based on classes dynamically generated using ASM v4+
</description>
<dependencies>
<dependency>
Copied:
commons/proper/proxy/trunk/asm/src/main/java/org/apache/commons/proxy2/asm/ASMProxyFactory.java
(from r1582374,
commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java)
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/asm/src/main/java/org/apache/commons/proxy2/asm/ASMProxyFactory.java?p2=commons/proper/proxy/trunk/asm/src/main/java/org/apache/commons/proxy2/asm/ASMProxyFactory.java&p1=commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java&r1=1582374&r2=1582384&rev=1582384&view=diff
==============================================================================
---
commons/proper/proxy/trunk/asm4/src/main/java/org/apache/commons/proxy2/asm4/ASM4ProxyFactory.java
(original)
+++
commons/proper/proxy/trunk/asm/src/main/java/org/apache/commons/proxy2/asm/ASMProxyFactory.java
Thu Mar 27 16:31:04 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.proxy2.asm4;
+package org.apache.commons.proxy2.asm;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
@@ -39,7 +39,7 @@ import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
import org.objectweb.asm.commons.GeneratorAdapter;
-public class ASM4ProxyFactory extends AbstractSubclassingProxyFactory
+public class ASMProxyFactory extends AbstractSubclassingProxyFactory
{
private static final ProxyClassCache PROXY_CLASS_CACHE = new
ProxyClassCache(new ProxyGenerator());
@@ -83,7 +83,7 @@ public class ASM4ProxyFactory extends Ab
private static class ProxyGenerator extends AbstractProxyClassGenerator
implements Opcodes
{
private static final AtomicInteger CLASS_NUMBER = new AtomicInteger(0);
- private static final String CLASSNAME_PREFIX = "CommonsProxyASM4_";
+ private static final String CLASSNAME_PREFIX = "CommonsProxyASM_";
private static final String HANDLER_NAME = "__handler";
private static final Type INVOKER_TYPE = Type.getType(Invoker.class);
Modified:
commons/proper/proxy/trunk/asm/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/asm/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory?rev=1582384&r1=1582374&r2=1582384&view=diff
==============================================================================
---
commons/proper/proxy/trunk/asm/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory
(original)
+++
commons/proper/proxy/trunk/asm/src/main/resources/META-INF/services/org.apache.commons.proxy2.ProxyFactory
Thu Mar 27 16:31:04 2014
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-org.apache.commons.proxy2.asm4.ASM4ProxyFactory
+org.apache.commons.proxy2.asm.ASMProxyFactory
Copied:
commons/proper/proxy/trunk/asm/src/test/java/org/apache/commons/proxy2/asm/TestAsmProxyFactory.java
(from r1582374,
commons/proper/proxy/trunk/asm4/src/test/java/org/apache/commons/proxy2/asm4/TestAsm4ProxyFactory.java)
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/asm/src/test/java/org/apache/commons/proxy2/asm/TestAsmProxyFactory.java?p2=commons/proper/proxy/trunk/asm/src/test/java/org/apache/commons/proxy2/asm/TestAsmProxyFactory.java&p1=commons/proper/proxy/trunk/asm4/src/test/java/org/apache/commons/proxy2/asm4/TestAsm4ProxyFactory.java&r1=1582374&r2=1582384&rev=1582384&view=diff
==============================================================================
---
commons/proper/proxy/trunk/asm4/src/test/java/org/apache/commons/proxy2/asm4/TestAsm4ProxyFactory.java
(original)
+++
commons/proper/proxy/trunk/asm/src/test/java/org/apache/commons/proxy2/asm/TestAsmProxyFactory.java
Thu Mar 27 16:31:04 2014
@@ -14,13 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.proxy2.asm4;
+package org.apache.commons.proxy2.asm;
import org.apache.commons.proxy2.AbstractSubclassingProxyFactoryTestCase;
-public class TestAsm4ProxyFactory extends
AbstractSubclassingProxyFactoryTestCase
+public class TestAsmProxyFactory extends
AbstractSubclassingProxyFactoryTestCase
{
-
//**********************************************************************************************************************
- // Constructors
-
//**********************************************************************************************************************
}
Modified: commons/proper/proxy/trunk/dist/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/dist/pom.xml?rev=1582384&r1=1582383&r2=1582384&view=diff
==============================================================================
--- commons/proper/proxy/trunk/dist/pom.xml (original)
+++ commons/proper/proxy/trunk/dist/pom.xml Thu Mar 27 16:31:04 2014
@@ -55,16 +55,16 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-proxy2-asm4</artifactId>
+ <artifactId>commons-proxy2-asm</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-proxy2-asm4</artifactId>
+ <artifactId>commons-proxy2-asm</artifactId>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-proxy2-asm4</artifactId>
+ <artifactId>commons-proxy2-asm</artifactId>
<classifier>javadoc</classifier>
</dependency>
<dependency>
Modified: commons/proper/proxy/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/pom.xml?rev=1582384&r1=1582383&r2=1582384&view=diff
==============================================================================
--- commons/proper/proxy/trunk/pom.xml (original)
+++ commons/proper/proxy/trunk/pom.xml Thu Mar 27 16:31:04 2014
@@ -164,18 +164,18 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>commons-proxy2-asm4</artifactId>
+ <artifactId>commons-proxy2-asm</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>commons-proxy2-asm4</artifactId>
+ <artifactId>commons-proxy2-asm</artifactId>
<classifier>sources</classifier>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>commons-proxy2-asm4</artifactId>
+ <artifactId>commons-proxy2-asm</artifactId>
<classifier>javadoc</classifier>
<version>${project.version}</version>
</dependency>
@@ -703,7 +703,7 @@
<module>build-tools</module>
<module>core</module>
<module>jdk</module>
- <module>asm4</module>
+ <module>asm</module>
<module>javassist</module>
<module>cglib</module>
<module>test</module>
Modified: commons/proper/proxy/trunk/test/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/test/pom.xml?rev=1582384&r1=1582383&r2=1582384&view=diff
==============================================================================
--- commons/proper/proxy/trunk/test/pom.xml (original)
+++ commons/proper/proxy/trunk/test/pom.xml Thu Mar 27 16:31:04 2014
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>commons-proxy2-asm4</artifactId>
+ <artifactId>commons-proxy2-asm</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified:
commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/AbstractProxyFactoryAgnosticTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/AbstractProxyFactoryAgnosticTest.java?rev=1582384&r1=1582383&r2=1582384&view=diff
==============================================================================
---
commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/AbstractProxyFactoryAgnosticTest.java
(original)
+++
commons/proper/proxy/trunk/test/src/test/java/org/apache/commons/proxy2/stub/AbstractProxyFactoryAgnosticTest.java
Thu Mar 27 16:31:04 2014
@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.proxy2.ProxyFactory;
-import org.apache.commons.proxy2.asm4.ASM4ProxyFactory;
+import org.apache.commons.proxy2.asm.ASMProxyFactory;
import org.apache.commons.proxy2.cglib.CglibProxyFactory;
import org.apache.commons.proxy2.javassist.JavassistProxyFactory;
import org.apache.commons.proxy2.jdk.JdkProxyFactory;
@@ -43,7 +43,7 @@ public abstract class AbstractProxyFacto
result.add(new Object[] { new JdkProxyFactory() });
result.add(new Object[] { new CglibProxyFactory() });
result.add(new Object[] { new JavassistProxyFactory() });
- result.add(new Object[] { new ASM4ProxyFactory() });
+ result.add(new Object[] { new ASMProxyFactory() });
return result;
}
