diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-10-09 06:33:54 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-10-09 06:33:54 +0000 |
commit | efe3363a815a777ecd283928900404dea84a7e1f (patch) | |
tree | 42522fd01e6af981f8ff94663d911d56744154d5 /branches/sca-equinox/itest/callablereferences/src | |
parent | aacabe1650e380595a8d701123394d791656d17d (diff) |
Work in progress. Fixed implementation of NodeImpl, now working without dependencies on implementations from other bundles (except RuntimeAssemblyFactory, which will need to be cleaned up too). Started to remove dependencies on host-embedded and port code to NodeFactory and Node, as an interim step to bring them up, before porting them to the OSGi-enabled node launcher.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@703068 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-equinox/itest/callablereferences/src')
-rw-r--r-- | branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java index ba9020811c..927e91a8bc 100644 --- a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java +++ b/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java @@ -25,10 +25,10 @@ import java.io.File; import junit.framework.Assert;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+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;
@@ -40,8 +40,8 @@ import org.junit.Test; */
public class CallableReferenceRemoteTestCase {
- private static SCANode nodeA;
- private static SCANode nodeB;
+ private static Node nodeA;
+ private static Node nodeB;
private static AComponent acomponent;
@@ -52,21 +52,21 @@ public class CallableReferenceRemoteTestCase { System.out.println("Setting up nodes");
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(),
- new SCAContribution("TestContribution",
+ NodeFactory nodeFactory = NodeFactory.newInstance();
+ nodeA = nodeFactory.createNode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(),
+ new Contribution("TestContribution",
new File("src/main/resources/nodeA").toURL().toString()));
- nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/CompositeB.composite").toURL().toString(),
- new SCAContribution("TestContribution",
+ nodeB = nodeFactory.createNode(new File("src/main/resources/nodeB/CompositeB.composite").toURL().toString(),
+ new Contribution("TestContribution",
new File("src/main/resources/nodeB").toURL().toString()));
nodeA.start();
nodeB.start();
- acomponent = ((SCAClient)nodeA).getService(AComponent.class, "AComponent/AComponent");
+ acomponent = ((Client)nodeA).getService(AComponent.class, "AComponent/AComponent");
} catch (Throwable ex) {
System.out.println(ex.toString());
|