You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2010/03/04 05:43:05 UTC
svn commit: r918851 - in /tuscany/sca-java-2.x/trunk: features/ejava/
features/webservice/ itest/nodes/one-jvm-hazelcast-client/
itest/nodes/one-jvm-hazelcast/ itest/nodes/one-jvm-tribes/
itest/nodes/two-nodes-two-vms-hazelcast/ itest/nodes/two-nodes-t...
Author: rfeng
Date: Thu Mar 4 04:43:05 2010
New Revision: 918851
URL: http://svn.apache.org/viewvc?rev=918851&view=rev
Log:
Remove the dependency on obsolete binding-sca-axis2/binding-sca-rmi/sca-client-rmi modules
Modified:
tuscany/sca-java-2.x/trunk/features/ejava/pom.xml
tuscany/sca-java-2.x/trunk/features/webservice/pom.xml
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/pom.xml
tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/pom.xml
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml
tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml
tuscany/sca-java-2.x/trunk/modules/domain-node/pom.xml
tuscany/sca-java-2.x/trunk/modules/pom.xml
tuscany/sca-java-2.x/trunk/modules/sca-client-javascript/pom.xml
tuscany/sca-java-2.x/trunk/modules/sca-client-javascript/src/main/java/org/apache/tuscany/sca/client/javascript/ScriptEngine.java
Modified: tuscany/sca-java-2.x/trunk/features/ejava/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/features/ejava/pom.xml?rev=918851&r1=918850&r2=918851&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/features/ejava/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/features/ejava/pom.xml Thu Mar 4 04:43:05 2010
@@ -127,6 +127,19 @@
<version>2.0-SNAPSHOT</version>
</dependency>
-->
+
+ <!-- Hazelcast registry -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-endpoint-hazelcast</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-endpoint-hazelcast-client</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
</dependencies>
Modified: tuscany/sca-java-2.x/trunk/features/webservice/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/features/webservice/pom.xml?rev=918851&r1=918850&r2=918851&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/features/webservice/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/features/webservice/pom.xml Thu Mar 4 04:43:05 2010
@@ -41,47 +41,11 @@
</dependency>
<!-- Bindings -->
- <!--dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-axis2-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency-->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>2.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>addressing</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-xmlbeans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb-codegen</artifactId>
- </exclusion>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </exclusion>
- <exclusion>
- <groupId>opensaml</groupId>
- <artifactId>opensaml</artifactId>
- </exclusion>
- </exclusions>
- </dependency-->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
@@ -130,7 +94,8 @@
<artifactId>tuscany-databinding-jaxb-axiom</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
- <!--dependency>
+ <!--
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding-sdo</artifactId>
<version>2.0-SNAPSHOT</version>
@@ -139,7 +104,8 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding-sdo-axiom</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency-->
+ </dependency>
+ -->
<!-- Hosts -->
<dependency>
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml?rev=918851&r1=918850&r2=918851&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml Thu Mar 4 04:43:05 2010
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-runtime-rmi</artifactId>
+ <artifactId>tuscany-binding-rmi-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/pom.xml?rev=918851&r1=918850&r2=918851&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/pom.xml Thu Mar 4 04:43:05 2010
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-runtime-rmi</artifactId>
+ <artifactId>tuscany-binding-rmi-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/pom.xml?rev=918851&r1=918850&r2=918851&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/pom.xml Thu Mar 4 04:43:05 2010
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-runtime-rmi</artifactId>
+ <artifactId>tuscany-binding-rmi-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml?rev=918851&r1=918850&r2=918851&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml Thu Mar 4 04:43:05 2010
@@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-runtime-rmi</artifactId>
+ <artifactId>tuscany-binding-rmi-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml?rev=918851&r1=918850&r2=918851&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml Thu Mar 4 04:43:05 2010
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-runtime-rmi</artifactId>
+ <artifactId>tuscany-binding-rmi-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/pom.xml?rev=918851&r1=918850&r2=918851&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/pom.xml Thu Mar 4 04:43:05 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/pom.xml?rev=918851&r1=918850&r2=918851&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/pom.xml Thu Mar 4 04:43:05 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/sca-client-javascript/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/sca-client-javascript/pom.xml?rev=918851&r1=918850&r2=918851&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/sca-client-javascript/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/sca-client-javascript/pom.xml Thu Mar 4 04:43:05 2010
@@ -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>
Modified: tuscany/sca-java-2.x/trunk/modules/sca-client-javascript/src/main/java/org/apache/tuscany/sca/client/javascript/ScriptEngine.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/sca-client-javascript/src/main/java/org/apache/tuscany/sca/client/javascript/ScriptEngine.java?rev=918851&r1=918850&r2=918851&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/sca-client-javascript/src/main/java/org/apache/tuscany/sca/client/javascript/ScriptEngine.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/sca-client-javascript/src/main/java/org/apache/tuscany/sca/client/javascript/ScriptEngine.java Thu Mar 4 04:43:05 2010
@@ -30,17 +30,9 @@
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 @@
/**
* instance of Tuscany runtime
*/
- private SCAClientFactoryImpl tuscany;
+ private SCAClientFactory tuscany;
/**
* A reference to the old class loader
@@ -498,7 +490,7 @@
// 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);
}