svn commit: r1058187 - in /tuscany/sca-java-2.x/trunk/modules: node-api/src/main/java/org/apache/tuscany/sca/node/ node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ node-impl/src/test/java/org/apache/tuscany/sca/node/impl/

[an...@apache.org]

Author: antelder
Date: Wed Jan 12 15:25:37 2011
New Revision: 1058187

URL: http://svn.apache.org/viewvc?rev=1058187&view=rev
Log:
Add setAutoDestroy methdod

Modified:
    tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
    tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
    tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java

Modified: tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java?rev=1058187&r1=1058186&r2=1058187&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java Wed Jan 12 15:25:37 2011
@@ -627,4 +627,7 @@ public abstract class NodeFactory extend
     public abstract <T> T getExtensionPointRegistry();
 
     public abstract void init();
+
+    public void setAutoDestroy(boolean b) {
+    }
 }

Modified: tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java?rev=1058187&r1=1058186&r2=1058187&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java Wed Jan 12 15:25:37 2011
@@ -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.confi
 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 Nod
     public Deployer getDeployer() {
         return deployer;
     }
+
+    @Override
+    public void setAutoDestroy(boolean b) {
+        autoDestroy = b;
+    }
     
 }

Modified: tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java?rev=1058187&r1=1058186&r2=1058187&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java Wed Jan 12 15:25:37 2011
@@ -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);
+        
+    }
 }