From b381d35a885ccb09bfdd77fd8c9806143db20afa Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 4 Mar 2010 04:43:05 +0000
Subject: Remove the dependency on obsolete
 binding-sca-axis2/binding-sca-rmi/sca-client-rmi modules

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@918851 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-2.x/trunk/modules/domain-node/pom.xml             |  2 +-
 sca-java-2.x/trunk/modules/pom.xml                         |  5 -----
 sca-java-2.x/trunk/modules/sca-client-javascript/pom.xml   |  2 +-
 .../apache/tuscany/sca/client/javascript/ScriptEngine.java | 14 +++-----------
 4 files changed, 5 insertions(+), 18 deletions(-)

(limited to 'sca-java-2.x/trunk/modules')

diff --git a/sca-java-2.x/trunk/modules/domain-node/pom.xml b/sca-java-2.x/trunk/modules/domain-node/pom.xml
index bf8fcad6ee..86d7c96684 100644
--- a/sca-java-2.x/trunk/modules/domain-node/pom.xml
+++ b/sca-java-2.x/trunk/modules/domain-node/pom.xml
@@ -46,7 +46,7 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-client-rmi</artifactId>
+            <artifactId>tuscany-sca-client-impl</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/sca-java-2.x/trunk/modules/pom.xml b/sca-java-2.x/trunk/modules/pom.xml
index 88eba37a7f..5f97e96095 100644
--- a/sca-java-2.x/trunk/modules/pom.xml
+++ b/sca-java-2.x/trunk/modules/pom.xml
@@ -50,12 +50,8 @@
         <module>binding-rmi</module>
         <module>binding-rmi-runtime</module>
         <module>binding-sca-runtime</module>
-        <module>binding-sca-runtime-rmi</module>
-        <module>binding-sca-axis2-runtime</module>
         <module>binding-ws</module>
-        <!--module>binding-ws-axis2</module-->
         <module>binding-ws-runtime-axis2</module>
-        <!--module>binding-ws-axis2-policy</module-->
         <module>binding-ws-wsdlgen</module>
         <module>builder</module>
         <module>common-http</module>        
@@ -114,7 +110,6 @@
         <module>sca-api</module>
         <module>sca-client-impl</module>
         <module>sca-client-javascript</module>
-        <module>sca-client-rmi</module>
         <module>stripes</module>
         <module>xsd</module>
         <module>web-javascript</module>
diff --git a/sca-java-2.x/trunk/modules/sca-client-javascript/pom.xml b/sca-java-2.x/trunk/modules/sca-client-javascript/pom.xml
index cb4278c0c7..b8a31f8cc6 100644
--- a/sca-java-2.x/trunk/modules/sca-client-javascript/pom.xml
+++ b/sca-java-2.x/trunk/modules/sca-client-javascript/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>   
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-client-rmi</artifactId>
+            <artifactId>tuscany-sca-client-impl</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/sca-client-javascript/src/main/java/org/apache/tuscany/sca/client/javascript/ScriptEngine.java b/sca-java-2.x/trunk/modules/sca-client-javascript/src/main/java/org/apache/tuscany/sca/client/javascript/ScriptEngine.java
index 41fb224cd3..151e2f2715 100644
--- a/sca-java-2.x/trunk/modules/sca-client-javascript/src/main/java/org/apache/tuscany/sca/client/javascript/ScriptEngine.java
+++ b/sca-java-2.x/trunk/modules/sca-client-javascript/src/main/java/org/apache/tuscany/sca/client/javascript/ScriptEngine.java
@@ -30,17 +30,9 @@ import java.lang.reflect.Method;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.List;
 
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.assembly.EndpointReference;
-import org.apache.tuscany.sca.client.rmi.SCAClientFactoryImpl;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
 import org.oasisopen.sca.NoSuchDomainException;
+import org.oasisopen.sca.client.SCAClientFactory;
 
 import sun.org.mozilla.javascript.internal.Context;
 import sun.org.mozilla.javascript.internal.Function;
@@ -83,7 +75,7 @@ public class ScriptEngine extends ScriptableObject implements Runnable{
 	/**
 	 * instance of Tuscany runtime
 	 */
-	private SCAClientFactoryImpl tuscany;
+	private SCAClientFactory tuscany;
 	
 	/**
 	 * A reference to the old class loader
@@ -498,7 +490,7 @@ public class ScriptEngine extends ScriptableObject implements Runnable{
 //        Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
 
         try {
-            tuscany = new SCAClientFactoryImpl(URI.create("tuscany:foo"));
+            tuscany = SCAClientFactory.newInstance(URI.create("tuscany:foo"));
         } catch (NoSuchDomainException e) {
             throw new RuntimeException(e);
         }        
-- 
cgit v1.2.3