summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sca-java-2.x/trunk/features/ejava/pom.xml13
-rw-r--r--sca-java-2.x/trunk/features/webservice/pom.xml42
-rw-r--r--sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml2
-rw-r--r--sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/pom.xml2
-rw-r--r--sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/pom.xml2
-rw-r--r--sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml2
-rw-r--r--sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml2
-rw-r--r--sca-java-2.x/trunk/modules/domain-node/pom.xml2
-rw-r--r--sca-java-2.x/trunk/modules/pom.xml5
-rw-r--r--sca-java-2.x/trunk/modules/sca-client-javascript/pom.xml2
-rw-r--r--sca-java-2.x/trunk/modules/sca-client-javascript/src/main/java/org/apache/tuscany/sca/client/javascript/ScriptEngine.java14
11 files changed, 27 insertions, 61 deletions
diff --git a/sca-java-2.x/trunk/features/ejava/pom.xml b/sca-java-2.x/trunk/features/ejava/pom.xml
index 3fbfb21060..a39551401f 100644
--- a/sca-java-2.x/trunk/features/ejava/pom.xml
+++ b/sca-java-2.x/trunk/features/ejava/pom.xml
@@ -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>
diff --git a/sca-java-2.x/trunk/features/webservice/pom.xml b/sca-java-2.x/trunk/features/webservice/pom.xml
index 054434415a..60acfe28e3 100644
--- a/sca-java-2.x/trunk/features/webservice/pom.xml
+++ b/sca-java-2.x/trunk/features/webservice/pom.xml
@@ -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>
diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml
index 5d398a4e7d..6aa2ecd028 100644
--- a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml
+++ b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml
@@ -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>
diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/pom.xml b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/pom.xml
index 8c089de515..07e36396fe 100644
--- a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/pom.xml
+++ b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/pom.xml
@@ -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>
diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/pom.xml b/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/pom.xml
index 22dcbea406..ff52b60103 100644
--- a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/pom.xml
+++ b/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/pom.xml
@@ -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>
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml
index e753d3e0e8..05fec4cb54 100644
--- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml
@@ -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>
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml
index b6c4210f25..2f80274c47 100644
--- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml
@@ -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>
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);
}