Start to clean up the node-api (remove Node.destroy())

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@908233 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 49 insertions, 5 deletions

diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml
index 2067c9e96b..590cf3bddb 100644
--- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml
+++ b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml
@@ -20,7 +20,7 @@
 <node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
     xmlns="http://tuscany.apache.org/xmlns/sca/1.1"
     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-    uri="http://sample/nodes/TestNode1"
+    uri="http://sample/nodes/TestNode2"
     domainRegistry = "tribes://228.0.0.100:50000"
     domain="http://domain1">
 
diff --git a/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
index 4b9910bb21..5af221313e 100644
--- a/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
@@ -21,15 +21,21 @@ package itest;
 import org.oasisopen.sca.annotation.EagerInit;
 import org.oasisopen.sca.annotation.Init;
 import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
 
 @EagerInit
 @Scope("COMPOSITE")
-public class HelloworldServiceImpl implements HelloworldService {
+@Service({HelloworldService.class, RemoteHelloworldService.class})
+public class HelloworldServiceImpl implements HelloworldService, RemoteHelloworldService {
 
     public String sayHello(String name) {
         return "Hello " + name;
     }
 
+    public String sayHelloRemote(String name) {
+        return "Hello " + name;
+    }
+    
     @Init
     public void init() {
         System.out.println(sayHello("world"));
diff --git a/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java b/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java
new file mode 100644
index 0000000000..a8640bf484
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package itest;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+public interface RemoteHelloworldService {
+
+    String sayHelloRemote(String name);
+
+}
diff --git a/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
index 891581ea36..ccd25ea8cd 100644
--- a/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
+++ b/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
@@ -20,6 +20,7 @@
 package test.scaclient;
 
 import itest.HelloworldService;
+import itest.RemoteHelloworldService;
 
 import java.net.URI;
 
@@ -27,7 +28,6 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.oasisopen.sca.client.SCAClientFactory;
 
@@ -46,8 +46,13 @@ public class SCAClientTestCase extends TestCase {
         node = NodeFactory.getInstance().createNode((String)null, new String[] {"target/classes"});
         node.start();
 
-        HelloworldService service = SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, "HelloworldComponent");
+        SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("default"));
+        HelloworldService service = clientFactory.getService(HelloworldService.class, "HelloworldComponent/HelloworldService");
         assertEquals("Hello petra", service.sayHello("petra"));
+        
+        RemoteHelloworldService remoteService = clientFactory.getService(RemoteHelloworldService.class, "HelloworldComponent/RemoteHelloworldService");
+        assertEquals("Hello petra", remoteService.sayHelloRemote("petra"));
+
     }
 
     @Test
@@ -55,7 +60,12 @@ public class SCAClientTestCase extends TestCase {
         node = NodeFactory.getInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"});
         node.start();
 
-        HelloworldService service = SCAClientFactory.newInstance(URI.create("myFooDomain")).getService(HelloworldService.class, "HelloworldComponent");
+        SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("myFooDomain"));
+        HelloworldService service = clientFactory.getService(HelloworldService.class, "HelloworldComponent/HelloworldService");
+        assertEquals("Hello petra", service.sayHello("petra"));
+        
+        RemoteHelloworldService remoteService = clientFactory.getService(RemoteHelloworldService.class, "HelloworldComponent/RemoteHelloworldService");
+        assertEquals("Hello petra", remoteService.sayHelloRemote("petra"));
         assertEquals("Hello petra", service.sayHello("petra"));
     }