(no commit message)

diff --git a/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java b/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java
index b202f285412040a8a42b13bc9aba4a3684f26636..01eff741ac362aa13e6b0d3280c9ae9975b001d6 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java
+++ b/system/general/src/main/java/org/wamblee/system/core/AbstractComponent.java
@@ -31,7 +31,6 @@ public abstract class AbstractComponent implements Component {
 
        private static final Log LOG = LogFactory.getLog(AbstractComponent.class);
 
-       private Status _status;
        private String _context; 
        private String _name; 
        private List<ProvidedInterface> _provided;
@@ -50,7 +49,6 @@ public abstract class AbstractComponent implements Component {
         */
        protected AbstractComponent(String aName, ProvidedInterface[] aProvided,
                        RequiredInterface[] aRequired) {
-               _status = Status.NOT_STARTED;
                _context = null; 
                _name = aName;
                _provided = new ArrayList<ProvidedInterface>();
@@ -59,11 +57,6 @@ public abstract class AbstractComponent implements Component {
                _required.addAll(Arrays.asList(aRequired));
                _running = new HashSet<ProvidedInterface>();
        }
-       
-       @Override
-       public Status getStatus() {
-               return _status; 
-       }
 
        @Override
        public final String getName() {
@@ -102,7 +95,6 @@ public abstract class AbstractComponent implements Component {
        public final void start() {
                LOG.info("Initializing '" + getQualifiedName() + "'");
                doStart();
-               _status = Status.RUNNING;
                if ( _running.size() != _provided.size()) { 
                        List<ProvidedInterface> remaining = 
                                new ArrayList<ProvidedInterface>(_provided);
@@ -143,7 +135,6 @@ public abstract class AbstractComponent implements Component {
                        // programming error.
                        throw new RuntimeException(getQualifiedName() + ": still services running after the stop call.");
                }
-               _status = Status.STOPPED;
        }
        
        protected abstract void doStop();

diff --git a/system/general/src/main/java/org/wamblee/system/core/Component.java b/system/general/src/main/java/org/wamblee/system/core/Component.java
index b36fe56b221163c91d31f22ccf715bf71d9fd27c..ff80ee693acdcba8f70443cf4bb704ba4821a2d5 100644 (file)
--- a/system/general/src/main/java/org/wamblee/system/core/Component.java
+++ b/system/general/src/main/java/org/wamblee/system/core/Component.java
@@ -23,16 +23,6 @@ package org.wamblee.system.core;
  */
 public interface Component {
        
-       enum Status { 
-               NOT_STARTED, RUNNING, STOPPED
-       }
-       
-       /**
-        * Gets the status of the component. 
-        * @return Status. 
-        */
-       Status getStatus();
-       
        /**
         * Gets the name of the subsystem.
         * @return Subsystem name. 

diff --git a/system/general/src/test/java/org/wamblee/system/core/ContainerTest.java b/system/general/src/test/java/org/wamblee/system/core/ContainerTest.java
index ee5b4e50b8112d14600d698ec6c56056625d81ea..bcca8cc11bb823c37f01232e81dc78dc2767c76f 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/core/ContainerTest.java
+++ b/system/general/src/test/java/org/wamblee/system/core/ContainerTest.java
@@ -16,25 +16,16 @@
 package org.wamblee.system.core;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Arrays;
 
+import junit.framework.TestCase;
+
 import org.easymock.classextension.ConstructorArgs;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
-import org.wamblee.system.core.Component;
-import org.wamblee.system.core.Container;
-import org.wamblee.system.core.DefaultProvidedInterface;
-import org.wamblee.system.core.DefaultRequiredInterface;
-import org.wamblee.system.core.ProvidedInterface;
-import org.wamblee.system.core.RequiredInterface;
-import org.wamblee.system.core.SystemAssemblyException;
-import org.wamblee.system.core.Component.Status;
 import org.wamblee.test.AssertionUtils;
 import org.wamblee.test.EventTracker;
 
-import junit.framework.TestCase;
-
 public class ContainerTest extends TestCase {
 
        private EventTracker<String> _tracker;
@@ -125,21 +116,15 @@ public class ContainerTest extends TestCase {
                Component environment = new Environment(_tracker);
                Component application = new Application(_tracker);
                assertEquals(0, _tracker.getEventCount());
-               assertEquals(Status.NOT_STARTED, environment.getStatus());
-               assertEquals(Status.NOT_STARTED, application.getStatus());
 
                Container system = new Container("all", new Component[] { environment,
                                application }, new ProvidedInterface[0],
                                new RequiredInterface[0]);
-               assertEquals(Status.NOT_STARTED, system.getStatus());
                system.start();
                RequiredInterface[] required = system.getRequiredInterfaces();
                assertEquals(0, required.length);
                ProvidedInterface[] provided = system.getProvidedInterfaces();
                assertEquals(0, provided.length);
-               assertEquals(Status.RUNNING, environment.getStatus());
-               assertEquals(Status.RUNNING, application.getStatus());
-               assertEquals(Status.RUNNING, system.getStatus());
 
                AssertionUtils.assertEquals(new String[] { "start.environment",
                                "start.application" }, _tracker.getEvents(
@@ -147,10 +132,6 @@ public class ContainerTest extends TestCase {
                _tracker.clear();
 
                system.stop();
-               assertEquals(Status.STOPPED, environment.getStatus());
-               assertEquals(Status.STOPPED, application.getStatus());
-               assertEquals(Status.STOPPED, system.getStatus());
-
                AssertionUtils.assertEquals(new String[] { "stop.application",
                                "stop.environment" }, _tracker
                                .getEvents(Thread.currentThread()).toArray(new String[0]));