You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/10/09 08:34:01 UTC

svn commit: r703068 [4/7] - in /tuscany/branches/sca-equinox: itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/ itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ itest/databindings/jaxb-top...

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java Wed Oct  8 23:33:54 2008
@@ -20,18 +20,23 @@
 package org.apache.tuscany.sca.binding.gdata;
 
 import junit.framework.TestCase;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+
 import com.google.gdata.data.Entry;
 import com.google.gdata.data.Feed;
 import com.google.gdata.data.PlainTextConstruct;
 
 public class ConsumerProviderTestCase extends TestCase {
 
-    private SCADomain scaDomainProvider = null;
-    private SCADomain scaDomainConsumer = null;
+    private Node providerNode = null;
+    private Node consumerNode = null;
     private CustomerClient testService = null;
 
     @Before
@@ -40,18 +45,26 @@
         System.out.println("Method Test Start-----------------------------------------------------------------------");
 
         // Setup the local GData servlet (Service Binding test)
-        scaDomainProvider = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/Provider.composite");
+        String contribution = ContributionLocationHelper.getContributionLocation(ConsumerProviderTestCase.class);
+        providerNode = NodeFactory.newInstance().createNode(
+                                                     "org/apache/tuscany/sca/binding/gdata/Provider.composite", new Contribution("provider", contribution));
+        providerNode.start();
         System.out.println("[Debug Info] Provider.composite ready...");
 
         // Initialize the GData client service (Reference Binding test)
-        scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/Consumer.composite");
-        testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient");
+        consumerNode = NodeFactory.newInstance().createNode(
+                                                                    "org/apache/tuscany/sca/binding/gdata/Consumer.composite", new Contribution("consumer", contribution));
+        consumerNode.start();
+        testService = consumerNode.getService(CustomerClient.class, "CustomerClient");
     }
 
     @After
     @Override
     public void tearDown() {
-        scaDomainProvider.close();
+        providerNode.stop();
+        providerNode.destroy();
+        consumerNode.stop();
+        consumerNode.destroy();
         System.out.println("Method Test End------------------------------------------------------------------------");
         System.out.println("\n\n");
     }

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java Wed Oct  8 23:33:54 2008
@@ -23,7 +23,10 @@
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,11 +39,10 @@
 
 public class GoogleBloggerServiceTestCase extends TestCase{
 
-    private SCADomain scaDomainConsumer = null;
+    private Node consumerNode = null;
     private CustomerClient testService = null;    
     
     public GoogleBloggerServiceTestCase(){
-
     }
     
     @Before
@@ -49,8 +51,11 @@
         System.out.println("Method Test Start-----------------------------------------------------------------------");
         
         //Initialize the GData client service (Reference Binding test)
-        scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite");
-        testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient");  
+        String contribution = ContributionLocationHelper.getContributionLocation(GoogleBloggerServiceTestCase.class);
+        consumerNode = NodeFactory.newInstance().createNode(
+                                                     "org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite", new Contribution("consumer", contribution));
+        consumerNode.start();
+        testService = consumerNode.getService(CustomerClient.class, "CustomerClient");  
     }
 
     @After
@@ -58,6 +63,8 @@
     public void tearDown(){
         System.out.println("Method Test End------------------------------------------------------------------------");
         System.out.println("\n\n");
+        consumerNode.stop();
+        consumerNode.destroy();
     }        
     
     @Test

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java Wed Oct  8 23:33:54 2008
@@ -23,7 +23,10 @@
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,11 +39,10 @@
 
 public class GoogleCalendarServiceTestCase extends TestCase{
 
-    private SCADomain scaDomainConsumer = null;
+    private Node consumerNode = null;
     private CustomerClient testService = null;    
     
     public GoogleCalendarServiceTestCase(){
-
     }
     
     @Before
@@ -49,8 +51,11 @@
         System.out.println("Method Test Start-----------------------------------------------------------------------");
         
         //Initialize the GData client service (Reference Binding test)
-        scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite");
-        testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient");  
+        String contribution = ContributionLocationHelper.getContributionLocation(GoogleCalendarServiceTestCase.class);
+        consumerNode = NodeFactory.newInstance().createNode(
+                                                     "org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite", new Contribution("consumer", contribution));
+        consumerNode.start();
+        testService = consumerNode.getService(CustomerClient.class, "CustomerClient");  
     }
 
     @After
