svn commit: r692615 - in /tuscany/java/sca/modules/implementation-node-runtime: ./ src/main/java/org/apache/tuscany/sca/implementation/node/launcher/ src/test/java/org/apache/tuscany/sca/implementation/node/

[rfeng]

Author: rfeng
Date: Fri Sep  5 23:08:56 2008
New Revision: 692615

URL: http://svn.apache.org/viewvc?rev=692615&view=rev
Log:
Port from SCADomain to SCANode

Modified:
    tuscany/java/sca/modules/implementation-node-runtime/pom.xml
    
tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
    
tuscany/java/sca/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java

Modified: tuscany/java/sca/modules/implementation-node-runtime/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-node-runtime/pom.xml?rev=692615&r1=692614&r2=692615&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-node-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-node-runtime/pom.xml Fri Sep  5 
23:08:56 2008
@@ -62,12 +62,6 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
             <version>1.4-SNAPSHOT</version>
             <scope>runtime</scope>

Modified: 
tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java?rev=692615&r1=692614&r2=692615&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
 (original)
+++ 
tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
 Fri Sep  5 23:08:56 2008
@@ -19,8 +19,8 @@
 
 package org.apache.tuscany.sca.implementation.node.launcher;
 
-import org.apache.tuscany.sca.host.embedded.SCADomain;
 import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
 
 /**
  * Bootstrap class for the SCA node daemon.
@@ -36,7 +36,7 @@
     public static class NodeFacade implements SCANode {
         private ClassLoader threadContextClassLoader;
         private ClassLoader runtimeClassLoader;
-        private SCADomain daemon;
+        private SCANode daemon;
         
         private NodeFacade() {
             runtimeClassLoader = 
Thread.currentThread().getContextClassLoader();
@@ -47,7 +47,8 @@
             boolean started = false;
             try {
                 
Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                daemon = SCADomain.newInstance("NodeDaemon.composite");
+                SCANodeFactory factory = SCANodeFactory.newInstance();
+                daemon = 
factory.createSCANodeFromClassLoader("NodeDaemon.composite", 
threadContextClassLoader);
                 started = true;
             } finally {
                 if (!started) {
@@ -59,7 +60,7 @@
         public void stop() {
             try {
                 
Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                daemon.close();
+                daemon.stop();
             } finally {
                 
Thread.currentThread().setContextClassLoader(threadContextClassLoader);
             }

Modified: 
tuscany/java/sca/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java?rev=692615&r1=692614&r2=692615&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
 (original)
+++ 
tuscany/java/sca/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
 Fri Sep  5 23:08:56 2008
@@ -20,7 +20,8 @@
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
 
 /**
  * Test case for node component implementations.
@@ -29,16 +30,16 @@
  */
 public class NodeImplementationTestCase extends TestCase {
 
-    private SCADomain scaDomain;
+    private SCANode node;
     
     @Override
     protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("TestNode.composite");
+        node = 
SCANodeFactory.newInstance().createSCANodeFromClassLoader("TestNode.composite", 
null);
     }
 
     @Override
     protected void tearDown() throws Exception {
-        scaDomain.close();
+        node.stop();
     }
     
     public void testNode() {