bloritsch 02/02/05 06:15:04
Modified: src/scratchpad/org/apache/avalon/excalibur/system
AbstractContainer.java ContainerManager.java
src/scratchpad/org/apache/avalon/excalibur/system/handler
FactoryComponentHandler.java
Log:
applied patches from Michael McKibben ([EMAIL PROTECTED])
Revision Changes Path
1.6 +14 -2
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/AbstractContainer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractContainer.java 5 Feb 2002 05:28:48 -0000 1.5
+++ AbstractContainer.java 5 Feb 2002 14:15:04 -0000 1.6
@@ -36,7 +36,7 @@
* Manager can expose that to the instantiating class.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2002/02/05 05:28:48 $
+ * @version CVS $Revision: 1.6 $ $Date: 2002/02/05 14:15:04 $
*/
public abstract class AbstractContainer
extends AbstractLogEnabled
@@ -271,6 +271,18 @@
}
/**
+ * Exposes to subclasses the component manager which this container
+ * uses to manage its child components.
+ *
+ * @return the child component manager
+ */
+ protected final ComponentManager getComponentManager() {
+ m_validator.checkActive();
+
+ return m_childManager;
+ }
+
+ /**
* Root ComponentManager. The Container may choose to have it's
ComponentManager
* delegate to the root manager, or it may choose to be entirely self
contained.
*/
@@ -366,7 +378,7 @@
}
/**
- * Exposes to subclasses the component manager which this container
+ * Exposes to subclasses the component manager which this container
* uses to manage its child components.
*
* @return the child component manager
1.12 +7 -7
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/ContainerManager.java
Index: ContainerManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/ContainerManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ContainerManager.java 4 Feb 2002 03:08:33 -0000 1.11
+++ ContainerManager.java 5 Feb 2002 14:15:04 -0000 1.12
@@ -123,7 +123,7 @@
* </table>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.11 $ $Date: 2002/02/04 03:08:33 $
+ * @version CVS $Revision: 1.12 $ $Date: 2002/02/05 14:15:04 $
*/
public class ContainerManager
{
@@ -239,18 +239,18 @@
try
{
- SourceResolverImpl resolver = new SourceResolverImpl();
- resolver.enableLogging( getLogger() );
- resolver.contextualize( getContext() );
- resolver.compose( manager );
- manager.put( resolver.ROLE, resolver );
-
DefaultComponentSelector selector = new
DefaultComponentSelector();
ResourceSourceFactory resource = new ResourceSourceFactory();
resource.enableLogging( getLogger() );
selector.put("resource", resource);
manager.put( resource.ROLE + "Selector", selector );
+
+ SourceResolverImpl resolver = new SourceResolverImpl();
+ resolver.enableLogging( getLogger() );
+ resolver.contextualize( getContext() );
+ resolver.compose( manager );
+ manager.put( resolver.ROLE, resolver );
}
catch ( Exception e )
{
1.3 +4 -4
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/handler/FactoryComponentHandler.java
Index: FactoryComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/handler/FactoryComponentHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FactoryComponentHandler.java 29 Jan 2002 16:18:53 -0000 1.2
+++ FactoryComponentHandler.java 5 Feb 2002 14:15:04 -0000 1.3
@@ -19,14 +19,14 @@
import org.apache.avalon.excalibur.logger.LoggerManager;
/**
- * The DefaultComponentHandler to make sure components are initialized
+ * The FactoryComponentHandler to make sure components are initialized
* and destroyed correctly.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.2 $ $Date: 2002/01/29 16:18:53 $
+ * @version CVS $Revision: 1.3 $ $Date: 2002/02/05 14:15:04 $
* @since 4.0
*/
-class DefaultComponentHandler
+class FactoryComponentHandler
implements ComponentHandler
{
/** The instance of the ComponentFactory that creates and disposes of
the Component */
@@ -46,7 +46,7 @@
* whether a Component is ThreadSafe, Poolable, or SingleThreaded.
* It falls back to SingleThreaded if not specified.
*/
- protected DefaultComponentHandler( final Class componentClass,
+ protected FactoryComponentHandler( final Class componentClass,
final Configuration config,
final ComponentManager manager,
final Context context )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
