From efe3363a815a777ecd283928900404dea84a7e1f Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Thu, 9 Oct 2008 06:33:54 +0000 Subject: 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 --- .../LateReferenceResolutionTestCase.java | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator') diff --git a/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java b/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java index ebe834028d..74e01259e2 100644 --- a/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java +++ b/branches/sca-equinox/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java @@ -23,10 +23,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.apache.tuscany.sca.node.launcher.DomainManagerLauncher; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -38,9 +38,9 @@ import org.junit.Test; */ public class LateReferenceResolutionTestCase { - private static SCANode nodeA; - private static SCANode nodeB; - private static SCANode nodeC; + private static Node nodeA; + private static Node nodeB; + private static Node nodeC; private static CalculatorService calculatorService; @@ -53,22 +53,22 @@ public class LateReferenceResolutionTestCase { System.out.println("Setting up domain"); - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - nodeC = nodeFactory.createSCANode(new File("src/main/resources/nodeC/Calculator.composite").toURL().toString(), - new SCAContribution("NodeC", + NodeFactory nodeFactory = NodeFactory.newInstance(); + nodeC = nodeFactory.createNode(new File("src/main/resources/nodeC/Calculator.composite").toURL().toString(), + new Contribution("NodeC", new File("src/main/resources/nodeC").toURL().toString())); - nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/Calculator.composite").toURL().toString(), - new SCAContribution("NodeB", + nodeB = nodeFactory.createNode(new File("src/main/resources/nodeB/Calculator.composite").toURL().toString(), + new Contribution("NodeB", new File("src/main/resources/nodeB").toURL().toString())); - nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/Calculator.composite").toURL().toString(), - new SCAContribution("NodeA", + nodeA = nodeFactory.createNode(new File("src/main/resources/nodeA/Calculator.composite").toURL().toString(), + new Contribution("NodeA", new File("src/main/resources/nodeA").toURL().toString())); nodeC.start(); nodeB.start(); nodeA.start(); - SCAClient client = (SCAClient)nodeA; + Client client = (Client)nodeA; calculatorService = client.getService(CalculatorService.class, "CalculatorServiceComponentA"); -- cgit v1.2.3