donaldp 2002/11/07 18:30:46
Modified: fortress/src/java/org/apache/excalibur/fortress
ContainerManager.java
fortress/src/test/org/apache/excalibur/fortress/test
ContainerProfile.java
Log:
Update ContainerManager interface and docs so that the work interface does not
implement Initializable/Disposable but the implementation does.
Revision Changes Path
1.44 +4 -7
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/ContainerManager.java
Index: ContainerManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/ContainerManager.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ContainerManager.java 8 Nov 2002 01:58:31 -0000 1.43
+++ ContainerManager.java 8 Nov 2002 02:30:46 -0000 1.44
@@ -49,8 +49,6 @@
*/
package org.apache.excalibur.fortress;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.Logger;
/**
@@ -69,7 +67,7 @@
* contextBuilder.setLoggerManagerConfiguration(
"resource://org.apache.excalibur.fortress/test/ContainerProfile.xlog" );
*
* ContainerManager cm = new DefaultContainerManager(
contextBuilder.getContext() );
- * cm.initialize();
+ * ContainerUtil.initialize( cm );
* </code>
* </pre>
*
@@ -86,8 +84,8 @@
*
* <pre>
* <code>
- * containerManager.dispose();
- * contextManager.dispose();
+ * ContainerUtil.dispose( containerManager );
+ * ContainerUtil.dispose( contextManager );
* </code>
* </pre>
*
@@ -95,7 +93,6 @@
* @version CVS $Revision$ $Date$
*/
public interface ContainerManager
- extends Disposable, Initializable
{
/**
* Get a reference to your Container. Typically, you would cast this to
1.30 +5 -4
jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.java
Index: ContainerProfile.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ContainerProfile.java 8 Nov 2002 01:58:31 -0000 1.29
+++ ContainerProfile.java 8 Nov 2002 02:30:46 -0000 1.30
@@ -67,6 +67,7 @@
import org.apache.avalon.framework.logger.NullLogger;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.WrapperServiceManager;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.excalibur.fortress.ContainerManager;
import org.apache.excalibur.fortress.DefaultContainerManager;
import org.apache.excalibur.fortress.container.DefaultContainer;
@@ -144,7 +145,7 @@
.setRoleManagerConfiguration(
"resource://org/apache/excalibur/fortress/test/ContainerProfile.roles" );
final ContainerManager cm = new DefaultContainerManager(
contextBuilder.getContext(), new NullLogger() );
- cm.initialize();
+ ContainerUtil.initialize( cm );
DefaultContainer container = (DefaultContainer)cm.getContainer();
assertNotNull( container );
long cmStop = System.currentTimeMillis();
@@ -171,14 +172,14 @@
resetMemory();
ecmStart = System.currentTimeMillis();
- manager.dispose();
+ ContainerUtil.dispose( manager );
ecmStop = System.currentTimeMillis();
ecmDuration = ecmStop - ecmStart;
resetMemory();
cmStart = System.currentTimeMillis();
- cm.dispose();
+ ContainerUtil.dispose( cm );
cmStop = System.currentTimeMillis();
cmDuration = cmStop - cmStart;
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
