renamed Context life cycle management method as "register"

ceharris · ceharris · commit fe7fc952484e · 2013-04-23T11:45:55.000-04:00
diff --git a/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java b/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java
@@ -305,8 +305,8 @@ public Object getConfigurationLock() {
     return configurationLock;
   }
 
-  public void addLifeCycleComponent(LifeCycle component) {
-    lifeCycleManager.addComponent(component);
+  public void register(LifeCycle component) {
+    lifeCycleManager.register(component);
   }
 
   // ====== Methods from catalina Lifecycle =====
diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ReceiverAction.java b/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ReceiverAction.java
@@ -66,7 +66,8 @@ public void end(InterpretationContext ic, String name)
     
     if (inError) return;
     
-    ic.getContext().addLifeCycleComponent(receiver);
+    ic.getContext().register(receiver);
+    receiver.start();
     
     Object o = ic.peekObject();
     if (o != receiver) {
diff --git a/logback-core/src/main/java/ch/qos/logback/core/Context.java b/logback-core/src/main/java/ch/qos/logback/core/Context.java
@@ -116,13 +116,13 @@ public interface Context extends PropertyContainer {
   ExecutorService getExecutorService();
   
   /**
-   * Adds a component that participates in the context's life cycle.
+   * Register a component that participates in the context's life cycle.
    * <p>
-   * A component that is passed to this method, will be started if necessary,
-   * and will be stopped when the context is reset.
+   * All components registered via this method will be stopped and removed
+   * from the context when the context is reset.
    * 
-   * @param component the subject componet
+   * @param component the subject component
    */
-  void addLifeCycleComponent(LifeCycle component);
+  void register(LifeCycle component);
   
 }
diff --git a/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java b/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java
@@ -153,8 +153,8 @@ public ExecutorService getExecutorService() {
     return  executorService;
   }
 
-  public void addLifeCycleComponent(LifeCycle component) {
-    getLifeCycleManager().addComponent(component);
+  public void register(LifeCycle component) {
+    getLifeCycleManager().register(component);
   }
 
   protected synchronized LifeCycleManager getLifeCycleManager() {
diff --git a/logback-core/src/main/java/ch/qos/logback/core/LifeCycleManager.java b/logback-core/src/main/java/ch/qos/logback/core/LifeCycleManager.java
@@ -22,7 +22,7 @@
 /**
  * An object that manages a collection of components that implement the
  * {@link LifeCycle} interface.  Each component that is added to the manager
- * is started if necessary, and is stopped when the manager is reset.
+ * will be stopped and removed from the manager when the manager is reset.
  *
  * @author Carl Harris
  */
@@ -31,12 +31,11 @@ public class LifeCycleManager {
   private final Set<LifeCycle> components = new HashSet<LifeCycle>();
   
   /**
-   * Adds a component to this manager.  
+   * Registers a component with this manager.  
    * <p>
-   * The component is started if necessary. 
    * @param component the component whose life cycle is to be managed
    */
-  public void addComponent(LifeCycle component) {
+  public void register(LifeCycle component) {
     if (!component.isStarted()) {
       component.start();
     }
diff --git a/logback-core/src/test/java/ch/qos/logback/core/ContextBaseTest.java b/logback-core/src/test/java/ch/qos/logback/core/ContextBaseTest.java
@@ -62,7 +62,7 @@ public void resetTest() {
     assertEquals("valA", context.getProperty("keyA"));
     assertEquals("valA", context.getObject("keyA"));
     MockLifeCycleComponent component = new MockLifeCycleComponent();
-    context.addLifeCycleComponent(component);
+    context.register(component);
     assertSame(component, lifeCycleManager.getLastComponent());
     context.reset();
     assertNull(context.getProperty("keyA"));
@@ -102,9 +102,9 @@ private static class InstrumentedLifeCycleManager extends LifeCycleManager {
     private boolean reset;
     
     @Override
-    public void addComponent(LifeCycle component) {
+    public void register(LifeCycle component) {
       lastComponent = component;
-      super.addComponent(component);
+      super.register(component);
     }
     
     @Override
diff --git a/logback-core/src/test/java/ch/qos/logback/core/LifeCycleManagerTest.java b/logback-core/src/test/java/ch/qos/logback/core/LifeCycleManagerTest.java
@@ -30,9 +30,9 @@ public class LifeCycleManagerTest {
   private LifeCycleManager manager = new LifeCycleManager();
   
   @Test
-  public void testAddComponentAndReset() {
+  public void testRegisterAndReset() {
     MockLifeCycleComponent component = new MockLifeCycleComponent();
-    manager.addComponent(component);
+    manager.register(component);
     assertTrue(component.isStarted());
     manager.reset();
     assertFalse(component.isStarted());

Original file line number	Diff line number	Diff line change
`@@ -305,8 +305,8 @@ public Object getConfigurationLock() {`
`305`	`305`	`return configurationLock;`
`306`	`306`	`}`
`307`	`307`
`308`		`- public void addLifeCycleComponent(LifeCycle component) {`
`309`		`- lifeCycleManager.addComponent(component);`
	`308`	`+ public void register(LifeCycle component) {`
	`309`	`+ lifeCycleManager.register(component);`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`// ====== Methods from catalina Lifecycle =====`
Original file line number	Diff line number	Diff line change
`@@ -153,8 +153,8 @@ public ExecutorService getExecutorService() {`
`153`	`153`	`return executorService;`
`154`	`154`	`}`
`155`	`155`
`156`		`- public void addLifeCycleComponent(LifeCycle component) {`
`157`		`- getLifeCycleManager().addComponent(component);`
	`156`	`+ public void register(LifeCycle component) {`
	`157`	`+ getLifeCycleManager().register(component);`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`protected synchronized LifeCycleManager getLifeCycleManager() {`