Author: antelder
Date: Mon Feb 9 08:21:44 2009
New Revision: 742325
URL: http://svn.apache.org/viewvc?rev=742325&view=rev
Log:
TUSCANY-2359 rationalize the SCA runtime use of cglib and asm dependencies
Modified:
tuscany/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
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/RemoteInterfaceGenerator.java
tuscany/java/sca/modules/core/pom.xml
tuscany/java/sca/modules/interface-java-jaxws/pom.xml
Modified: tuscany/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF?rev=742325&r1=742324&r2=742325&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/binding-rmi-runtime/META-INF/MANIFEST.MF Mon Feb
9 08:21:44 2009
@@ -10,7 +10,7 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA RMI Binding Extension
-Import-Package: net.sf.cglib.asm,
+Import-Package: org.objectweb.asm,
net.sf.cglib.core,
net.sf.cglib.proxy,
org.apache.tuscany.sca.assembly;version="2.0.0",
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=742325&r1=742324&r2=742325&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-rmi-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/binding-rmi-runtime/pom.xml Mon Feb 9 08:21:44
2009
@@ -50,11 +50,17 @@
<dependency>
<groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
+ <artifactId>cglib</artifactId>
<version>2.2</version>
</dependency>
<dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
Modified:
tuscany/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java?rev=742325&r1=742324&r2=742325&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java
(original)
+++
tuscany/java/sca/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java
Mon Feb 9 08:21:44 2009
@@ -25,10 +25,11 @@
import java.util.Map;
import java.util.WeakHashMap;
-import net.sf.cglib.asm.ClassWriter;
-import net.sf.cglib.asm.Type;
import net.sf.cglib.core.Constants;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Type;
+
/**
*
*/
Modified: tuscany/java/sca/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/pom.xml?rev=742325&r1=742324&r2=742325&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/pom.xml (original)
+++ tuscany/java/sca/modules/core/pom.xml Mon Feb 9 08:21:44 2009
@@ -80,9 +80,16 @@
<dependency>
<groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
+ <artifactId>cglib</artifactId>
<version>2.2</version>
</dependency>
+
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.1</version>
+ </dependency>
+
</dependencies>
</project>
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=742325&r1=742324&r2=742325&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-java-jaxws/pom.xml (original)
+++ tuscany/java/sca/modules/interface-java-jaxws/pom.xml Mon Feb 9 08:21:44
2009
@@ -66,9 +66,21 @@
<dependency>
<groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
+ <artifactId>asm</artifactId>
<version>3.1</version>
- <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>3.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ <version>3.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
