mcconnell 2002/11/24 08:45:19
Modified: fortress/src/java/org/apache/excalibur/fortress
DefaultContainerManager.java
fortress/src/java/org/apache/excalibur/fortress/container
AbstractContainer.java
fortress/src/java/org/apache/excalibur/fortress/handler
ComponentFactory.java LEAwareComponentHandler.java
fortress/src/ng/org/apache/excalibur/fortress/container
MetaDataContainer.java
Log:
Updated Fortress to locate container specific implememtation content within
the Foress project.
Revision Changes Path
1.38 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/DefaultContainerManager.java
Index: DefaultContainerManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/DefaultContainerManager.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- DefaultContainerManager.java 10 Nov 2002 12:00:17 -0000 1.37
+++ DefaultContainerManager.java 24 Nov 2002 16:45:19 -0000 1.38
@@ -62,8 +62,8 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.DefaultServiceManager;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.excalibur.container.lifecycle.LifecycleExtensionManager;
import org.apache.excalibur.event.Queue;
+import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
import org.apache.excalibur.fortress.role.RoleManager;
import org.apache.excalibur.fortress.util.ContextManager;
import org.apache.excalibur.instrument.InstrumentManager;
1.21 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/AbstractContainer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AbstractContainer.java 12 Nov 2002 04:05:08 -0000 1.20
+++ AbstractContainer.java 24 Nov 2002 16:45:19 -0000 1.21
@@ -68,7 +68,6 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.commons.collections.BoundedFifoBuffer;
import org.apache.commons.collections.StaticBucketMap;
-import org.apache.excalibur.container.lifecycle.LifecycleExtensionManager;
import org.apache.excalibur.event.Queue;
import org.apache.excalibur.fortress.Container;
import
org.apache.excalibur.fortress.container.commands.PrepareHandlerCommand;
@@ -76,6 +75,7 @@
import org.apache.excalibur.fortress.handler.ComponentHandler;
import org.apache.excalibur.fortress.handler.LEAwareComponentHandler;
import org.apache.excalibur.fortress.handler.ProxyObjectFactory;
+import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
import org.apache.excalibur.fortress.lookup.FortressServiceManager;
import org.apache.excalibur.fortress.lookup.FortressServiceSelector;
import org.apache.excalibur.fortress.role.ExcaliburRoleManager;
1.38 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java
Index: ComponentFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ComponentFactory.java 11 Nov 2002 07:02:22 -0000 1.37
+++ ComponentFactory.java 24 Nov 2002 16:45:19 -0000 1.38
@@ -63,7 +63,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.excalibur.container.lifecycle.LifecycleExtensionManager;
+import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
import org.apache.excalibur.instrument.CounterInstrument;
import org.apache.excalibur.instrument.Instrument;
import org.apache.excalibur.instrument.InstrumentManageable;
1.5 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/LEAwareComponentHandler.java
Index: LEAwareComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/LEAwareComponentHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LEAwareComponentHandler.java 9 Nov 2002 23:25:44 -0000 1.4
+++ LEAwareComponentHandler.java 24 Nov 2002 16:45:19 -0000 1.5
@@ -50,7 +50,7 @@
package org.apache.excalibur.fortress.handler;
import org.apache.avalon.framework.context.Context;
-import org.apache.excalibur.container.lifecycle.LifecycleExtensionManager;
+import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
/**
* A ComponentHandler that delegates to underlying handler but also
1.7 +2 -2
jakarta-avalon-excalibur/fortress/src/ng/org/apache/excalibur/fortress/container/MetaDataContainer.java
Index: MetaDataContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/ng/org/apache/excalibur/fortress/container/MetaDataContainer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MetaDataContainer.java 10 Nov 2002 13:00:44 -0000 1.6
+++ MetaDataContainer.java 24 Nov 2002 16:45:19 -0000 1.7
@@ -75,7 +75,7 @@
import
org.apache.excalibur.fortress.container.commands.CommandFinishedListener;
import org.apache.excalibur.instrument.InstrumentManager;
import org.apache.excalibur.mpool.PoolManager;
-import org.apache.excalibur.container.lifecycle.LifecycleExtensionManager;
+import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
/**
* The MetaDataContainer is the wave of the future. While the
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
