Author: rfeng
Date: Mon Jan 12 23:27:27 2009
New Revision: 734060
URL: http://svn.apache.org/viewvc?rev=734060&view=rev
Log:
Upgrade to cglib 2.2 to be compatible with asm 3.1
Modified:
tuscany/branches/sca-java-1.x/modules/binding-corba-runtime/pom.xml
tuscany/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml
tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/pom.xml
tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
tuscany/branches/sca-java-1.x/modules/binding-rmi/pom.xml
tuscany/branches/sca-java-1.x/modules/core/pom.xml
Modified: tuscany/branches/sca-java-1.x/modules/binding-corba-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-corba-runtime/pom.xml?rev=734060&r1=734059&r2=734060&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-corba-runtime/pom.xml
(original)
+++ tuscany/branches/sca-java-1.x/modules/binding-corba-runtime/pom.xml Mon Jan
12 23:27:27 2009
@@ -57,7 +57,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <version>2.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: tuscany/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml?rev=734060&r1=734059&r2=734060&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml Mon Jan
12 23:27:27 2009
@@ -46,7 +46,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <version>2.2</version>
<scope>compile</scope>
</dependency>
Modified: tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/pom.xml?rev=734060&r1=734059&r2=734060&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/pom.xml Mon Jan
12 23:27:27 2009
@@ -57,7 +57,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <version>2.2</version>
</dependency>
<dependency>
Modified:
tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java?rev=734060&r1=734059&r2=734060&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
Mon Jan 12 23:27:27 2009
@@ -28,8 +28,8 @@
import java.security.PrivilegedExceptionAction;
import net.sf.cglib.asm.ClassWriter;
-import net.sf.cglib.asm.Constants;
import net.sf.cglib.asm.Type;
+import net.sf.cglib.core.Constants;
import net.sf.cglib.proxy.Enhancer;
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy;
@@ -156,11 +156,11 @@
*/
protected byte[] generateRemoteInterface(Class serviceInterface) {
String interfazeName = serviceInterface.getName();
- ClassWriter cw = new ClassWriter(false);
+ ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
String simpleName = serviceInterface.getSimpleName();
cw.visit(Constants.V1_5, Constants.ACC_PUBLIC + Constants.ACC_ABSTRACT
+ Constants.ACC_INTERFACE, interfazeName
- .replace('.', '/'), "java/lang/Object", new String[]
{"java/rmi/Remote"}, simpleName + ".java");
+ .replace('.', '/'), null, "java/lang/Object", new String[]
{"java/rmi/Remote"});
StringBuffer argsAndReturn = null;
Method[] methods = serviceInterface.getMethods();
@@ -178,8 +178,8 @@
cw.visitMethod(Constants.ACC_PUBLIC + Constants.ACC_ABSTRACT,
method.getName(),
argsAndReturn.toString(),
- new String[] {"java/rmi/RemoteException"},
- null);
+ null,
+ new String[] {"java/rmi/RemoteException"});
}
cw.visitEnd();
return cw.toByteArray();
Modified: tuscany/branches/sca-java-1.x/modules/binding-rmi/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-rmi/pom.xml?rev=734060&r1=734059&r2=734060&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/binding-rmi/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/binding-rmi/pom.xml Mon Jan 12
23:27:27 2009
@@ -51,7 +51,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <version>2.2</version>
</dependency>
<dependency>
Modified: tuscany/branches/sca-java-1.x/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/core/pom.xml?rev=734060&r1=734059&r2=734060&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/core/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/core/pom.xml Mon Jan 12 23:27:27 2009
@@ -75,7 +75,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <version>2.2</version>
</dependency>
</dependencies>
