summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x/modules
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-01-13 07:27:27 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-01-13 07:27:27 +0000
commit4c39d8c12de316d28abe711557c60ef000014e62 (patch)
tree7fe65a94313297ce5be396ecdd505b288ece9486 /branches/sca-java-1.x/modules
parent42ea2e2927bc6ba5f3797d189f21a3895b6d1e1d (diff)
Upgrade to cglib 2.2 to be compatible with asm 3.1
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@734060 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--branches/sca-java-1.x/modules/binding-corba-runtime/pom.xml2
-rw-r--r--branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml2
-rw-r--r--branches/sca-java-1.x/modules/binding-rmi-runtime/pom.xml2
-rw-r--r--branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java10
-rw-r--r--branches/sca-java-1.x/modules/binding-rmi/pom.xml2
-rw-r--r--branches/sca-java-1.x/modules/core/pom.xml2
6 files changed, 10 insertions, 10 deletions
diff --git a/branches/sca-java-1.x/modules/binding-corba-runtime/pom.xml b/branches/sca-java-1.x/modules/binding-corba-runtime/pom.xml
index a4490cc23e..7839500c54 100644
--- a/branches/sca-java-1.x/modules/binding-corba-runtime/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-corba-runtime/pom.xml
@@ -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>
diff --git a/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml b/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml
index c8e9a5ebf2..07911b3d4b 100644
--- a/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-ejb-runtime/pom.xml
@@ -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>
diff --git a/branches/sca-java-1.x/modules/binding-rmi-runtime/pom.xml b/branches/sca-java-1.x/modules/binding-rmi-runtime/pom.xml
index 499d73291b..630300c938 100644
--- a/branches/sca-java-1.x/modules/binding-rmi-runtime/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-rmi-runtime/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <version>2.2</version>
</dependency>
<dependency>
diff --git a/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java b/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
index 5d829162d9..c237654c74 100644
--- a/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
+++ b/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
@@ -28,8 +28,8 @@ import java.security.AccessController;
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 @@ public class RMIServiceBindingProvider implements ServiceBindingProvider {
*/
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 @@ public class RMIServiceBindingProvider implements ServiceBindingProvider {
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();
diff --git a/branches/sca-java-1.x/modules/binding-rmi/pom.xml b/branches/sca-java-1.x/modules/binding-rmi/pom.xml
index 6cd5ad3aa3..df33965a58 100644
--- a/branches/sca-java-1.x/modules/binding-rmi/pom.xml
+++ b/branches/sca-java-1.x/modules/binding-rmi/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <version>2.2</version>
</dependency>
<dependency>
diff --git a/branches/sca-java-1.x/modules/core/pom.xml b/branches/sca-java-1.x/modules/core/pom.xml
index b0b3af1125..ca951a9ce9 100644
--- a/branches/sca-java-1.x/modules/core/pom.xml
+++ b/branches/sca-java-1.x/modules/core/pom.xml
@@ -75,7 +75,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <version>2.2</version>
</dependency>
</dependencies>