diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules')
3 files changed, 27 insertions, 8 deletions
diff --git a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java index 95d1adc92e..86045b014e 100644 --- a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java +++ b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java @@ -627,4 +627,7 @@ public abstract class NodeFactory extends DefaultNodeConfigurationFactory { public abstract <T> T getExtensionPointRegistry(); public abstract void init(); + + public void setAutoDestroy(boolean b) { + } } diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java index 63c5254873..4b8c071855 100644 --- a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java +++ b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java @@ -44,13 +44,7 @@ import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.ComponentReference; -import org.apache.tuscany.sca.assembly.ComponentService; import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.EndpointReference; -import org.apache.tuscany.sca.assembly.Implementation; import org.apache.tuscany.sca.common.java.io.IOHelper; import org.apache.tuscany.sca.contribution.Artifact; import org.apache.tuscany.sca.contribution.Contribution; @@ -80,8 +74,6 @@ import org.apache.tuscany.sca.node.configuration.DeploymentComposite; import org.apache.tuscany.sca.node.configuration.NodeConfiguration; import org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory; import org.apache.tuscany.sca.runtime.DomainRegistryFactory; -import org.apache.tuscany.sca.runtime.EndpointReferenceBinder; -import org.apache.tuscany.sca.runtime.EndpointRegistry; import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory; import org.apache.tuscany.sca.runtime.RuntimeProperties; import org.apache.tuscany.sca.work.WorkScheduler; @@ -477,5 +469,10 @@ public class NodeFactoryImpl extends NodeFactory { public Deployer getDeployer() { return deployer; } + + @Override + public void setAutoDestroy(boolean b) { + autoDestroy = b; + } } diff --git a/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java index 3133931210..644b0e662b 100644 --- a/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java +++ b/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java @@ -215,4 +215,23 @@ public class NodeImplTestCase { System.out.println(attrs); } } + + @Test + public void testAutoDestroy() throws Exception { + NodeFactory nf = NodeFactory.newInstance(); + Node node = nf.createNode(); + node.start(); + Assert.assertTrue(((NodeFactoryImpl)nf).inited); + node.stop(); + Assert.assertFalse(((NodeFactoryImpl)nf).inited); + + nf = NodeFactory.newInstance(); + nf.setAutoDestroy(false); + node = nf.createNode(); + node.start(); + Assert.assertTrue(((NodeFactoryImpl)nf).inited); + node.stop(); + Assert.assertTrue(((NodeFactoryImpl)nf).inited); + + } } |