[CVS nano] Lifecycle package is gone!!!

Commit in nano/src on MAIN

java/org/nanocontainer/CommonsLoggingNanoContainerMonitor.java +3 -4 1.1 -> 1.2

/ConsoleNanoContainerMonitor.java +3 -4 1.2 -> 1.3

/Log4JNanoContainerMonitor.java +3 -4 1.1 -> 1.2

/NanoContainerMonitor.java +2 -3 1.3 -> 1.4

/NullNanoContainerMonitor.java +2 -3 1.2 -> 1.3

test/org/nanocontainer/MockMonitor.java +2 -3 1.3 -> 1.4

+15 -21

6 modified files

Lifecycle package is gone!!!

----------

nano /src /java /org /nanocontainer

CommonsLoggingNanoContainerMonitor.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- CommonsLoggingNanoContainerMonitor.java 4 Nov 2003 22:09:48 -0000 1.1
+++ CommonsLoggingNanoContainerMonitor.java 28 Jan 2004 23:22:51 -0000 1.2
@@ -9,14 +9,13 @@

package org.nanocontainer;

-import org.picocontainer.lifecycle.LifecyclePicoAdapter;

import org.picocontainer.PicoContainer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

/**
* @author Paul Hammant

- * @version $Revision: 1.1 $

+ * @version $Revision: 1.2 $

*/
public class CommonsLoggingNanoContainerMonitor implements NanoContainerMonitor {

@@ -26,7 +25,7 @@

log.info("Components Instantiated For Container " + picoContainer);
}

- public void componentsLifecycleEvent(String eventName, LifecyclePicoAdapter lpa) {
- log.info("ComponentEvent '" + eventName + "'" + lpa);

+ public void componentsLifecycleEvent(String eventName, PicoContainer container) {
+ log.info("ComponentEvent '" + eventName + "'" + container);

}
}

----------

nano /src /java /org /nanocontainer

ConsoleNanoContainerMonitor.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- ConsoleNanoContainerMonitor.java 4 Nov 2003 22:09:48 -0000 1.2
+++ ConsoleNanoContainerMonitor.java 28 Jan 2004 23:22:51 -0000 1.3
@@ -9,12 +9,11 @@

package org.nanocontainer;

-import org.picocontainer.lifecycle.LifecyclePicoAdapter;

import org.picocontainer.PicoContainer;

/**
* @author Paul Hammant

- * @version $Revision: 1.2 $

+ * @version $Revision: 1.3 $

*/
public class ConsoleNanoContainerMonitor implements NanoContainerMonitor {

@@ -22,7 +21,7 @@

System.out.println("Components Instantiated For Container " + picoContainer);
}

- public void componentsLifecycleEvent(String eventName, LifecyclePicoAdapter lpa) {
- System.out.println("ComponentEvent '" + eventName + "'" + lpa);

+ public void componentsLifecycleEvent(String eventName, PicoContainer container) {
+ System.out.println("ComponentEvent '" + eventName + "'" + container);

}
}

----------

nano /src /java /org /nanocontainer

Log4JNanoContainerMonitor.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- Log4JNanoContainerMonitor.java 4 Nov 2003 22:09:48 -0000 1.1
+++ Log4JNanoContainerMonitor.java 28 Jan 2004 23:22:51 -0000 1.2
@@ -9,13 +9,12 @@

package org.nanocontainer;

-import org.picocontainer.lifecycle.LifecyclePicoAdapter;

import org.picocontainer.PicoContainer;
import org.apache.log4j.Category;

/**
* @author Paul Hammant

- * @version $Revision: 1.1 $

+ * @version $Revision: 1.2 $

*/
public class Log4JNanoContainerMonitor implements NanoContainerMonitor {

@@ -25,7 +24,7 @@

category.info("Components Instantiated For Container " + picoContainer);
}

- public void componentsLifecycleEvent(String eventName, LifecyclePicoAdapter lpa) {
- category.info("ComponentEvent '" + eventName + "'" + lpa);

+ public void componentsLifecycleEvent(String eventName, PicoContainer container) {
+ category.info("ComponentEvent '" + eventName + "'" + container);

}
}

----------

nano /src /java /org /nanocontainer

NanoContainerMonitor.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- NanoContainerMonitor.java 19 Jan 2004 20:40:24 -0000 1.3
+++ NanoContainerMonitor.java 28 Jan 2004 23:22:51 -0000 1.4
@@ -10,7 +10,6 @@

package org.nanocontainer;

import org.picocontainer.PicoContainer;

-import org.picocontainer.lifecycle.LifecyclePicoAdapter;

// TODO can we deprecate this in favour of some sort of InvocationInterceptor
// that sits closer to the MulticastInvoker? See longer comment inside the Main class.

@@ -18,10 +17,10 @@

/**
* @author Paul Hammant

- * @version $Revision: 1.3 $

+ * @version $Revision: 1.4 $

*/
public interface NanoContainerMonitor {

- void componentsLifecycleEvent(String eventName, LifecyclePicoAdapter lpa);

+ void componentsLifecycleEvent(String eventName, PicoContainer container);

void componentsInstantiated(PicoContainer picoContainer);
}

----------

nano /src /java /org /nanocontainer

NullNanoContainerMonitor.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- NullNanoContainerMonitor.java 4 Nov 2003 22:09:48 -0000 1.2
+++ NullNanoContainerMonitor.java 28 Jan 2004 23:22:51 -0000 1.3
@@ -9,18 +9,17 @@

package org.nanocontainer;

-import org.picocontainer.lifecycle.LifecyclePicoAdapter;

import org.picocontainer.PicoContainer;

/**
* @author Paul Hammant

- * @version $Revision: 1.2 $

+ * @version $Revision: 1.3 $

*/
public class NullNanoContainerMonitor implements NanoContainerMonitor {

public void componentsInstantiated(PicoContainer picoContainer) {
}

- public void componentsLifecycleEvent(String eventName, LifecyclePicoAdapter lpa) {

+ public void componentsLifecycleEvent(String eventName, PicoContainer container) {

}
}

----------

nano /src /test /org /nanocontainer

MockMonitor.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- MockMonitor.java 16 Oct 2003 09:13:55 -0000 1.3
+++ MockMonitor.java 28 Jan 2004 23:22:51 -0000 1.4
@@ -9,7 +9,6 @@

package org.nanocontainer;

import org.picocontainer.PicoContainer;

-import org.picocontainer.lifecycle.LifecyclePicoAdapter;

import java.util.ArrayList;

@@ -23,8 +22,8 @@

return name.substring(name.indexOf('$')+1,name.length());
}

- public void componentsLifecycleEvent(String eventName, LifecyclePicoAdapter lpa) {
- monitorRecorder += ("+" + code(lpa.getPicoContainer().getComponentInstances().get(0)) + "_" + eventName);

+ public void componentsLifecycleEvent(String eventName, PicoContainer container) {
+ monitorRecorder += ("+" + code(container.getComponentInstances().get(0)) + "_" + eventName);

}

public void componentsInstantiated(PicoContainer picoContainer) {