Author: rfeng
Date: Tue Jan 13 14:09:26 2009
New Revision: 734255
URL: http://svn.apache.org/viewvc?rev=734255&view=rev
Log:
Update cglib, jaxb-impl versions
Modified:
tuscany/java/sca/modules/binding-corba-runtime/pom.xml
tuscany/java/sca/modules/binding-ejb-runtime/pom.xml
tuscany/java/sca/modules/binding-rmi-runtime/pom.xml
tuscany/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
(contents, props changed)
tuscany/java/sca/modules/core/pom.xml
tuscany/java/sca/modules/databinding-jaxb/pom.xml
tuscany/java/sca/modules/interface-java-jaxws/pom.xml
tuscany/java/sca/modules/pom.xml
Modified: tuscany/java/sca/modules/binding-corba-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/pom.xml?rev=734255&r1=734254&r2=734255&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-corba-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/binding-corba-runtime/pom.xml Tue Jan 13 14:09:26
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/java/sca/modules/binding-ejb-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/pom.xml?rev=734255&r1=734254&r2=734255&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ejb-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/binding-ejb-runtime/pom.xml Tue Jan 13 14:09:26
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/java/sca/modules/binding-rmi-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-rmi-runtime/pom.xml?rev=734255&r1=734254&r2=734255&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-rmi-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/binding-rmi-runtime/pom.xml Tue Jan 13 14:09:26
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/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java?rev=734255&r1=734254&r2=734255&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
(original)
+++
tuscany/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
Tue Jan 13 14:09:26 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;
@@ -153,11 +153,11 @@
*/
private 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();
@@ -175,8 +175,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();
Propchange:
tuscany/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 13 14:09:26 2009
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java:671193,680620-680628
-/tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java:713805-714043
+/tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java:713805-714043,734056-734060
Modified: tuscany/java/sca/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/pom.xml?rev=734255&r1=734254&r2=734255&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/pom.xml (original)
+++ tuscany/java/sca/modules/core/pom.xml Tue Jan 13 14:09:26 2009
@@ -75,7 +75,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <version>2.2</version>
</dependency>
</dependencies>
Modified: tuscany/java/sca/modules/databinding-jaxb/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/pom.xml?rev=734255&r1=734254&r2=734255&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-jaxb/pom.xml Tue Jan 13 14:09:26 2009
@@ -67,7 +67,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.7</version>
+ <version>2.1.9</version>
<scope>runtime</scope>
</dependency>
@@ -151,7 +151,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.5</version>
+ <version>0.6.3</version>
<executions>
<execution>
<id>generate-jaxb</id>
Modified: tuscany/java/sca/modules/interface-java-jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-jaxws/pom.xml?rev=734255&r1=734254&r2=734255&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-java-jaxws/pom.xml (original)
+++ tuscany/java/sca/modules/interface-java-jaxws/pom.xml Tue Jan 13 14:09:26
2009
@@ -158,7 +158,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
- <version>1.9</version>
+ <version>1.11</version>
<executions>
<execution>
<id>wsimport</id>
Modified: tuscany/java/sca/modules/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/pom.xml?rev=734255&r1=734254&r2=734255&view=diff
==============================================================================
--- tuscany/java/sca/modules/pom.xml (original)
+++ tuscany/java/sca/modules/pom.xml Tue Jan 13 14:09:26 2009
@@ -66,6 +66,11 @@
<module>node-impl</module>
<module>node-launcher</module>
<module>node-launcher-equinox</module>
+
+ <module>host-rmi</module>
+ <module>binding-rmi</module>
+ <module>binding-rmi-runtime</module>
+
<module>policy</module>
<module>policy-security</module>
<module>policy-xml</module>
