diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-04 21:09:28 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-12-04 21:09:28 +0000 |
| commit | bc1c8ab4c48c3a81824dac27ba71a8d1277797b9 (patch) | |
| tree | 23c988da3cf03f70f49413ed753a439e5e6f0f80 /java/sca/itest/callablereferences | |
| parent | 84f0a5f2ace3b19ff61928d32ab5674ff0daf462 (diff) | |
Merge itest changes from sca-equinox branch into trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723439 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/itest/callablereferences')
| -rw-r--r-- | java/sca/itest/callablereferences/pom.xml | 2 | ||||
| -rw-r--r-- | java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/java/sca/itest/callablereferences/pom.xml b/java/sca/itest/callablereferences/pom.xml index 51560bab07..ae12f41535 100644 --- a/java/sca/itest/callablereferences/pom.xml +++ b/java/sca/itest/callablereferences/pom.xml @@ -58,7 +58,7 @@ --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> + <artifactId>tuscany-host-jetty</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> </dependency> diff --git a/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java index ba9020811c..927e91a8bc 100644 --- a/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java +++ b/java/sca/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());
|