diff options
Diffstat (limited to '')
2 files changed, 14 insertions, 7 deletions
diff --git a/branches/sca-equinox/modules/implementation-spring/pom.xml b/branches/sca-equinox/modules/implementation-spring/pom.xml index 284244c761..4b2b516eea 100644 --- a/branches/sca-equinox/modules/implementation-spring/pom.xml +++ b/branches/sca-equinox/modules/implementation-spring/pom.xml @@ -79,10 +79,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> - + <!-- Spring dependencies... --> <dependency> <groupId>org.springframework</groupId> diff --git a/branches/sca-equinox/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java b/branches/sca-equinox/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java index 6b2d114756..d782384ce6 100644 --- a/branches/sca-equinox/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java +++ b/branches/sca-equinox/modules/implementation-spring/src/test/java/org/apache/tuscany/sca/implementation/spring/itests/AbstractSCATestCase.java @@ -21,7 +21,10 @@ package org.apache.tuscany.sca.implementation.spring.itests; 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; /** * @@ -29,20 +32,23 @@ import org.apache.tuscany.sca.host.embedded.SCADomain; */ public abstract class AbstractSCATestCase<T> extends TestCase { - protected SCADomain domain; + protected Node node; protected T service; @Override protected void setUp() throws Exception { - domain = SCADomain.newInstance(getCompositeName()); - service = (T)domain.getService(getServiceClass(), "ClientComponent"); + String contribution = ContributionLocationHelper.getContributionLocation(getClass()); + node = NodeFactory.newInstance().createNode(getCompositeName(), new Contribution("test", contribution)); + node.start(); + service = (T)node.getService(getServiceClass(), "ClientComponent"); } protected abstract Class getServiceClass(); @Override protected void tearDown() throws Exception { - domain.close(); + node.stop(); + node.destroy(); } protected String getCompositeName() { |