@@ -58,6 +63,8 @@
     public void tearDown(){
         System.out.println("Method Test End------------------------------------------------------------------------");
         System.out.println("\n\n");
+        consumerNode.stop();
+        consumerNode.destroy();
     }        
     
     @Test

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java Wed Oct  8 23:33:54 2008
@@ -23,7 +23,10 @@
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,7 +39,7 @@
 
 public class GoogleContactsServiceTestCase extends TestCase{
 
-    private SCADomain scaDomainConsumer = null;
+    private Node consumerNode = null;
     private CustomerClient testService = null;    
     
     public GoogleContactsServiceTestCase(){
@@ -49,8 +52,11 @@
         System.out.println("Method Test Start-----------------------------------------------------------------------");
         
         //Initialize the GData client service (Reference Binding test)
-        scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite");
-        testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient");  
+        String contribution = ContributionLocationHelper.getContributionLocation(GoogleContactsServiceTestCase.class);
+        consumerNode = NodeFactory.newInstance().createNode(
+                                                     "org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite", new Contribution("consumer", contribution));
+        consumerNode.start();
+        testService = consumerNode.getService(CustomerClient.class, "CustomerClient");  
     }
 
     @After
@@ -58,6 +64,8 @@
     public void tearDown(){
         System.out.println("Method Test End------------------------------------------------------------------------");
         System.out.println("\n\n");
+        consumerNode.stop();
+        consumerNode.destroy();
     }        
     
     @Test

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/Provider.java Wed Oct  8 23:33:54 2008
@@ -21,13 +21,19 @@
 
 import java.io.IOException;
 
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 
 public class Provider {
 
     public static void main(String[] args) {
 
-        SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/Provider.composite");
+        String contribution = ContributionLocationHelper.getContributionLocation(Provider.class);
+        Node node = NodeFactory.newInstance().createNode(
+                                                     "org/apache/tuscany/sca/binding/gdata/Provider.composite", new Contribution("provider", contribution));
+        node.start();
         System.out.println("Provider.composite ready...");
 
         try {
@@ -36,6 +42,7 @@
             e.printStackTrace();
         }
 
-        scaDomain.close();
+        node.stop();
+        node.destroy();
     }
 }

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/StartLocalhostServlet.java Wed Oct  8 23:33:54 2008
@@ -21,13 +21,19 @@
 
 import java.io.IOException;
 
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 
 public class StartLocalhostServlet {
 
     public static void main(String[] args) {
 
-        SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/Provider.composite");
+        String contribution = ContributionLocationHelper.getContributionLocation(Provider.class);
+        Node node = NodeFactory.newInstance().createNode(
+                                                     "org/apache/tuscany/sca/binding/gdata/Provider.composite", new Contribution("provider", contribution));
+        node.start();
         System.out.println("Provider.composite ready...");
 
         try {
@@ -36,6 +42,7 @@
             e.printStackTrace();
         }
 
-        scaDomain.close();
+        node.stop();
+        node.destroy();
     }
 }

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml Wed Oct  8 23:33:54 2008
@@ -106,11 +106,11 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-		
+
         <dependency>
             <groupId>com.google.gdata</groupId>
             <artifactId>gdata-core</artifactId>

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumer.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumer.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumer.java Wed Oct  8 23:33:54 2008
@@ -18,6 +18,11 @@
  */
 package org.apache.tuscany.sca.binding.gdata.calendarconsumer;
 
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+
 import com.google.gdata.data.BaseEntry;
 import com.google.gdata.data.DateTime;
 import com.google.gdata.data.Entry;
@@ -26,18 +31,20 @@
 import com.google.gdata.data.PlainTextConstruct;
 import com.google.gdata.data.extensions.EventEntry;
 import com.google.gdata.data.extensions.When;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
 
 public class CalendarConsumer {
 
     public static void main(String... args) throws Exception {
 
-        SCADomain scaDomain;
+        Node node;
         CalendarConsumerImpl resourceCollection;
 
         //init
-        scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/CalendarConsumer.composite");
-        resourceCollection = scaDomain.getService(CalendarConsumerImpl.class, "CalendarConsumer");
+        String contribution = ContributionLocationHelper.getContributionLocation(CalendarConsumer.class);
+        node = NodeFactory.newInstance().createNode(
+                                                     "org/apache/tuscany/sca/binding/gdata/CalendarConsumer.composite", new Contribution("consumer", contribution));
+        node.start();
+        resourceCollection = node.getService(CalendarConsumerImpl.class, "CalendarConsumer");
 
         //test methods
         System.out.println(
@@ -115,7 +122,8 @@
         }
 
         //close
-        scaDomain.close();
+        node.stop();
+        node.destroy();
 
     }
 }

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java Wed Oct  8 23:33:54 2008
@@ -18,6 +18,20 @@
  */
 package org.apache.tuscany.sca.binding.gdata.calendarconsumer;
 
+import static org.junit.Assert.assertNotNull;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.tuscany.sca.data.collection.NotFoundException;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 import com.google.gdata.data.BaseEntry;
 import com.google.gdata.data.DateTime;
 import com.google.gdata.data.Feed;
@@ -25,20 +39,11 @@
 import com.google.gdata.data.PlainTextConstruct;
 import com.google.gdata.data.extensions.EventEntry;
 import com.google.gdata.data.extensions.When;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.data.collection.NotFoundException;
-
-import org.junit.Test;
-import org.junit.BeforeClass;
-import org.junit.AfterClass;
-import static org.junit.Assert.assertNotNull;
 
 //FIX-ME: the tests are executed in an incorrect order
 public class CalendarConsumerTest {
 
-    private static SCADomain scaDomain;
+    private static Node node;
     private Feed feed;
     private BaseEntry returnedEntry;
     private BaseEntry searchedEntry;
@@ -47,13 +52,17 @@
 
     @BeforeClass
     public static void init() {
-        scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/CalendarConsumer.composite");
-        consumer = scaDomain.getService(CalendarConsumerImpl.class, "CalendarConsumer");
+        String contribution = ContributionLocationHelper.getContributionLocation(CalendarConsumer.class);
+        node = NodeFactory.newInstance().createNode(
+                                                     "org/apache/tuscany/sca/binding/gdata/CalendarConsumer.composite", new Contribution("consumer", contribution));
+        node.start();
+        consumer = node.getService(CalendarConsumerImpl.class, "CalendarConsumer");
     }
 
     @AfterClass
     public static void close() {
-        scaDomain.close();
+        node.stop();
+        node.destroy();
     }
 
     @Test

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/Consumer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/Consumer.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/Consumer.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/Consumer.java Wed Oct  8 23:33:54 2008
@@ -19,18 +19,24 @@
 
 package org.apache.tuscany.sca.binding.gdata.consumerprovider;
 
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 
 public class Consumer {
 
     public static void main(String[] args) throws Exception {
 
-            SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/Consumer.composite");
+        String contribution = ContributionLocationHelper.getContributionLocation(Consumer.class);
+        Node node = NodeFactory.newInstance().createNode(
+                                                         "org/apache/tuscany/sca/binding/gdata/Consumer.composite", new Contribution("consumer", contribution));
+        node.start();
+        CustomerClient testService = node.getService(CustomerClient.class, "CustomerClient");
 
-            CustomerClient testService = scaDomain.getService(CustomerClient.class, "CustomerClient");
+        testService.testCustomerCollection();
 
-            testService.testCustomerCollection();
-
-            scaDomain.close();
+        node.stop();
+        node.destroy();
     }
 }

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/Provider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/Provider.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/Provider.java (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/Provider.java Wed Oct  8 23:33:54 2008
@@ -18,17 +18,23 @@
  */
 package org.apache.tuscany.sca.binding.gdata.consumerprovider;
 
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 
 public class Provider {
 
     public static void main(String[] args) throws Exception {
 
-        SCADomain scaDomain = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/Provider.composite");
-
+        String contribution = ContributionLocationHelper.getContributionLocation(Provider.class);
+        Node node = NodeFactory.newInstance().createNode(
+                                                     "org/apache/tuscany/sca/binding/gdata/Provider.composite", new Contribution("provider", contribution));
+        node.start();
         System.out.println("Ready for consultings...");
         System.in.read();
 
-        scaDomain.close();
+        node.stop();
+        node.destroy();
     }
 }

Modified: tuscany/branches/sca-equinox/modules/binding-http-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-http-runtime/pom.xml?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-http-runtime/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-http-runtime/pom.xml Wed Oct  8 23:33:54 2008
@@ -56,7 +56,7 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
+            <artifactId>tuscany-node-impl</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>