cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: rev 55391 - in cocoon/trunk/src: blocks/axis/java/org/apache/cocoon/components/axis/providers blocks/axis/java/org/apache/cocoon/webservices blocks/chaperon/test/org/apache/cocoon/generation blocks/chaperon/test/org/apache/cocoon/transformation blocks/databases/conf blocks/eventcache/samples blocks/faces/conf blocks/forms/conf blocks/forms/java/org/apache/cocoon/forms/datatype blocks/forms/java/org/apache/cocoon/forms/formmodel blocks/javaflow/test/org/apache/cocoon/components/flow/java/test blocks/javaflow/test/org/apache/cocoon/components/flow/javascript blocks/midi/test/org/apache/cocoon/generation blocks/midi/test/org/apache/cocoon/serialization blocks/portal/conf blocks/portal/java/org/apache/cocoon/portlet blocks/profiler/java/org/apache/cocoon/components/profiler blocks/session-fw/conf blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/java blocks/taglib/conf blocks/web3/conf blocks/woody/conf blocks/woody/java/org/apache/cocoon/woody/datatype blocks/woody/java/org/apache/cocoon/woody/formmodel blocks/xsp/conf blocks/xsp/java/org/apache/cocoon/components/language/generator blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java core/java/org/apache/cocoon/core/container documentation/xdocs documentation/xdocs/developing documentation/xdocs/tutorial documentation/xdocs/userdocs/concepts java/org/apache/cocoon java/org/apache/cocoon/components/flow java/org/apache/cocoon/components/flow/javascript/fom java/org/apache/cocoon/components/modules/input java/org/apache/cocoon/components/pipeline java/org/apache/cocoon/components/treeprocessor java/org/apache/cocoon/components/treeprocessor/sitemap java/org/apache/cocoon/generation java/org/apache/cocoon/servlet java/org/apache/cocoon/transformation java/org/apache/cocoon/xml samples/org/apache/cocoon/samples/parentcm test/org/apache/cocoon/acting test/org/apache/cocoon/components/treeprocessor/variables test/org/apache/cocoon/generation test/org/apache/cocoon/matching test/org/apache/cocoon/selection test/org/apache/cocoon/transformation webapp/WEB-INF
Date Sat, 23 Oct 2004 18:15:04 GMT
Author: cziegeler
Date: Sat Oct 23 11:15:02 2004
New Revision: 55391

Added:
   cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/AbstractServiceableService.java
      - copied, changed from rev 55379, cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/AbstractComposableService.java
   cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentServiceManager.java
      - copied, changed from rev 55379, cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentComponentManager.java
Removed:
   cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/AbstractComposableService.java
   cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentComponentManager.java
Modified:
   cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java
   cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.xtest
   cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.xtest
   cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.xtest
   cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.xtest
   cocoon/trunk/src/blocks/databases/conf/db-modules.xroles
   cocoon/trunk/src/blocks/eventcache/samples/eventcache.xsp
   cocoon/trunk/src/blocks/faces/conf/faces-taglib.samplesxconf
   cocoon/trunk/src/blocks/faces/conf/faces-taglib.xconf
   cocoon/trunk/src/blocks/forms/conf/forms-selection-lists.xroles
   cocoon/trunk/src/blocks/forms/conf/forms-validators.xroles
   cocoon/trunk/src/blocks/forms/conf/forms-widgetlisteners.xroles
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DatatypeBuilder.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRuleBuilder.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionBuilder.java
   cocoon/trunk/src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/JavaFlowTestCase.xtest
   cocoon/trunk/src/blocks/javaflow/test/org/apache/cocoon/components/flow/javascript/JavaScriptFlowTestCase.xtest
   cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest
   cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest
   cocoon/trunk/src/blocks/portal/conf/portal.samplesxconf
   cocoon/trunk/src/blocks/portal/conf/portal.xconf
   cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java
   cocoon/trunk/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingCachingProcessingPipeline.java
   cocoon/trunk/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingNonCachingProcessingPipeline.java
   cocoon/trunk/src/blocks/session-fw/conf/session.xroles
   cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java
   cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/java/session-fw.xsl
   cocoon/trunk/src/blocks/taglib/conf/tag.xconf
   cocoon/trunk/src/blocks/web3/conf/web3.xroles
   cocoon/trunk/src/blocks/woody/conf/woody-selection-lists.xroles
   cocoon/trunk/src/blocks/woody/conf/woody-validators.xroles
   cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/datatype/DatatypeBuilder.java
   cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/datatype/ValidationRuleBuilder.java
   cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/WidgetDefinitionBuilder.java
   cocoon/trunk/src/blocks/xsp/conf/xsp.xroles
   cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/ProgramGenerator.java
   cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xscript.xsl
   cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
   cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java
   cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java
   cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java
   cocoon/trunk/src/documentation/xdocs/developing/avalon.xml
   cocoon/trunk/src/documentation/xdocs/developing/datasources.xml
   cocoon/trunk/src/documentation/xdocs/developing/deli.xml
   cocoon/trunk/src/documentation/xdocs/developing/extending.xml
   cocoon/trunk/src/documentation/xdocs/developing/httprequest.xml
   cocoon/trunk/src/documentation/xdocs/developing/parent-component-manager.xml
   cocoon/trunk/src/documentation/xdocs/dictionary.xml
   cocoon/trunk/src/documentation/xdocs/performancetips.xml
   cocoon/trunk/src/documentation/xdocs/tutorial/RMIGenerator.java
   cocoon/trunk/src/documentation/xdocs/tutorial/tutorial-generator.xml
   cocoon/trunk/src/documentation/xdocs/tutorial/tutorial-rmi-generator.xml
   cocoon/trunk/src/documentation/xdocs/userdocs/concepts/sitemap.xml
   cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java
   cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles
   cocoon/trunk/src/java/org/apache/cocoon/components/flow/CompilingInterpreter.java
   cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
   cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java
   cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
   cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/ProcessingPipeline.java
   cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
   cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ProcessingNodeBuilder.java
   cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ProcessorComponentInfo.java
   cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeBuilder.java
   cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java
   cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
   cocoon/trunk/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
   cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
   cocoon/trunk/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java
   cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractDOMFragment.java
   cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/Configurator.java
   cocoon/trunk/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/matching/HeaderMatcherTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/matching/ParameterMatcherTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/matching/RegexpURIMatcherTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/matching/RequestAttributeMatcherTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/matching/RequestParameterMatcherTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.java
   cocoon/trunk/src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java
   cocoon/trunk/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.java
   cocoon/trunk/src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/transformation/FilterTransformerTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java
   cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest
   cocoon/trunk/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java
   cocoon/trunk/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.xtest
   cocoon/trunk/src/webapp/WEB-INF/web.xml
Log:
Remove all uses of Component, Composable, ComponentException, ComponentSelector, Part I

Modified: cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java
==============================================================================
--- cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java	(original)
+++ cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/components/axis/providers/AvalonProvider.java	Sat Oct 23 11:15:02 2004
@@ -36,20 +36,20 @@
  *
  * <p>
  *  The specified <b>ROLE</b> corresponds to a particular implementation
- *  which is retrieved by a given Avalon <code>ComponentManager</code>.
+ *  which is retrieved by a given Avalon <code>ServiceManager</code>.
  *  For more information about Avalon, see the Avalon.
  *  <a href="http://jakarta.apache.org/avalon">website</a>.
  * </p>
  *
  * <p>
- *  To use this class, you need to add your Avalon <code>ComponentManager</code>
+ *  To use this class, you need to add your Avalon <code>ServiceManager</code>
  *  instance to the <code>MessageContext</code> that is Axis uses to process
  *  messages with.
  * </p>
  *
  * <p>
  *  To do this you could for example subclass the AxisServlet and override the
- *  <code>createMessageContext()</code> method adding the ComponentManager, eg:
+ *  <code>createMessageContext()</code> method adding the ServiceManager, eg:
  *
  *  <pre>
  *   protected MessageContext createMessageContext(...)
@@ -65,7 +65,7 @@
  * </p>
  *
  * <p>
- *  This provider will use that <code>ComponentManager</code> reference to
+ *  This provider will use that <code>ServiceManager</code> reference to
  *  retrieve objects.
  * </p>
  *
@@ -175,7 +175,7 @@
     )
         throws AxisFault
     {
-        // Assuming ExcaliburComponentManager semantics the ROLE name is
+        // Assuming CocoonServiceManager semantics the ROLE name is
         // actually the class name, potentially with a variant following
         // the class name with a '/' separator
 
@@ -203,12 +203,12 @@
      * <code>Components</code>.
      *
      * <p>
-     *  Components retrieved from an Avalon ComponentManager must be
+     *  Components retrieved from an Avalon ServiceManager must be
      *  returned to the manager when they are no longer required.
      * </p>
      *
      * <p>
-     *  The returning of Components to their ComponentManager is handled
+     *  The returning of Components to their ServiceManager is handled
      *  by a Proxy class which uses the following InvocationHandler.
      * </p>
      *
@@ -222,7 +222,7 @@
      *  When Axis is finished with the object returned by this provider,
      *  it invokes ServiceLifecycle.destroy(). This is intercepted by the
      *  InvocationHandler and the Component is returned at this time back
-     *  to the ComponentManager it was retrieved from.
+     *  to the ServiceManager it was retrieved from.
      * </p>
      *
      * <p>

Copied: cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/AbstractServiceableService.java (from rev 55379, cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/AbstractComposableService.java)
==============================================================================
--- cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/AbstractComposableService.java	(original)
+++ cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/AbstractServiceableService.java	Sat Oct 23 11:15:02 2004
@@ -22,7 +22,7 @@
 import org.apache.cocoon.components.axis.providers.AvalonProvider;
 
 /**
- * Base class for providing Composable SOAP services.
+ * Base class for providing Serviceable SOAP services.
  *
  * <p>
  *  Note, this class is intended to be used in SOAP Services that require
@@ -37,7 +37,7 @@
  * @author <a href="mailto:crafterm@apache.org">Marcus Crafter</a>
  * @version CVS $Id$
  */
-public abstract class AbstractComposableService
+public abstract class AbstractServiceableService
         extends AbstractLogEnabledService
         implements Serviceable {
     
@@ -73,7 +73,7 @@
     }
 
     /**
-     * Helper method to extract the ComponentManager reference
+     * Helper method to extract the ServiceManager reference
      * from the context.
      * @exception ComponentException if an error occurs
      */

Modified: cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.xtest	(original)
+++ cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -55,7 +55,7 @@
 
   <role name="org.apache.cocoon.generation.GeneratorSelector"
         shorthand="generators"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.xtest
==============================================================================
--- cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.xtest	(original)
+++ cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -59,7 +59,7 @@
 
   <role name="org.apache.cocoon.transformation.TransformerSelector"
         shorthand="transformers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.excalibur.store.Store/TransientStore"
         shorthand="transient-store"

Modified: cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.xtest
==============================================================================
--- cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.xtest	(original)
+++ cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -59,7 +59,7 @@
 
   <role name="org.apache.cocoon.transformation.TransformerSelector"
         shorthand="transformers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.excalibur.store.Store/TransientStore"
         shorthand="transient-store"

Modified: cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.xtest
==============================================================================
--- cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.xtest	(original)
+++ cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -59,7 +59,7 @@
 
   <role name="org.apache.cocoon.transformation.TransformerSelector"
         shorthand="transformers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.excalibur.store.Store/TransientStore"
         shorthand="transient-store"

Modified: cocoon/trunk/src/blocks/databases/conf/db-modules.xroles
==============================================================================
--- cocoon/trunk/src/blocks/databases/conf/db-modules.xroles	(original)
+++ cocoon/trunk/src/blocks/databases/conf/db-modules.xroles	Sat Oct 23 11:15:02 2004
@@ -19,6 +19,6 @@
 
   <role name="org.apache.cocoon.components.modules.database.AutoIncrementModuleSelector"
         shorthand="autoincrement-modules"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
 </xroles>

Modified: cocoon/trunk/src/blocks/eventcache/samples/eventcache.xsp
==============================================================================
--- cocoon/trunk/src/blocks/eventcache/samples/eventcache.xsp	(original)
+++ cocoon/trunk/src/blocks/eventcache/samples/eventcache.xsp	Sat Oct 23 11:15:02 2004
@@ -152,7 +152,7 @@
                 </li>
             </ul>
             Note that though this example uses xsp with actions or flow, any pipeline component can be 
-            made to use EventValidity, and any code with access to the ComponentManager can 
+            made to use EventValidity, and any code with access to the ServiceManager can 
             translate real-world events to Events and notify the Cache of them.  
         </para>
         <xsp:logic>

Modified: cocoon/trunk/src/blocks/faces/conf/faces-taglib.samplesxconf
==============================================================================
--- cocoon/trunk/src/blocks/faces/conf/faces-taglib.samplesxconf	(original)
+++ cocoon/trunk/src/blocks/faces/conf/faces-taglib.samplesxconf	Sat Oct 23 11:15:02 2004
@@ -22,7 +22,7 @@
     <!--
       - CarStore Demo taglib: Custom components
       -->
-    <taglib name="http://java.sun.com/jsf/demo/components" logger="sitemap.taglib.jsf.demo" class="org.apache.cocoon.components.ExtendedComponentSelector">
+    <taglib name="http://java.sun.com/jsf/demo/components" logger="sitemap.taglib.jsf.demo" class="org.apache.cocoon.core.container.CocoonServiceSelector">
       <tag name="area" class="org.apache.cocoon.faces.samples.components.taglib.AreaTag" logger="sitemap.taglib.jsf.demo"/>
       <tag name="map" class="org.apache.cocoon.faces.samples.components.taglib.MapTag" logger="sitemap.taglib.jsf.demo"/>
     </taglib>
@@ -30,7 +30,7 @@
     <!--
       - CarStore Demo taglib: Custom validator
       -->
-    <taglib name="urn:carstoretaglibrary_1.1" logger="sitemap.taglib.jsf.carstore" class="org.apache.cocoon.components.ExtendedComponentSelector">
+    <taglib name="urn:carstoretaglibrary_1.1" logger="sitemap.taglib.jsf.carstore" class="org.apache.cocoon.core.container.CocoonServiceSelector">
       <tag name="format_validator" class="org.apache.cocoon.faces.samples.carstore.FormatValidatorTag" logger="sitemap.taglib.jsf.carstore"/>
     </taglib>
 

Modified: cocoon/trunk/src/blocks/faces/conf/faces-taglib.xconf
==============================================================================
--- cocoon/trunk/src/blocks/faces/conf/faces-taglib.xconf	(original)
+++ cocoon/trunk/src/blocks/faces/conf/faces-taglib.xconf	Sat Oct 23 11:15:02 2004
@@ -19,7 +19,7 @@
 <xconf xpath="/cocoon/component[@role='org.apache.cocoon.taglib.TagSelector']"
        unless="taglib[@name='http://java.sun.com/jsf/core']">
 
-    <taglib name="http://java.sun.com/jsf/core" logger="sitemap.taglib.jsf" class="org.apache.cocoon.components.ExtendedComponentSelector">
+    <taglib name="http://java.sun.com/jsf/core" logger="sitemap.taglib.jsf" class="org.apache.cocoon.core.container.CocoonServiceSelector">
       <tag name="actionListener" class="org.apache.cocoon.faces.taglib.ActionListenerTag" logger="sitemap.taglib.jsf"/>
       <tag name="attribute" class="org.apache.cocoon.faces.taglib.AttributeTag" logger="sitemap.taglib.jsf"/>
       <tag name="convertDateTime" class="org.apache.cocoon.faces.taglib.ConvertDateTimeTag" logger="sitemap.taglib.jsf"/>
@@ -39,7 +39,7 @@
       <tag name="verbatim" class="org.apache.cocoon.faces.taglib.VerbatimTag" logger="sitemap.taglib.jsf"/>
       <tag name="view" class="org.apache.cocoon.faces.taglib.ViewTag" logger="sitemap.taglib.jsf"/>
     </taglib>
-    <taglib name="http://java.sun.com/jsf/html" logger="sitemap.taglib.jsf.html" class="org.apache.cocoon.components.ExtendedComponentSelector">
+    <taglib name="http://java.sun.com/jsf/html" logger="sitemap.taglib.jsf.html" class="org.apache.cocoon.core.container.CocoonServiceSelector">
       <tag name="column" class="org.apache.cocoon.faces.taglib.html.ColumnTag" logger="sitemap.taglib.jsf.html"/>
       <tag name="commandButton" class="org.apache.cocoon.faces.taglib.html.CommandButtonTag" logger="sitemap.taglib.jsf.html"/>
       <tag name="commandLink" class="org.apache.cocoon.faces.taglib.html.CommandLinkTag" logger="sitemap.taglib.jsf.html"/>

Modified: cocoon/trunk/src/blocks/forms/conf/forms-selection-lists.xroles
==============================================================================
--- cocoon/trunk/src/blocks/forms/conf/forms-selection-lists.xroles	(original)
+++ cocoon/trunk/src/blocks/forms/conf/forms-selection-lists.xroles	Sat Oct 23 11:15:02 2004
@@ -19,5 +19,5 @@
 
   <role name="org.apache.cocoon.forms.datatype.SelectionListBuilderSelector"
         shorthand="forms-selection-lists"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 </xroles>

Modified: cocoon/trunk/src/blocks/forms/conf/forms-validators.xroles
==============================================================================
--- cocoon/trunk/src/blocks/forms/conf/forms-validators.xroles	(original)
+++ cocoon/trunk/src/blocks/forms/conf/forms-validators.xroles	Sat Oct 23 11:15:02 2004
@@ -19,5 +19,5 @@
 
   <role name="org.apache.cocoon.forms.validation.WidgetValidatorBuilderSelector"
         shorthand="forms-validators"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 </xroles>

Modified: cocoon/trunk/src/blocks/forms/conf/forms-widgetlisteners.xroles
==============================================================================
--- cocoon/trunk/src/blocks/forms/conf/forms-widgetlisteners.xroles	(original)
+++ cocoon/trunk/src/blocks/forms/conf/forms-widgetlisteners.xroles	Sat Oct 23 11:15:02 2004
@@ -19,5 +19,5 @@
 
   <role name="org.apache.cocoon.forms.event.WidgetListenerBuilderSelector"
         shorthand="forms-widgetlisteners"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 </xroles>

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DatatypeBuilder.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DatatypeBuilder.java	(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/DatatypeBuilder.java	Sat Oct 23 11:15:02 2004
@@ -24,10 +24,10 @@
  *
  * <p>These builders should be threadsafe, only one instance of them will be created.
  *
- * <p>Implementations may implement Avalon's Composable interface to get access to
+ * <p>Implementations may implement Avalon's Serviceable interface to get access to
  * other components.
  * 
- * @version $Id: DatatypeBuilder.java,v 1.1 2004/03/09 10:34:00 reinhard Exp $
+ * @version $Id$
  */
 public interface DatatypeBuilder {
     public Datatype build(Element datatypeElement, boolean arrayType, DatatypeManager datatypeManager) throws Exception;

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRuleBuilder.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRuleBuilder.java	(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRuleBuilder.java	Sat Oct 23 11:15:02 2004
@@ -19,11 +19,11 @@
 
 /**
  * Interface for classes that can build ValidationRules from an XML description.
- * A ValidationRuleBuilder can be Composable.
+ * A ValidationRuleBuilder can be Serviceable.
  * A ValidationRuleBuilder should be thread safe, only one instance of it
  * will be created.
  * 
- * @version $Id: ValidationRuleBuilder.java,v 1.1 2004/03/09 10:34:00 reinhard Exp $
+ * @version $Id$
  */
 public interface ValidationRuleBuilder {
     public ValidationRule build(Element validationRuleElement) throws Exception;

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionBuilder.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionBuilder.java	(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionBuilder.java	Sat Oct 23 11:15:02 2004
@@ -23,10 +23,10 @@
  * <p>These builder classes should be thread safe, only a single instance of them
  * will be created.
  *
- * <p>Implementations may implement Avalon's Composable interface to gain access
+ * <p>Implementations may implement Avalon's Serviceable interface to gain access
  * to other components.
  * 
- * @version CVS $Id: WidgetDefinitionBuilder.java,v 1.1 2004/03/09 10:33:50 reinhard Exp $
+ * @version CVS $Id$
  */
 public interface WidgetDefinitionBuilder {
 

Modified: cocoon/trunk/src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/JavaFlowTestCase.xtest
==============================================================================
--- cocoon/trunk/src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/JavaFlowTestCase.xtest	(original)
+++ cocoon/trunk/src/blocks/javaflow/test/org/apache/cocoon/components/flow/java/test/JavaFlowTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -57,7 +57,7 @@
 
   <role name="org.apache.cocoon.acting.ActionSelector"
         shorthand="actions"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.cocoon.components.flow.Interpreter"
         shorthand="flow-interpreters"

Modified: cocoon/trunk/src/blocks/javaflow/test/org/apache/cocoon/components/flow/javascript/JavaScriptFlowTestCase.xtest
==============================================================================
--- cocoon/trunk/src/blocks/javaflow/test/org/apache/cocoon/components/flow/javascript/JavaScriptFlowTestCase.xtest	(original)
+++ cocoon/trunk/src/blocks/javaflow/test/org/apache/cocoon/components/flow/javascript/JavaScriptFlowTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -57,7 +57,7 @@
 
   <role name="org.apache.cocoon.acting.ActionSelector"
         shorthand="actions"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.cocoon.components.flow.Interpreter"
         shorthand="flow-interpreters"

Modified: cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest	(original)
+++ cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -56,7 +56,7 @@
 
   <role name="org.apache.cocoon.generation.GeneratorSelector"
         shorthand="generators"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest
==============================================================================
--- cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest	(original)
+++ cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -56,7 +56,7 @@
 
   <role name="org.apache.cocoon.serialization.SerializerSelector"
         shorthand="serializers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/blocks/portal/conf/portal.samplesxconf
==============================================================================
--- cocoon/trunk/src/blocks/portal/conf/portal.samplesxconf	(original)
+++ cocoon/trunk/src/blocks/portal/conf/portal.samplesxconf	Sat Oct 23 11:15:02 2004
@@ -27,7 +27,7 @@
  </component>
 
  <!-- Renderer configuration -->
- <component class="org.apache.cocoon.components.ExtendedComponentSelector" role="org.apache.cocoon.portal.layout.renderer.RendererSelector">
+ <component class="org.apache.cocoon.core.container.CocoonServiceSelector" role="org.apache.cocoon.portal.layout.renderer.RendererSelector">
      <renderer name="column" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal" >
          <aspects>
              <aspect type="xslt">

Modified: cocoon/trunk/src/blocks/portal/conf/portal.xconf
==============================================================================
--- cocoon/trunk/src/blocks/portal/conf/portal.xconf	(original)
+++ cocoon/trunk/src/blocks/portal/conf/portal.xconf	Sat Oct 23 11:15:02 2004
@@ -18,7 +18,7 @@
 <xconf xpath="/cocoon" unless="component[@role='org.apache.cocoon.portal.event.aspect.EventAspectSelector']">
 
  <!-- Event Aspect configuration -->
- <component class="org.apache.cocoon.components.ExtendedComponentSelector" role="org.apache.cocoon.portal.event.aspect.EventAspectSelector">
+ <component class="org.apache.cocoon.core.container.CocoonServiceSelector" role="org.apache.cocoon.portal.event.aspect.EventAspectSelector">
     <aspect name="action-counter" class="org.apache.cocoon.portal.event.aspect.impl.ActionCounterEventAspect"/>
     <aspect name="request-parameter" class="org.apache.cocoon.portal.event.aspect.impl.RequestParameterEventAspect"/>
     <aspect name="frame" class="org.apache.cocoon.portal.event.aspect.impl.FrameEventAspect"/>
@@ -72,7 +72,7 @@
  </component>
 
   <!-- Coplet Adapter configuration -->
-  <component class="org.apache.cocoon.components.ExtendedComponentSelector" 
+  <component class="org.apache.cocoon.core.container.CocoonServiceSelector" 
              role="org.apache.cocoon.portal.coplet.adapter.CopletAdapterSelector">
     <!-- This is the pipeline/uri based adapter -->
     <coplet-adapter name="uri" 
@@ -92,7 +92,7 @@
 
 
  <!-- Renderer Aspect configuration -->
- <component class="org.apache.cocoon.components.ExtendedComponentSelector" role="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectSelector">
+ <component class="org.apache.cocoon.core.container.CocoonServiceSelector" role="org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectSelector">
     <aspect name="composite-content" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.CompositeContentAspect"/>
     <aspect name="tab-content" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.TabContentAspect"/>
     <aspect name="window" class="org.apache.cocoon.portal.layout.renderer.aspect.impl.WindowAspect"/>
@@ -127,7 +127,7 @@
  </component>
 
  <!-- Aspect Storage configuration -->
- <component class="org.apache.cocoon.components.ExtendedComponentSelector" 
+ <component class="org.apache.cocoon.core.container.CocoonServiceSelector" 
             role="org.apache.cocoon.portal.aspect.AspectDataStoreSelector">
     <store name="temporary" class="org.apache.cocoon.portal.aspect.impl.TemporaryAspectDataStore"/>
     <store name="request" class="org.apache.cocoon.portal.aspect.impl.RequestAspectDataStore"/>

Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java
==============================================================================
--- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java	(original)
+++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPortlet.java	Sat Oct 23 11:15:02 2004
@@ -18,18 +18,14 @@
 import org.apache.avalon.excalibur.logger.Log4JLoggerManager;
 import org.apache.avalon.excalibur.logger.LogKitLoggerManager;
 import org.apache.avalon.excalibur.logger.LoggerManager;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentManager;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
 import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.context.Contextualizable;
 import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.logger.LogEnabled;
 import org.apache.avalon.framework.logger.LogKitLogger;
 import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceManager;
 
 import org.apache.cocoon.Cocoon;
 import org.apache.cocoon.ConnectionResetException;
@@ -186,11 +182,11 @@
     protected ClassLoader classLoader = this.getClass().getClassLoader();
     protected boolean initClassLoader = false;
 
-    private String parentComponentManagerClass;
-    private String parentComponentManagerInitParam;
+    private String parentServiceManagerClass;
+    private String parentServiceManagerInitParam;
 
-    /** The parent ComponentManager, if any. Stored here in order to be able to dispose it in destroy(). */
-    private ComponentManager parentComponentManager;
+    /** The parent ServiceManager, if any. Stored here in order to be able to dispose it in destroy(). */
+    private ServiceManager parentServiceManager;
 
     protected String forceLoadParameter;
     protected String forceSystemProperty;
@@ -484,12 +480,12 @@
             }
         }
 
-        parentComponentManagerClass = getInitParameter("parent-component-manager", null);
-        if (parentComponentManagerClass != null) {
-            int dividerPos = parentComponentManagerClass.indexOf('/');
+        parentServiceManagerClass = getInitParameter("parent-service-manager", null);
+        if (parentServiceManagerClass != null) {
+            int dividerPos = parentServiceManagerClass.indexOf('/');
             if (dividerPos != -1) {
-                parentComponentManagerInitParam = parentComponentManagerClass.substring(dividerPos + 1);
-                parentComponentManagerClass = parentComponentManagerClass.substring(0, dividerPos);
+                parentServiceManagerInitParam = parentServiceManagerClass.substring(dividerPos + 1);
+                parentServiceManagerClass = parentServiceManagerClass.substring(0, dividerPos);
             }
         }
 
@@ -552,9 +548,7 @@
             this.instrumentManager.dispose();
         }
 
-        if (this.parentComponentManager != null && this.parentComponentManager instanceof Disposable) {
-            ((Disposable) this.parentComponentManager).dispose();
-        }
+        ContainerUtil.dispose(this.parentServiceManager);
     }
 
     /**
@@ -1531,41 +1525,33 @@
     }
 
     /**
-     * Instatiates the parent component manager, as specified in the
-     * parent-component-manager init parameter.
+     * Instatiates the parent service manager, as specified in the
+     * parent-service-manager init parameter.
      *
      * If none is specified, the method returns <code>null</code>.
      *
-     * @return the parent component manager, or <code>null</code>.
+     * @return the parent service manager, or <code>null</code>.
      */
-    protected synchronized ComponentManager getParentComponentManager() {
-        if (parentComponentManager != null && parentComponentManager instanceof Disposable) {
-            ((Disposable) parentComponentManager).dispose();
-        }
+    protected synchronized ServiceManager getParentServiceManager() {
+        ContainerUtil.dispose(this.parentServiceManager);
 
-        parentComponentManager = null;
-        if (parentComponentManagerClass != null) {
+        this.parentServiceManager = null;
+        if (parentServiceManagerClass != null) {
             try {
-                Class pcm = ClassUtils.loadClass(parentComponentManagerClass);
+                Class pcm = ClassUtils.loadClass(parentServiceManagerClass);
                 Constructor pcmc = pcm.getConstructor(new Class[]{String.class});
-                parentComponentManager = (ComponentManager) pcmc.newInstance(new Object[]{parentComponentManagerInitParam});
+                parentServiceManager = (ServiceManager) pcmc.newInstance(new Object[]{parentServiceManagerInitParam});
 
-                if (parentComponentManager instanceof LogEnabled) {
-                    ((LogEnabled) parentComponentManager).enableLogging(getLogger());
-                }
-                if (parentComponentManager instanceof Contextualizable) {
-                    ((Contextualizable) parentComponentManager).contextualize(this.appContext);
-                }
-                if (parentComponentManager instanceof Initializable) {
-                    ((Initializable) parentComponentManager).initialize();
-                }
+                ContainerUtil.enableLogging(this.parentServiceManager, this.getLogger());
+                ContainerUtil.contextualize(this.parentServiceManager, this.appContext);
+                ContainerUtil.initialize(this.parentServiceManager);
             } catch (Exception e) {
                 if (getLogger().isErrorEnabled()) {
                     getLogger().error("Could not initialize parent component manager.", e);
                 }
             }
         }
-        return parentComponentManager;
+        return parentServiceManager;
     }
 
     /**
@@ -1596,9 +1582,9 @@
             ContainerUtil.enableLogging(c, getCocoonLogger());
             c.setLoggerManager(getLoggerManager());
             ContainerUtil.contextualize(c, this.appContext);
-            final ComponentManager parent = this.getParentComponentManager();
+            final ServiceManager parent = this.getParentServiceManager();
             if (parent != null) {
-                ContainerUtil.compose(c, parent);
+                ContainerUtil.service(c, parent);
             }
             ContainerUtil.initialize(c);
             this.creationTime = System.currentTimeMillis();

Modified: cocoon/trunk/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingCachingProcessingPipeline.java
==============================================================================
--- cocoon/trunk/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingCachingProcessingPipeline.java	(original)
+++ cocoon/trunk/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingCachingProcessingPipeline.java	Sat Oct 23 11:15:02 2004
@@ -34,7 +34,7 @@
  * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  * @author <a href="mailto:stephan@apache.org">Stephan Michels</a>
  * @author <a href="mailto:bruno@outerthought.org">Bruno Dumon</a>
- * @version CVS $Id: ProfilingCachingProcessingPipeline.java,v 1.9 2004/07/16 12:36:45 sylvain Exp $
+ * @version CVS $Id$
  */
 public class ProfilingCachingProcessingPipeline
   extends CachingProcessingPipeline {
@@ -45,13 +45,10 @@
 
     private int index = 0;
 
-    /**
-     * Composable
-     *
-     * @param manager    
+    /* (non-Javadoc)
+     * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager manager) throws ServiceException {
-
         super.service(manager);
         this.profiler = (Profiler) manager.lookup(Profiler.ROLE);
     }
@@ -79,8 +76,7 @@
     /**
      * Set the generator that will be used as the initial step in the pipeline.
      * The generator role is given : the actual <code>Generator</code> is fetched
-     * from the latest <code>ComponentManager</code> given by <code>compose()</code>
-     * or <code>recompose()</code>.
+     * from the latest <code>ServiceManager</code>.
      *
      * @param role the generator role in the component manager.
      * @param source the source where to produce XML from, or <code>null</code> if no
@@ -104,8 +100,7 @@
     /**
      * Add a transformer at the end of the pipeline.
      * The transformer role is given : the actual <code>Transformer</code> is fetched
-     * from the latest <code>ComponentManager</code> given by <code>compose()</code>
-     * or <code>recompose()</code>.
+     * from the latest <code>ServiceManager</code>.
      *
      * @param role the transformer role in the component manager.
      * @param source the source used to setup the transformer (e.g. XSL file), or

Modified: cocoon/trunk/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingNonCachingProcessingPipeline.java
==============================================================================
--- cocoon/trunk/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingNonCachingProcessingPipeline.java	(original)
+++ cocoon/trunk/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingNonCachingProcessingPipeline.java	Sat Oct 23 11:15:02 2004
@@ -39,7 +39,7 @@
  * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  * @author <a href="mailto:stephan@apache.org">Stephan Michels</a>
  * @author <a href="mailto:bruno@outerthought.org">Bruno Dumon</a>
- * @version CVS $Id: ProfilingNonCachingProcessingPipeline.java,v 1.9 2004/07/16 12:36:45 sylvain Exp $
+ * @version CVS $Id$
  */
 public class ProfilingNonCachingProcessingPipeline
   extends NonCachingProcessingPipeline implements Disposable {
@@ -50,13 +50,10 @@
 
     private int index = 0;
 
-    /**
-     * Composable
-     *
-     * @param manager
+    /* (non-Javadoc)
+     * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager manager) throws ServiceException {
-
         super.service(manager);
         this.profiler = (Profiler) manager.lookup(Profiler.ROLE);
     }
@@ -83,8 +80,7 @@
     /**
      * Set the generator that will be used as the initial step in the pipeline.
      * The generator role is given : the actual <code>Generator</code> is fetched
-     * from the latest <code>ComponentManager</code> given by <code>compose()</code>
-     * or <code>recompose()</code>.
+     * from the latest <code>ServiceManager</code>.
      *
      * @param role the generator role in the component manager.
      * @param source the source where to produce XML from, or <code>null</code> if no
@@ -108,8 +104,7 @@
     /**
      * Add a transformer at the end of the pipeline.
      * The transformer role is given : the actual <code>Transformer</code> is fetched
-     * from the latest <code>ComponentManager</code> given by <code>compose()</code>
-     * or <code>recompose()</code>.
+     * from the latest <code>ServiceManager</code>.
      *
      * @param role the transformer role in the component manager.
      * @param source the source used to setup the transformer (e.g. XSL file), or

Modified: cocoon/trunk/src/blocks/session-fw/conf/session.xroles
==============================================================================
--- cocoon/trunk/src/blocks/session-fw/conf/session.xroles	(original)
+++ cocoon/trunk/src/blocks/session-fw/conf/session.xroles	Sat Oct 23 11:15:02 2004
@@ -39,7 +39,7 @@
 
   <role name="org.apache.cocoon.webapps.session.context.SessionContextProviderSelector"
         shorthand="session-context-providers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector">
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector">
   </role>
 
 </xroles>

Modified: cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java
==============================================================================
--- cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java	(original)
+++ cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java	Sat Oct 23 11:15:02 2004
@@ -36,7 +36,7 @@
     /** GetXML Fragment from the given session context and path
      *
      *
-     * @param cm The ComponentManager
+     * @param cm The ServiceManager
      * @param context The Session context tha define where to search
      * @param path The parameter path
     **/
@@ -60,7 +60,7 @@
     /** GetXML Fragment from the given session context and path
      *
      *
-     * @param cm The ComponentManager
+     * @param cm The ServiceManager
      * @param context The Session context tha define where to search
      * @param path The parameter path
      **/

Modified: cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/java/session-fw.xsl
==============================================================================
--- cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/java/session-fw.xsl	(original)
+++ cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/java/session-fw.xsl	Sat Oct 23 11:15:02 2004
@@ -34,7 +34,7 @@
 
       <xsp:structure>
         <xsp:include>org.apache.cocoon.environment.Session</xsp:include>
-        <xsp:include>org.apache.avalon.framework.component.ComponentManager</xsp:include>
+        <xsp:include>org.apache.avalon.framework.service.ServiceManager</xsp:include>
         <xsp:include>org.apache.cocoon.components.language.markup.xsp.XSPSessionFwHelper</xsp:include>
         <xsp:include>org.w3c.dom.DocumentFragment</xsp:include>
       </xsp:structure>

Modified: cocoon/trunk/src/blocks/taglib/conf/tag.xconf
==============================================================================
--- cocoon/trunk/src/blocks/taglib/conf/tag.xconf	(original)
+++ cocoon/trunk/src/blocks/taglib/conf/tag.xconf	Sat Oct 23 11:15:02 2004
@@ -17,27 +17,27 @@
 
 <xconf xpath="/cocoon" unless="component[@role='org.apache.cocoon.taglib.TagSelector']">
 
-  <component role="org.apache.cocoon.taglib.TagSelector" class="org.apache.cocoon.components.ExtendedComponentSelector">
-    <taglib name="urn:apache:taglib:core" class="org.apache.cocoon.components.ExtendedComponentSelector" logger="sitemap.taglib.core">
+  <component role="org.apache.cocoon.taglib.TagSelector" class="org.apache.cocoon.core.container.CocoonServiceSelector">
+    <taglib name="urn:apache:taglib:core" class="org.apache.cocoon.core.container.CocoonServiceSelector" logger="sitemap.taglib.core">
       <tag name="source" class="org.apache.cocoon.taglib.core.SourceTag" logger="sitemap.taglib.core.source" />
     </taglib>
-    <taglib name="urn:apache:taglib:datetime" class="org.apache.cocoon.components.ExtendedComponentSelector" logger="sitemap.taglib.datetime">
+    <taglib name="urn:apache:taglib:datetime" class="org.apache.cocoon.core.container.CocoonServiceSelector" logger="sitemap.taglib.datetime">
       <tag name="months" class="org.apache.cocoon.taglib.datetime.MonthsTag" logger="sitemap.taglib.datetime.months" />
     </taglib>
-    <taglib name="urn:apache:taglib:i18n" class="org.apache.cocoon.components.ExtendedComponentSelector" logger="sitemap.taglib.i18n">
+    <taglib name="urn:apache:taglib:i18n" class="org.apache.cocoon.core.container.CocoonServiceSelector" logger="sitemap.taglib.i18n">
       <tag name="locale" class="org.apache.cocoon.taglib.i18n.LocaleTag" logger="sitemap.taglib.i18n.Locale" />
     </taglib>
-    <taglib name="urn:apache:taglib:jxpath:core" class="org.apache.cocoon.components.ExtendedComponentSelector" logger="sitemap.taglib.jxpath">
+    <taglib name="urn:apache:taglib:jxpath:core" class="org.apache.cocoon.core.container.CocoonServiceSelector" logger="sitemap.taglib.jxpath">
       <tag name="out" class="org.apache.cocoon.taglib.jxpath.core.OutTag" logger="sitemap.taglib.jxpath.core.out" />
       <tag name="forEach" class="org.apache.cocoon.taglib.jxpath.core.ForEachTag" logger="sitemap.taglib.jxpath.core.forEach" />
     </taglib>
-    <taglib name="urn:apache:taglib:string" class="org.apache.cocoon.components.ExtendedComponentSelector" logger="sitemap.taglib.string">
+    <taglib name="urn:apache:taglib:string" class="org.apache.cocoon.core.container.CocoonServiceSelector" logger="sitemap.taglib.string">
       <tag name="lower" class="org.apache.cocoon.taglib.string.LowerCaseTag" logger="sitemap.taglib.string.lower" />
       <tag name="textRecording" class="org.apache.cocoon.taglib.string.TextRecordingTag" logger="sitemap.taglib.string.textRecording" />
       <tag name="trim" class="org.apache.cocoon.taglib.string.TrimTag" logger="sitemap.taglib.string.trim" />
       <tag name="upper" class="org.apache.cocoon.taglib.string.UpperCaseTag" logger="sitemap.taglib.string.upper" />
     </taglib>
-    <taglib name="urn:apache:taglib:test" class="org.apache.cocoon.components.ExtendedComponentSelector" logger="sitemap.taglib.test">
+    <taglib name="urn:apache:taglib:test" class="org.apache.cocoon.core.container.CocoonServiceSelector" logger="sitemap.taglib.test">
       <tag name="hello" class="org.apache.cocoon.taglib.test.HelloWorldTag" logger="sitemap.taglib.test.hello" />
       <tag name="iteration" class="org.apache.cocoon.taglib.test.IterationTestTag" logger="sitemap.taglib.test.iteration" />
     </taglib>

Modified: cocoon/trunk/src/blocks/web3/conf/web3.xroles
==============================================================================
--- cocoon/trunk/src/blocks/web3/conf/web3.xroles	(original)
+++ cocoon/trunk/src/blocks/web3/conf/web3.xroles	Sat Oct 23 11:15:02 2004
@@ -22,7 +22,7 @@
 
     <role name="org.apache.cocoon.components.web3.Web3StreamerSelector"
               shorthand="web3-streamer"
-              default-class="org.apache.cocoon.components.ExtendedComponentSelector">
+              default-class="org.apache.cocoon.core.container.CocoonServiceSelector">
         <hint shorthand="default" 
               class="org.apache.cocoon.components.web3.impl.DefaultWeb3StreamerImpl"/>
         <!-- your streamer here -->

Modified: cocoon/trunk/src/blocks/woody/conf/woody-selection-lists.xroles
==============================================================================
--- cocoon/trunk/src/blocks/woody/conf/woody-selection-lists.xroles	(original)
+++ cocoon/trunk/src/blocks/woody/conf/woody-selection-lists.xroles	Sat Oct 23 11:15:02 2004
@@ -19,5 +19,5 @@
 
   <role name="org.apache.cocoon.woody.datatype.SelectionListBuilderSelector"
         shorthand="woody-selection-lists"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 </xroles>

Modified: cocoon/trunk/src/blocks/woody/conf/woody-validators.xroles
==============================================================================
--- cocoon/trunk/src/blocks/woody/conf/woody-validators.xroles	(original)
+++ cocoon/trunk/src/blocks/woody/conf/woody-validators.xroles	Sat Oct 23 11:15:02 2004
@@ -19,5 +19,5 @@
 
   <role name="org.apache.cocoon.woody.validation.WidgetValidatorBuilderSelector"
         shorthand="woody-validators"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 </xroles>

Modified: cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/datatype/DatatypeBuilder.java
==============================================================================
--- cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/datatype/DatatypeBuilder.java	(original)
+++ cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/datatype/DatatypeBuilder.java	Sat Oct 23 11:15:02 2004
@@ -24,10 +24,10 @@
  *
  * <p>These builders should be threadsafe, only one instance of them will be created.
  *
- * <p>Implementations may implement Avalon's Composable interface to get access to
+ * <p>Implementations may implement Avalon's Serviceable interface to get access to
  * other components.
  * 
- * @version $Id: DatatypeBuilder.java,v 1.6 2004/03/09 13:54:04 reinhard Exp $
+ * @version $Id$
  */
 public interface DatatypeBuilder {
     public Datatype build(Element datatypeElement, boolean arrayType, DatatypeManager datatypeManager) throws Exception;

Modified: cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/datatype/ValidationRuleBuilder.java
==============================================================================
--- cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/datatype/ValidationRuleBuilder.java	(original)
+++ cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/datatype/ValidationRuleBuilder.java	Sat Oct 23 11:15:02 2004
@@ -19,11 +19,11 @@
 
 /**
  * Interface for classes that can build ValidationRules from an XML description.
- * A ValidationRuleBuilder can be Composable.
+ * A ValidationRuleBuilder can be Serviceable.
  * A ValidationRuleBuilder should be thread safe, only one instance of it
  * will be created.
  * 
- * @version $Id: ValidationRuleBuilder.java,v 1.5 2004/03/09 13:54:04 reinhard Exp $
+ * @version $Id$
  */
 public interface ValidationRuleBuilder {
     public ValidationRule build(Element validationRuleElement) throws Exception;

Modified: cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/WidgetDefinitionBuilder.java
==============================================================================
--- cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/WidgetDefinitionBuilder.java	(original)
+++ cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/WidgetDefinitionBuilder.java	Sat Oct 23 11:15:02 2004
@@ -23,10 +23,10 @@
  * <p>These builder classes should be thread safe, only a single instance of them
  * will be created.
  *
- * <p>Implementations may implement Avalon's Composable interface to gain access
+ * <p>Implementations may implement Avalon's Serviceable interface to gain access
  * to other components.
  * 
- * @version CVS $Id: WidgetDefinitionBuilder.java,v 1.5 2004/03/09 13:53:55 reinhard Exp $
+ * @version CVS $Id$
  */
 public interface WidgetDefinitionBuilder {
 

Modified: cocoon/trunk/src/blocks/xsp/conf/xsp.xroles
==============================================================================
--- cocoon/trunk/src/blocks/xsp/conf/xsp.xroles	(original)
+++ cocoon/trunk/src/blocks/xsp/conf/xsp.xroles	Sat Oct 23 11:15:02 2004
@@ -24,14 +24,14 @@
 
   <role name="org.apache.cocoon.components.language.markup.MarkupLanguageSelector"
         shorthand="markup-languages"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector">
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector">
     <hint shorthand="sitemap-language" class="org.apache.cocoon.components.language.markup.CocoonMarkupLanguage"/>
     <hint shorthand="xsp-language" class="org.apache.cocoon.components.language.markup.xsp.XSPMarkupLanguage"/>
   </role>
 
   <role name="org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector"
         shorthand="programming-languages"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector">
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector">
     <hint shorthand="java-language" class="org.apache.cocoon.components.language.programming.java.JavaLanguage"/>
     <hint shorthand="js-language" class="org.apache.cocoon.components.language.programming.javascript.JavascriptLanguage"/>
     <hint shorthand="python-language" class="org.apache.cocoon.components.language.programming.python.PythonLanguage"/>

Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/ProgramGenerator.java
==============================================================================
--- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/ProgramGenerator.java	(original)
+++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/ProgramGenerator.java	Sat Oct 23 11:15:02 2004
@@ -35,7 +35,7 @@
      * Load a program built from an XML document written in a
      * <code>MarkupLanguage</code>
      *
-     * @param newManager  The ComponentManager that it will be loaded with
+     * @param newManager  The ServiceManager that it will be loaded with
      * @param fileName The input document's <code>File</code> name
      * @param markupLanguage The <code>MarkupLanguage</code> in which the input
      * document is written
@@ -56,7 +56,7 @@
      * Load a program built from an XML document written in a
      * <code>MarkupLanguage</code>
      *
-     * @param newManager  The ComponentManager that it will be loaded with
+     * @param newManager  The ServiceManager that it will be loaded with
      * @param source The input document's <code>File</code> name
      * @param markupLanguage The <code>MarkupLanguage</code> in which the input
      * document is written

Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xscript.xsl
==============================================================================
--- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xscript.xsl	(original)
+++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xscript.xsl	Sat Oct 23 11:15:02 2004
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- $Id: xscript.xsl,v 1.2 2004/03/17 11:28:22 crossley Exp $-->
+<!-- $Id$-->
 <!--
  *
  * Date: September 19, 2001
@@ -45,8 +45,8 @@
         XScriptVariableScope pageScope = new XScriptVariableScope();
         XScriptManager xscriptManager;
 
-        public void compose(ComponentManager manager) throws ComponentException {
-          super.compose(manager);
+        public void service(ServiceManager manager) throws ServiceException {
+          service(manager);
           xscriptManager = (XScriptManager)this.manager.lookup(XScriptManager.ROLE);
         }
 

Modified: cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
==============================================================================
--- cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl	(original)
+++ cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl	Sat Oct 23 11:15:02 2004
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- CVS $Id: xsp.xsl,v 1.3 2004/04/02 21:32:33 joerg Exp $-->
+<!-- CVS $Id$-->
 <!--
  * XSP Core logicsheet for the Java language
  *
@@ -59,16 +59,13 @@
     import java.util.List;
     import java.util.Stack;
 
-    //import org.w3c.dom.*;
     import org.xml.sax.InputSource;
     import org.xml.sax.SAXException;
     import org.xml.sax.helpers.AttributesImpl;
 
-    //import org.apache.avalon.framework.*;
-    import org.apache.avalon.framework.component.Component;
-    import org.apache.avalon.framework.component.ComponentException;
-    import org.apache.avalon.framework.component.ComponentManager;
-    import org.apache.avalon.framework.component.ComponentSelector;
+    import org.apache.avalon.framework.service.ServiceException;
+    import org.apache.avalon.framework.service.ServiceManager;
+    import org.apache.avalon.framework.service.ServiceSelector;
     import org.apache.avalon.framework.context.Context;
     //import org.apache.avalon.framework.util.*;
 

Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java	(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java	Sat Oct 23 11:15:02 2004
@@ -122,8 +122,8 @@
                                 Object role,
                                 Configuration configuration) 
     throws ConfigurationException {
-        // check for old class names
-        // TODO We can remove this as soon as we changed cocoon.roles and cocoon.xconf
+        // check for old excalibur class names - we only test against the selector
+        // implementation
         if ( "org.apache.cocoon.components.ExtendedComponentSelector".equals(className)) {
             className = CocoonServiceSelector.class.getName();
         }

Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java	(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java	Sat Oct 23 11:15:02 2004
@@ -55,7 +55,7 @@
     /** The default hint */
     protected String defaultHint;
 
-    /** Create the ComponentSelector */
+    /** Create the selector */
     public CocoonServiceSelector() {
         super(null);
     }
@@ -74,7 +74,7 @@
 
         if( this.disposed ) {
             throw new IllegalStateException(
-                "You cannot select a Component from a disposed ComponentSelector" );
+                "You cannot select a Component from a disposed ServiceSelector" );
         }
 
         if (hint == null) {
@@ -90,7 +90,7 @@
                 return this.parentSelector.select(hint);                
             }
             final String message = this.roleName
-                + ": ComponentSelector could not find the component for hint [" + hint + "]";
+                + ": ServiceSelector could not find the component for hint [" + hint + "]";
             if( this.getLogger().isDebugEnabled() ) {
                 this.getLogger().debug( message );
             }
@@ -106,7 +106,7 @@
             throw ce;
         } catch( final Exception e ) {
             final String message = this.roleName
-                + ": ComponentSelector could not access the Component for hint [" + hint + "]";
+                + ": ServiceSelector could not access the Component for hint [" + hint + "]";
 
             if( this.getLogger().isDebugEnabled() ) {
                 this.getLogger().debug( message, e );
@@ -120,7 +120,7 @@
                 component = this.parentSelector.select(hint);
             } else {
                 final String message = this.roleName
-                    + ": ComponentSelector could not find the component for hint [" + hint + "]";
+                    + ": ServiceSelector could not find the component for hint [" + hint + "]";
                 if( this.getLogger().isDebugEnabled() ) {
                     this.getLogger().debug( message );
                 }
@@ -345,7 +345,7 @@
     throws ServiceException {
         if( this.initialized ) {
             throw new ServiceException( hint.toString(),
-                "Cannot add components to an initialized ComponentSelector", null );
+                "Cannot add components to an initialized ServiceSelector", null );
         }
 
         try {
@@ -470,9 +470,6 @@
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.avalon.excalibur.component.ExcaliburComponentSelector#canRelease(org.apache.avalon.framework.component.Component)
-     */
     protected boolean canRelease(Object component) {
         if ( this.parentSelector != null &&
              this.parentSelector.canRelease(component) ) {

Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java	(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java	Sat Oct 23 11:15:02 2004
@@ -111,7 +111,7 @@
     /**
      * Retrieves a default class name for a role/hint combination.
      * This is only called when a role is mapped to a
-     * DefaultComponentSelector, and the configuration elements use
+     * CocoonServiceSelector, and the configuration elements use
      * shorthand names for the type of component.  If this RoleManager
      * does not have the match, and there is a parent RoleManager, the
      * parent will be asked to resolve the class name.

Modified: cocoon/trunk/src/documentation/xdocs/developing/avalon.xml
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/developing/avalon.xml	(original)
+++ cocoon/trunk/src/documentation/xdocs/developing/avalon.xml	Sat Oct 23 11:15:02 2004
@@ -75,14 +75,6 @@
           spoken, same movements made, etc.), but with each actor the exact
           nuances of the performance are different.</p>
       </s2>
-      <s2 title="ComponentManager (deprecated)">
-        <p>
-          <code>org.apache.avalon.framework.component.ComponentManager</code>
-        </p>
-        <p>This is the deprecated version of the <code>ServiceManager</code>. In
-          some places this component is still used, but over time all the usages
-          of this class will be replaced with the <code>ServiceManager</code>.</p>
-      </s2>
       <s2 title="Serviceable">
         <p>
           <code>org.apache.avalon.framework.service.Serviceable</code>
@@ -93,35 +85,6 @@
           if you need to use other components in your implementation, you
           have to implement <code>Serviceable</code> to be able to get other
           components.</p>
-      </s2>
-      <s2 title="Composable (deprecated)">
-        <p>
-          <code>org.apache.avalon.framework.component.Composable</code>
-        </p>
-        <p>This is the deprecated version of <code>Serviceable</code>.  In
-          some places this component is still used, but over time all the usages
-          of this class will be replaced with <code>Serviceable</code>.</p>
-      </s2>
-      <s2 title="Component">
-        <p>
-          <code>org.apache.avalon.framework.component.Component</code>
-        </p>
-        <p>This interface identifies classes that can be used as
-          <code>Components</code> by a <code>Composable</code>.</p>
-        <p>A <code>Component</code> is the basic building block of Avalon. When
-          a class implements this interface, it allows itself to be managed by a
-          <code>ComponentManager</code> and used by an outside element called a
-          <code>Composable</code>. The <code>Composable</code> must know what
-          type of <code>Component</code> it is accessing, so it will re-cast the
-          <code>Component</code> into the type it needs.</p>
-        <p>
-          <code>Component</code>s in Cocoon are e.g. those defined in
-          <code>cocoon.xconf</code>.
-        </p>
-        <note><code>Component</code> is only required in combination with
-          <code>ComponentManager</code> and <code>Composable</code>. As these
-          are still used in Cocoon, it's required to implement <code>Component</code>
-          in order to work properly everywhere.</note>
       </s2>
       <s2 title="Configuration">
         <p>

Modified: cocoon/trunk/src/documentation/xdocs/developing/datasources.xml
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/developing/datasources.xml	(original)
+++ cocoon/trunk/src/documentation/xdocs/developing/datasources.xml	Sat Oct 23 11:15:02 2004
@@ -147,15 +147,15 @@
       <p>
        No matter how you defined your DataSourceComponent, you access
        it the same way.  Because The DataSourceComponent is a Component,
-       your class needs to implement the Avalon Composable interface.  The
-       Avalon Framework will give your class a ComponentManager.  At that
+       your class needs to implement the Avalon Serviceable interface.  The
+       Avalon Framework will give your class a ServiceManager.  At that
        point, it is up to you how and when you pull the DataSourceComponent
-       out of the ComponentManager.
+       out of the ServiceManager.
       </p>
       <source>
        <![CDATA[
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceSelector;
 import org.apache.cocoon.Roles;
 import org.apache.avalon.excalibur.datasource.DataSourceComponent;
 
@@ -166,9 +166,9 @@
 
 private DataSourceComponent datasource;
 
-public void compose(ComponentManager manager) {
-    ComponentSelector selector =
-        (ComponentSelector) manager.lookup(Roles.DB_CONNECTION);
+public void service(ServiceManager manager) {
+    ServiceSelector selector =
+        (ServiceSelector) manager.lookup(Roles.DB_CONNECTION);
     this.datasource = (DataSourceComponent) selector.select("MyConnectionName");
 }
 

Modified: cocoon/trunk/src/documentation/xdocs/developing/deli.xml
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/developing/deli.xml	(original)
+++ cocoon/trunk/src/documentation/xdocs/developing/deli.xml	Sat Oct 23 11:15:02 2004
@@ -514,7 +514,7 @@
 <source>
 import org.apache.cocoon.components.deli.Deli;
 </source>
-<p>Then in compose(), initialize DELI:</p>
+<p>Then in service(), initialize DELI:</p>
 <source>
 if (this.manager.hasComponent(Deli.ROLE)) {
  if (this.getLogger().isDebugEnabled()) {
@@ -557,15 +557,15 @@
 import com.hp.hpl.deli.ProfileAttribute;
 </source>
 
-<p>Add code to initialize the compose method as before</p>
+<p>Add code to initialize the service method as before</p>
 <source>
-  public void compose(ComponentManager manager) throws ComponentException
+  public void service(ServiceManager manager) throws ServiceException
   {
     try
     {
       deli = (Deli)manager.lookup(Deli.ROLE);
     } 
-    catch(ComponentException ce)
+    catch(ServiceException ce)
     {
       logger.log(Level.ERROR, "Cannot get ref to Deli", ce);
       ce.printStackTrace();

Modified: cocoon/trunk/src/documentation/xdocs/developing/extending.xml
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/developing/extending.xml	(original)
+++ cocoon/trunk/src/documentation/xdocs/developing/extending.xml	Sat Oct 23 11:15:02 2004
@@ -92,9 +92,9 @@
 			 as basis for the <code>ServerPagesGenerator</code>, but it seems to be obsolete
 			 now?]</li>
 				<li>
-					<code>ComposerGenerator</code> - Can be used as base class if you
+					<code>ServiceableGenerator</code> - Can be used as base class if you
 			 want your <code>Generator</code> to be an <link href="avalon.html">Avalon
-		Composable</link>.</li>
+		Serviceable</link>.</li>
 				<li>
 					<code>ServletGenerator</code> - If you want to generate servlets.
 		  This is the base class for the <code>ServerPagesGenerator</code>.</li>

Modified: cocoon/trunk/src/documentation/xdocs/developing/httprequest.xml
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/developing/httprequest.xml	(original)
+++ cocoon/trunk/src/documentation/xdocs/developing/httprequest.xml	Sat Oct 23 11:15:02 2004
@@ -276,7 +276,7 @@
 			 <ol> 
 				<li>The <code>Handler</code> creates a <code>File</code> object
 				  with the asked URL.</li> 
-				<li>The <code>Manager</code> sets the <code>Composable</code> and the
+				<li>The <code>Manager</code> sets the <code>Serviceable</code> and the
 				  <code>Configuration</code> of the <code>Handler</code>. (These are
 				  <link href="avalon.html">Avalon</link> things).</li> 
 			 <li>If necessary, the <code>Manager</code> asks the
@@ -286,7 +286,7 @@
 				<ol> 
 				  <li>The <code>Handler</code> gets the
 					 <code>"program-generator"</code> <code>Component</code> from its
-					 <code>Composable</code>.</li> 
+					 <code>Serviceable</code>.</li> 
 				  <li>The <code>load()</code> method of this
 					 <code>ProgramGeneratorImpl</code> is called. </li> 
 				  <li>The <code>ProgramGeneratorImpl</code> gets the
@@ -322,7 +322,7 @@
 		<s2 title="Cocoon"> 
 		  <p><code>org.apache.cocoon.Cocoon</code></p> 
 		  <p>While this sounds to be the most important part of the Cocoon
-			 application, it is not. It is merely a Composable, meaning that it does some
+			 application, it is not. It is merely a Serviceable, meaning that it does some
 			 administrative work and gets other classes to work.</p> 
 		</s2> 
 		<s2 title="ConfigurationBuilder"> 
@@ -339,22 +339,6 @@
 		  <p>This is an <link href="avalon.html">Avalon</link> interface. It
 		  assigns classes to roles. If an object needs a class for a specific role, it
 		  can ask a Configuration which class it has to use.</p> 
-		</s2> 
-		<s2 title="DefaultComponentManager"> 
-		  <p><code>org.apache.avalon.DefaultComponentManager</code></p> 
-		  <p>Something that manages <link href="avalon.html">Avalon</link>
-		  Components.</p> 
-		</s2> 
-		<s2 title="Manager"> 
-		  <p><code>org.apache.cocoon.sitemap.Manager</code></p> 
-		  <p>This one manages the sitemap: it finds out if there exists a Handler
-			 for a sitemap, and if not, makes sure that one gets created.</p> 
-		</s2> 
-		<s2 title="Handler"> 
-		  <p><code>org.apache.cocoon.sitemap.Handler</code></p> 
-		  <p>A class that is responsible for dealing with sitemaps. It holds the
-			 sourcefile of the sitemap, and the compiled code for it. It checks whether the
-			 sitemap class that it contains is still valid, and if not, regenerates it.</p> 
 		</s2> 
 		<s2 title="ProgramGenerator"> 
 		  <p><code>org.apache.cocoon.components.language.programming.ProgrammingLanguage</code></p>

Modified: cocoon/trunk/src/documentation/xdocs/developing/parent-component-manager.xml
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/developing/parent-component-manager.xml	(original)
+++ cocoon/trunk/src/documentation/xdocs/developing/parent-component-manager.xml	Sat Oct 23 11:15:02 2004
@@ -18,47 +18,47 @@
 
     <document>
         <header>
-            <title>Parent Component Manager</title>
+            <title>Parent Service Manager</title>
             <version>0.9</version>
             <type>Technical document</type>
             <authors>
                 <person name="Leo Sutic" email="leo.sutic@inspireinfrastructure.com"/>
             </authors>
-            <abstract>This document describes how to use a parent component manager in Cocoon.</abstract>
+            <abstract>This document describes how to use a parent service manager in Cocoon.</abstract>
         </header>
         <body>
-            <s1 title="Parent Component Manager">
+            <s1 title="Parent Service Manager">
                 <p>When using Apache Cocoon it is sometimes neccessary to obtain
                     components from other sources than the <code>user.roles</code> file,
                     or preferable to have a common component manager for several web applications.</p>
                 
-                <p>The pattern chosen for Cocoon is the dynamic loading of a component manager class.
-                    The initialization parameter parent-component-manager in web.xml specifies a class
-                    that will be loaded, instantiated and used as a parent component manager for 
-                    Cocoon's component manager.</p>
+                <p>The pattern chosen for Cocoon is the dynamic loading of a service manager class.
+                    The initialization parameter parent-service-manager in web.xml specifies a class
+                    that will be loaded, instantiated and used as a parent service manager for 
+                    Cocoon's serivce manager.</p>
                 
                 <p>The recommended procedure is for the class, when it is initialized, to create a 
-                    delegate in the form of an <code>ExcaliburComponentManager</code>, configure it
+                    delegate in the form of an <code>CocoonServiceManager</code>, configure it
                     by looking up a <code>Configuration</code> object via JNDI, and delegate any requests to it.</p>
                 
-                <p>In order to provide a way to pass parameters to the parent component manager class 
-                    (the class specified in parent-component-manager), Cocoon will instantiate the class
+                <p>In order to provide a way to pass parameters to the parent service manager class 
+                    (the class specified in parent-service-manager), Cocoon will instantiate the class
                     via the constructor that takes a single <code>String</code> argument, passing
                     anything to the right of the first <code>'/'</code> in the parameter value to the
                     constructor. Subsequently Cocoon examines whether the class implements 
                     <code>org.apache.avalon.framework.logger.LogEnabled</code> and/or 
                     <code>org.apache.avalon.framework.activity.Initializable</code> and calls
                     <code>setLogger</code> and/or <code>initialize</code>, as appropriate.
-                    The instance is then used as a parent component manager.
+                    The instance is then used as a parent service manager.
                 </p>
                                 
                 <p>Since that didn't make much sense in itself, let's look at the sample.</p>
                 
                 <p>The goal is to define a component that can give us the time of day and
-                    let it be managed by a parent component manager.</p>
+                    let it be managed by a parent service manager.</p>
                 
                 <p>So, first we need to put a Configuration object into JNDI, and then 
-                    grab that object, use it to configure an ExcaliburComponentManager,
+                    grab that object, use it to configure an CocoonServiceManager,
                     and pass on any requests to that manager.</p>
                 
                 <s2 title="Step 1: Creating a configuration object">
@@ -121,7 +121,7 @@
     &lt;!-- For Database Driver: --&gt;
     @database-driver@
         
-    &lt;!-- For parent ComponentManager sample:
+    &lt;!-- For parent ServiceManager sample:
             This will cause the static initializer to run,
             and thus the Configuration object to be created
             and bound. --&gt;
@@ -130,26 +130,26 @@
 &lt;/init-param&gt;</source>
                 </s2>
                 
-                <s2 title="Step 2: Write the component manager">
+                <s2 title="Step 2: Write the service manager">
                 
                     <p>Now that the configuration object is sitting there waiting for us, let's craft
-                        the component manager. Please see the file org/apache/cocoon/samples/parentcm/ParentComponentManager.java
+                        the component manager. Please see the file org/apache/cocoon/samples/parentcm/ParentServiceManager.java
                         for an example. It is too much to paste in here.</p>
                 
                 </s2>
                     
-                <s2 title="Step 3: Tell Cocoon to use the component manager">
+                <s2 title="Step 3: Tell Cocoon to use the service manager">
                     <p>Change the web.xml file to:</p>
                     
                     <source>
 &lt;init-param&gt;
-  &lt;param-name&gt;parent-component-manager&lt;/param-name&gt;
-  &lt;param-value&gt;org.apache.cocoon.samples.parentcm.ParentComponentManager/(remove this line break)
+  &lt;param-name&gt;parent-service-manager&lt;/param-name&gt;
+  &lt;param-value&gt;org.apache.cocoon.samples.parentcm.ParentServiceManager/(remove this line break)
 org/apache/cocoon/samples/parentcm/ParentCMConfiguration&lt;/param-value&gt;
 &lt;/init-param&gt;</source>
                     
                     <p>Cocoon will now do the following: First, it will split the parameter value at the first slash,
-                        in this case ending up with the strings <code>"org.apache.cocoon.samples.parentcm.ParentComponentManager"</code>
+                        in this case ending up with the strings <code>"org.apache.cocoon.samples.parentcm.ParentServiceManager"</code>
                         and <code>"org/apache/cocoon/samples/parentcm/ParentCMConfiguration"</code>. The first string is the 
                         class to instantiate. The second is the parameter that will be passed to the constructor.</p>
                     
@@ -158,13 +158,13 @@
                         class in a manner similar to:</p>
                     
                     <source>
-ComponentManager cm = new 
-    org.apache.cocoon.samples.parentcm.ParentComponentManager(
+ServiceManager cm = new 
+    org.apache.cocoon.samples.parentcm.ParentServiceManager(
         "org/apache/cocoon/samples/parentcm/ParentCMConfiguration");</source>
                     
                     <p>
-                        After this Cocoon checks whether the parent component manager class implements <code>Initializable</code> and/or
-                        <code>LogEnabled</code>. Since the <code>ParentComponentManager</code> class implements both, Cocoon
+                        After this Cocoon checks whether the parent service manager class implements <code>Initializable</code> and/or
+                        <code>LogEnabled</code>. Since the <code>ParentServiceManager</code> class implements both, Cocoon
                         does the following (with simplification):
                     </p>
                     
@@ -172,13 +172,13 @@
 ((LogEnabled) cm).enableLogging(logger);
 ((Initializable) cm).initialize();</source>
                     
-                    <p>Finally, the instance is used as parent component manager of Cocoon's own component manager.</p>
+                    <p>Finally, the instance is used as parent service manager of Cocoon's own service manager.</p>
                 </s2>
                 
                 <s2 title="Step 4: Use the component">
                 
-                    <p>Cocoon components can now use the ComponentManager given to them by Cocoon to look up the
-                        component managed by the parent component manager:</p>
+                    <p>Cocoon components can now use the ServiceManager given to them by Cocoon to look up the
+                        component managed by the parent service manager:</p>
                 
                     <p>The following code was taken from org/apache/cocoon/samples/parentcm/Generator.java</p>
                 
@@ -190,7 +190,7 @@
     try {
         timeGiver = (Time) manager.lookup(Time.ROLE);
         this.time = timeGiver.getTime ();
-    } catch (ComponentException ce) {
+    } catch (ServiceException ce) {
         throw new ProcessingException ("Could not obtain current time.", ce);
     } finally {
         manager.release(timeGiver);
@@ -198,7 +198,7 @@
 }</source>
                 </s2>
                 
-                <p>And that concludes the tour. A parent component manager was initialized with a configuration
+                <p>And that concludes the tour. A parent service manager was initialized with a configuration
                     obtained via JNDI and its components used by a Cocoon generator.</p>
             </s1>
         </body>

Modified: cocoon/trunk/src/documentation/xdocs/dictionary.xml
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/dictionary.xml	(original)
+++ cocoon/trunk/src/documentation/xdocs/dictionary.xml	Sat Oct 23 11:15:02 2004
@@ -32,7 +32,7 @@
       Controls access to sitemap objects. It's in charge of reloading the sitemaps as necessary, and mapping sitemap filenames with sitemap objects. It operates on Environments by processing them with a sitemap.
     </class>
     <interface name="Sitemap">
-      An aggregate of avalon's Composable, Configurable, Contextualizable, and Modifiable interfaces, as well as the cocoon Processor interface.
+      An aggregate of avalon's Serviceable, Configurable, Contextualizable, and Modifiable interfaces, as well as the cocoon Processor interface.
     </interface>
     <class name="AbstractSitemap">
       Parent of the stylesheet-generated sitemap objects. It provides access to all of the cocoon components by role name. It keeps track of when the stylesheet was created. It loads components by name and configures them. It provides a utility substitute method for string manipulation.

Modified: cocoon/trunk/src/documentation/xdocs/performancetips.xml
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/performancetips.xml	(original)
+++ cocoon/trunk/src/documentation/xdocs/performancetips.xml	Sat Oct 23 11:15:02 2004
@@ -72,7 +72,7 @@
 
       <li>Search for messages such as "decommissioning instance of...". This reveals some 
       undersized pools which are corrected by tuning cocoon.xconf and sitemap.xmap. 
-      Undersized pools act like an object factory, plus the ComponentManager
+      Undersized pools act like an object factory, plus the ServiceManager
       overhead.</li>
    </ul> 
  </s1>

Modified: cocoon/trunk/src/documentation/xdocs/tutorial/RMIGenerator.java
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/tutorial/RMIGenerator.java	(original)
+++ cocoon/trunk/src/documentation/xdocs/tutorial/RMIGenerator.java	Sat Oct 23 11:15:02 2004
@@ -28,15 +28,15 @@
 import org.xml.sax.InputSource; 
 import org.xml.sax.SAXException; 
 
-// import of the classes used from Cocoon 2 
+// import of the classes used from Cocoon 
 import org.apache.cocoon.ProcessingException; 
-import org.apache.cocoon.generation.ComposerGenerator; 
+import org.apache.cocoon.generation.ServiceableGenerator; 
 
 // import of the classes from the 
 // Avalon Framework 
 import org.apache.avalon.framework.parameters.Parameters; 
 import org.apache.avalon.framework.parameters.ParameterException; 
-import org.apache.avalon.framework.component.ComponentException; 
+import org.apache.avalon.framework.service.ServiceException; 
 
 // needed for obtaining parser in Cocoon 
 import org.apache.excalibur.xml.sax.SAXParser;
@@ -45,8 +45,8 @@
  * <p>
  * The <code>RMIGenerator</code> is a generator that reads a String via RMI
  * and generates SAX events. 
- * The RMIGenerator extends the <code>ComposerGenerator</code> class. This is
- * done so we can access the <code>ComponentManager</code> to obtain a
+ * The RMIGenerator extends the <code>ServiceableGenerator</code> class. This is
+ * done so we can access the <code>ServiceManager</code> to obtain a
  * <code>SAXParser</code>.
  * </p>
  *
@@ -91,9 +91,9 @@
  *
  * @author <a href="mailto:Erwin.Hermans@cs.kuleuven.ac.be">Erwin Hermans</a>
  *         (Student Computer Science Department KULeuven, 2001-2002)
- * @version CVS $Id: RMIGenerator.java,v 1.3 2004/03/06 02:26:14 antonio Exp $
+ * @version CVS $Id$
  */
-public class RMIGenerator extends ComposerGenerator { 
+public class RMIGenerator extends ServiceableGenerator { 
 
 	/**
 	 * Generate SAX events based on the parameters and the source specified
@@ -160,7 +160,7 @@
 			parser.parse(inputSource,super.xmlConsumer); 
 		} catch (NotBoundException nbe) { 
 			throw new ProcessingException("Error looking up the RMI application server",nbe); 
-		} catch (ComponentException ce) { 
+		} catch (ServiceException ce) { 
 			throw new ProcessingException("Error obtaining a SAXParser",ce); 
 		} 
 	} 

Modified: cocoon/trunk/src/documentation/xdocs/tutorial/tutorial-generator.xml
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/tutorial/tutorial-generator.xml	(original)
+++ cocoon/trunk/src/documentation/xdocs/tutorial/tutorial-generator.xml	Sat Oct 23 11:15:02 2004
@@ -208,17 +208,16 @@
                The only direct implementation of this of interest to us is
                <code>AbstractGenerator</code>, which gives a basic level of
                functionality. Another option would have been
-               <code>ComposerGenerator</code>, which would give us the added
+               <code>ServiceableGenerator</code>, which would give us the added
                functionality of implenting the Avalon interface 
-               <code>Composable</code>
-
+               <code>Serviceable</code>
                , which would signal the container that handles all the
                components including our generator to give us a handle back to
-               the <code>ComponentManager</code>
+               the <code>ServiceManager</code>
                during the startup of the container. If we needed to lookup a
                pooled database connection, or some other standard or custom
                Cocoon component, this is what we would do. Most of the out
-               of the box Generators extend <code>ComposerGenerator</code>.
+               of the box Generators extend <code>ServiceableGenerator</code>.
                Other abstract Generators you may choose to extend include the
                poorly named (IMHO) <code>ServletGenerator</code>
 
@@ -464,8 +463,8 @@
                <p>First, notice that we now override the
                 <code>setup(...)</code> and <code>recycle()</code> methods
                 defined in <code>AbstractGenerator</code>.
-                The <code>ComponentManager</code> that handles the lifecycle of
-                all <code>component</code>s in Cocoon, calls
+                The <code>ServiceManager</code> that handles the lifecycle of
+                all <code>service</code>s in Cocoon, calls
                 <code>setup(..)</code> before each new call to
                 <code>generate()</code> to give the Generator information
                 about the current request and its environment, and calls
@@ -555,7 +554,7 @@
          <s2 title="Moving On">
          <p>From here, we will move on to cover handling ugly pseudo-xml
           (like real world html) with CDATA blocks, employing some of the
-          Avalon lifecycle method callbacks (Composable/Disposable), Database
+          Avalon lifecycle method callbacks (Serviceable/Disposable), Database
           access, and Caching.</p>
          <s3 title="The Employee SQL Example Reworked">
           <p>In the samples included with Cocoon, there is an example of a SQL
@@ -567,10 +566,10 @@
            this specific task is handled in the ESQL XSP example in just a few
            lines of code.  If your task is really this simple, there may be no
            need to create your own generator.</p>
-<source xml:space="preserve"><![CDATA[import org.apache.cocoon.generation.ComposerGenerator;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentSelector;
+<source xml:space="preserve"><![CDATA[import org.apache.cocoon.generation.ServiceableGenerator;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceSelector;
 import org.apache.avalon.excalibur.datasource.DataSourceComponent;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.avalon.framework.parameters.Parameters;
@@ -588,7 +587,7 @@
 import java.util.Date;
 import org.apache.avalon.framework.activity.Disposable;
 
-public class EmployeeGeneratorExample extends ComposerGenerator
+public class EmployeeGeneratorExample extends ServiceableGenerator
    implements Cacheable, Disposable
 {
 
@@ -610,10 +609,10 @@
 	}
 
 	
-	public void compose(ComponentManager manager) 
-	throws ComponentException{
-	  super.compose(manager);
-	  ComponentSelector selector = (ComponentSelector)
+	public void service(ServiceManager manager) 
+	throws ServiceException{
+	  super.service(manager);
+	  ServiceSelector selector = (ServiceSelector)
             manager.lookup(DataSourceComponent.ROLE + "Selector");
 	  this.datasource = (DataSourceComponent) selector.select("personnel");
 	}
@@ -741,13 +740,13 @@
       </s3>
 
       <s3 title="New Concepts">
-	<s4 title="Composable and Disposable">
-	<p>We've implemented the Avalon lifecycle interfaces Composable and 
+	<s4 title="Serviceable and Disposable">
+	<p>We've implemented the Avalon lifecycle interfaces Serviceable and 
     Disposable.  When Cocoon starts up (which happens when the servlet 
-    container starts up) the <code>ComponentManager</code> will call 
-    <code>compose(ComponentManager m)</code> for our component as it works 
+    container starts up) the <code>ServiceManager</code> will call 
+    <code>service(ServiceManager m)</code> for our component as it works 
     its way through all the components declared in the sitemap.  The handle 
-    to <code>ComponentManager</code> is used to look up any other Avalon 
+    to <code>ServiceManager</code> is used to look up any other Avalon 
     components that we need.  Lookups happen in an abstracted way using a 
     ROLE which enables us to change out implementations of each component 
     without affecting previously written code.  Our generator's ROLE by the 

Modified: cocoon/trunk/src/documentation/xdocs/tutorial/tutorial-rmi-generator.xml
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/tutorial/tutorial-rmi-generator.xml	(original)
+++ cocoon/trunk/src/documentation/xdocs/tutorial/tutorial-rmi-generator.xml	Sat Oct 23 11:15:02 2004
@@ -82,7 +82,7 @@
 					<ul>
 						<li>AbstractGenerator</li>
 						<li>AbstractServerPage</li>
-						<li>ComposerGenerator</li>
+						<li>ServiceableGenerator</li>
 						<li>ServletGenerator</li>
 					</ul>
   <p>					
@@ -92,8 +92,8 @@
 				<p>There is a hierarchy between these classes, namely:</p>
 					<ul>
 						<li>AbstractGenerator</li>
-						<li>ComposerGenerator extends AbstractGenerator</li>
-						<li>ServletGenerator extends ComposerGenerator</li>
+						<li>ServiceableGenerator extends AbstractGenerator</li>
+						<li>ServletGenerator extends ServiceableGenerator</li>
 						<li>AbstractServerPage extends ServletGenerator</li>
 					</ul>
 					<p>So the choice of which class to extend will depends mostly on which is the level of abstraction required by your generator.
@@ -203,13 +203,6 @@
 		</ul>
 	</li>
 	
-	<li>From <strong>org.apache.avalon.framework.component.Component</strong>:
-		<ul>
-			<li>None</li>
-		</ul>
-		When a class implements this interface, it allows itself to be managed by a ComponentManager and by an outside element called a Composable. The Composable must know what type of Component it is accessing, so it will re-cast the Component into the type it needs.
-	</li>
-	
 	<li>From <strong>AbstractGenerator</strong> itself:
 		<ul>
 			<li><code>void setup(SourceResolver resolver, Map objectmodel, String src, Parameters par)</code>: set the SourceResolver, objectmodel Map, the source and sitemap Parameters used to process the request (implemented).
@@ -311,15 +304,15 @@
 </p>
 				</s4>
 				
-				<s4 title="ComposerGenerator">
-					<p><strong>Can be used as base class if you want your Generator to be an Avalon Composable</strong><br/>
+				<s4 title="ServiceableGenerator">
+					<p><strong>Can be used as base class if you want your Generator to be an Avalon Serviceable</strong><br/>
 					</p>
 					
-					<p>This <strong>abstract class</strong> extends <strong>org.apache.cocoon.generation.AbstractGenerator</strong> and extends the interfaces <strong>org.apache.avalon.framework.component.Composable</strong> and <strong>org.apache.avalon.framework.activity.Disposable</strong>.</p><p>In addition to all the methods introduced in the <strong>AbstractGenerator</strong> class, these two interfaces introduce som new methods:</p>
+					<p>This <strong>abstract class</strong> extends <strong>org.apache.cocoon.generation.AbstractGenerator</strong> and extends the interfaces <strong>org.apache.avalon.framework.service.Serviceable</strong> and <strong>org.apache.avalon.framework.activity.Disposable</strong>.</p><p>In addition to all the methods introduced in the <strong>AbstractGenerator</strong> class, these two interfaces introduce som new methods:</p>
 <ul>
-	<li>From <strong>org.apache.avalon.framework.component.Composable</strong>:
+	<li>From <strong>org.apache.avalon.framework.service.Serviceable</strong>:
 		<ul>
-			<li><code>public void compose(ComponentManager componentManager)</code>: Pass the ComponentManager to the Composable. The Composable implementation should use the specified ComponentManager to acquire the components it needs for execution.				      
+			<li><code>public void service(ServiceManager serviceManager)</code>: Pass the ServiceManager to the Serviceable. The Serviceable implementation should use the specified ServiceManager to acquire the components it needs for execution.				      
 			</li>
 		</ul>
 	</li>
@@ -332,12 +325,12 @@
 		The Disposable interface is used when components need to deallocate and dispose resources prior to their destruction.
 	</li>
 	
-	<li>From <strong>ComposerGenerator</strong> itself:
+	<li>From <strong>ServiceableGenerator</strong> itself:
 		<ul>
-			<li><code>public void compose(ComponentManager componentManager)</code>: Pass the ComponentManager to the Composable. The Composable implementation should use the specified ComponentManager to acquire the components it needs for execution. (implemented)
+			<li><code>public void service(ServiceManager serviceManager)</code>: Pass the ServiceManager to the Serviceable. The Serviceable implementation should use the specified ServiceManager to acquire the components it needs for execution. (implemented)
 			</li>
 			
-			<li><code>public void dispose()</code>: The dispose operation is called at the end of a components lifecycle. Components use this method to release and destroy any resources that the Component owns. (implemented - implementation sets the ComponentManager to null)
+			<li><code>public void dispose()</code>: The dispose operation is called at the end of a components lifecycle. Components use this method to release and destroy any resources that the Component owns. (implemented - implementation sets the ServiceManager to null)
 			</li>
 		</ul>
 	</li>
@@ -348,9 +341,9 @@
 					
 					<p>Besides these methods, also a new variable is introduced:</p>
 <ul>
-	<li>From <strong>ComposerGenerator</strong> itself:
+	<li>From <strong>ServiceableGenerator</strong> itself:
 		<ul>
-			<li><code>protected ComponentManager manager = null</code>: the component manager instance, can be accessed via <strong>this.manager</strong>.
+			<li><code>protected ServiceManager manager = null</code>: the service manager instance, can be accessed via <strong>this.manager</strong>.
 			</li>
 		</ul>
 	</li>
@@ -361,7 +354,7 @@
 					<p><strong>If you want to generate servlets. This is the base class for the ServerPagesGenerator</strong><br/>
 					</p>
 					
-					<p>The <strong>ServletGenerator</strong> extends <strong>ComposerGenerator</strong>. 
+					<p>The <strong>ServletGenerator</strong> extends <strong>ServiceableGenerator</strong>. 
 					</p>
 
 					<p>We are not giving a more elaborate description of this component at this time. We have not experimented with this component and we would not like to risk making any wrong assumptions.
@@ -412,13 +405,6 @@
 		</ul>
 	</li>
 	
-	<li>From <strong>org.apache.avalon.framework.component.Component</strong>:
-		<ul>
-			<li>None</li>
-		</ul>
-		When a class implements this interface, it allows itself to be managed by a ComponentManager and by an outside element called a Composable. The Composable must know what type of Component it is accessing, so it will re-cast the Component into the type it needs.
-	</li>
-	
 	<li>From <strong>org.apache.cocoon.generation.Generator</strong> itself:
 		<ul>
 			<li><code>void generate()</code>: generate the SAX events to initialize a pipeline.
@@ -719,10 +705,10 @@
 						<li><code>void parse(InputSource in, ContentHandler consumer)</code>: the implementation of this method should parse the <strong>InputSource</strong> and send the SAX events to the <strong>consumer</strong>. The consumer can be an <strong>XMLConsumer</strong> or an object that implements <strong>LexicalHandler</strong> as well.
 						</li>
 					</ul>
-					<p>This interface defines a variable <strong>ROLE</strong> of the type String that is given the value <strong>org.apache.excalibur.xml.sax.SAXParser</strong>. This variable is used to ask the <strong>ComponentManager</strong>, which is accessed by <strong>this.manager</strong>, to <strong>lookup</strong> a <strong>Component</strong> that has that role. The returned Component is then casted to a <strong>SAXParser</strong> type. We can then apply the parse method to any <strong>org.xml.sax.InputSource</strong> object and to an object that implements the <strong>ContentHandler</strong> interface. Finally, we have to tell the ComponentManager that we are finished using the parser. This allows the ComponentManager to handle the End-Of-Life Lifecycle events associated with this Component.
+					<p>This interface defines a variable <strong>ROLE</strong> of the type String that is given the value <strong>org.apache.excalibur.xml.sax.SAXParser</strong>. This variable is used to ask the <strong>ServiceManager</strong>, which is accessed by <strong>this.manager</strong>, to <strong>lookup</strong> a <strong>Component</strong> that has that role. The returned Component is then casted to a <strong>SAXParser</strong> type. We can then apply the parse method to any <strong>org.xml.sax.InputSource</strong> object and to an object that implements the <strong>ContentHandler</strong> interface. Finally, we have to tell the ServiceManager that we are finished using the parser. This allows the ServiceManager to handle the End-Of-Life Lifecycle events associated with this Component.
 				</p>
 				
-				<p><strong>NOTE:</strong> if you want to use this method to obtain a parser, it would be better to extend the <strong>ComposerGenerator</strong> class, instead of the <strong>AbstractGenerator</strong> class. The ComposerGenerator is defined to make use of a <strong>ComponentManager</strong>, while this is not the case for the <strong>AbstractGenerator</strong> class. You should envisage the given code as part of a class that extends the <strong>ComposerGenerator</strong> class or one of its children.
+				<p><strong>NOTE:</strong> if you want to use this method to obtain a parser, it would be better to extend the <strong>ServiceableGenerator</strong> class, instead of the <strong>AbstractGenerator</strong> class. The ServiceableGenerator is defined to make use of a <strong>ServiceManager</strong>, while this is not the case for the <strong>AbstractGenerator</strong> class. You should envisage the given code as part of a class that extends the <strong>ServiceableGenerator</strong> class or one of its children.
 				</p>
 			</s3>
 		</s2>
@@ -1027,7 +1013,7 @@
 				<p>We now have defined the host, port and bindname parameters, but how can we access the value of these parameters in our code? The setup method has an argument Parameters par. It is via this argument that the parameters defined in the sitemap will be passed to the generator. This argument will be assigned to the <strong>parameters</strong> variable defined in AbstractGenerator. To obtain the value of each parameter we can invoke the following method on the parameters variable: <code>public java.lang.String getParameter(java.lang.String name)</code>. This method returns the value of the specified parameter, or throws an exception if there is no such parameter.
 				</p>
 				
-				<p>With all this in mind, we can finally build our configurable RMIGenerator. Also, this time we are going to extend the <strong>ComposerGenerator</strong> instead of the <strong>AbstractGenerator</strong> class. This way, we can make use of the <strong>ComponentManager</strong> to obtain a SAXParser. 
+				<p>With all this in mind, we can finally build our configurable RMIGenerator. Also, this time we are going to extend the <strong>ServiceableGenerator</strong> instead of the <strong>AbstractGenerator</strong> class. This way, we can make use of the <strong>ServiceManager</strong> to obtain a SAXParser. 
 				</p>
 				
 				<p>At this moment we decide that if there is no value given to the src attribute in the sitemap (<strong>source is null</strong>), we will invoke the <strong>sayHello</strong> method and otherwise the getResource with the appropriate parameter. When the value of the src attribute is the <strong>empty string</strong>, the <strong>getResource</strong> method is invoked, so this should be <strong>handled by the RMI server application</strong>.
@@ -1049,21 +1035,20 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-// import of the classes used from Cocoon 2
+// import of the classes used from Cocoon
 import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.generation.ComposerGenerator;
+import org.apache.cocoon.generation.ServiceableGenerator;
 
 // Avalon Framework
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.component.ComponentException;
 
 // needed for obtaining parser in Cocoon
 import org.apache.excalibur.xml.sax.SAXParser;
 
 import test.ServerFunctions;
 
-public class MyGenerator extends ComposerGenerator {
+public class MyGenerator extends ServiceableGenerator {
   public void generate () throws IOException, SAXException,
     ProcessingException {
       String host;
@@ -1134,7 +1119,7 @@
       } catch (NotBoundException nbe) {
 	throw new ProcessingException("
 	Error looking up the RMI server application",nbe);
-      } catch (ComponentException ce) {
+      } catch (ServiceException ce) {
         throw new ProcessingException("
         Error obtaining a SAXParser",ce);
       }
@@ -1167,7 +1152,7 @@
 	</s1>
 	
 	<s1 title="Future plans">
-		<p>The first version of this generator was written as a proof-of-concept. The latest version (as given here, extending the ComposerGenerator) only foresees in the <strong>generate</strong> method. There are a number of plans we still have to extend the functionality and thus usability of this generator:</p>
+		<p>The first version of this generator was written as a proof-of-concept. The latest version (as given here, extending the ServiceableGenerator) only foresees in the <strong>generate</strong> method. There are a number of plans we still have to extend the functionality and thus usability of this generator:</p>
 			<ul>
 				<li>allow passing of a (J)DOM document instance as a resource to our generator. JDOM does require an additional entry in the classpath.</li>
 				<li>supply a possibility for caching documents</li>

Modified: cocoon/trunk/src/documentation/xdocs/userdocs/concepts/sitemap.xml
==============================================================================
--- cocoon/trunk/src/documentation/xdocs/userdocs/concepts/sitemap.xml	(original)
+++ cocoon/trunk/src/documentation/xdocs/userdocs/concepts/sitemap.xml	Sat Oct 23 11:15:02 2004
@@ -787,9 +787,9 @@
      <p>
      Sitemap components (generators, transformers, etc.) in a sitemap are accessible 
      from a sub-sitemap by their names. This is due to the fact that each sitemap has its 
-     own SitemapComponentManager and they are arranged in the same hierarchical 
+     own Sitemap service manager and they are arranged in the same hierarchical 
      structure as the sitemaps are and thus knows which are their parent 
-     SitemapComponentManager and can ask it for a SitemapComponent it doesn't know about.
+     sitemap service manager and can ask it for a SitemapComponent it doesn't know about.
      </p>
     <s3 title="Use Cases">
      <p>

Modified: cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java	Sat Oct 23 11:15:02 2004
@@ -111,7 +111,7 @@
     private File workDir;
 
     /** The parent service manager. */
-    private ServiceManager parentComponentManager;
+    private ServiceManager parentServiceManager;
 
     /** flag for disposed or not */
     private boolean disposed = false;
@@ -156,7 +156,7 @@
      */
     public void service(ServiceManager manager)
     throws ServiceException {
-        this.parentComponentManager = manager;
+        this.parentServiceManager = manager;
     }
 
     /**
@@ -229,7 +229,7 @@
      * @exception Exception if an error occurs
      */
     public void initialize() throws Exception {
-        if (parentComponentManager != null) {
+        if (parentServiceManager != null) {
             // TODO: wrap parent component manager
             this.serviceManager = new CocoonServiceManager(null,
                                                                (ClassLoader) this.context.get(Constants.CONTEXT_CLASS_LOADER));
@@ -328,7 +328,7 @@
     /**
      * Configure this <code>Cocoon</code> instance.
      *
-     * @param startupManager an <code>ExcaliburComponentManager</code> value
+     * @param startupManager an <code>CocoonServiceManager</code> value
      * @exception ConfigurationException if an error occurs
      * @exception ContextException if an error occurs
      */

Modified: cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/cocoon.roles	Sat Oct 23 11:15:02 2004
@@ -31,7 +31,7 @@
 
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector">
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector">
   </role>
 
   <role name="org.apache.excalibur.source.SourceResolver"
@@ -160,7 +160,7 @@
 
   <role name="org.apache.avalon.excalibur.datasource.DataSourceComponentSelector"
         shorthand="datasources"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector">
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector">
 	<hint shorthand="jdbc" class="org.apache.avalon.excalibur.datasource.ResourceLimitingJdbcDataSource"/>
     <!-- hint shorthand="jdbc" class="org.apache.avalon.excalibur.datasource.JdbcDataSource"/ -->
     <hint shorthand="j2ee" class="org.apache.avalon.excalibur.datasource.J2eeDataSource"/>
@@ -200,7 +200,7 @@
   <!-- Control flow layer: the interpreters selector and continuations  manager -->
   <role name="org.apache.cocoon.components.flow.Interpreter" 
         shorthand="flow-interpreters"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.cocoon.components.flow.ContinuationsManager" 
         shorthand="continuations-manager"
@@ -209,11 +209,11 @@
   <!-- input/output modules -->
   <role name="org.apache.cocoon.components.modules.input.InputModuleSelector"
         shorthand="input-modules"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.cocoon.components.modules.output.OutputModuleSelector"
         shorthand="output-modules"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.cocoon.components.modules.input.SitemapVariableHolder"
         shorthand="global-variables"

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/CompilingInterpreter.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/flow/CompilingInterpreter.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/CompilingInterpreter.java	Sat Oct 23 11:15:02 2004
@@ -33,7 +33,7 @@
  * @author <a href="mailto:ovidiu@apache.org">Ovidiu Predescu</a>
  * @author <a href="mailto:crafterm@apache.org">Marcus Crafter</a>
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: CompilingInterpreter.java,v 1.3 2004/03/05 13:02:46 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public abstract class CompilingInterpreter 
 extends AbstractInterpreter {
@@ -46,8 +46,8 @@
      */
     protected Map compiledScripts = new HashMap();
 
-    /**
-     * Composable
+    /* (non-Javadoc)
+     * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager manager) throws ServiceException {
         super.service(manager);

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java	Sat Oct 23 11:15:02 2004
@@ -351,8 +351,8 @@
     /**
      * Setup an object so that it can access the information provided to regular components.
      * This is done by calling the various Avalon lifecycle interfaces implemented by the object, which
-     * are <code>LogEnabled</code>, <code>Contextualizable</code>, <code>ServiceManageable</code>,
-     * <code>Composable</code> (even if deprecated) and <code>Initializable</code>.
+     * are <code>LogEnabled</code>, <code>Contextualizable</code>, <code>Serviceable</code>
+     * and <code>Initializable</code>.
      * <p>
      * <code>Contextualizable</code> is of primary importance as it gives access to the whole object model
      * (request, response, etc.) through the {@link org.apache.cocoon.components.ContextHelper} class.
@@ -378,8 +378,8 @@
     /**
      * Create and setup an object so that it can access the information provided to regular components.
      * This is done by calling the various Avalon lifecycle interfaces implemented by the object, which
-     * are <code>LogEnabled</code>, <code>Contextualizable</code>, <code>ServiceManageable</code>,
-     * <code>Composable</code> (even if deprecated) and <code>Initializable</code>.
+     * are <code>LogEnabled</code>, <code>Contextualizable</code>, <code>Serviceable</code>
+     * and <code>Initializable</code>.
      * <p>
      * <code>Contextualizable</code> is of primary importance as it gives access to the whole object model
      * (request, response, etc.) through the {@link org.apache.cocoon.components.ContextHelper} class.
@@ -1470,15 +1470,6 @@
     public Map getObjectModel() {
         return ContextHelper.getObjectModel(currentCall.avalonContext);
     }
-
-//    /**
-//     * Get the current Sitemap's component manager
-//     * @return The component manager
-//     */
-//
-//    public ComponentManager getComponentManager() {
-//        return currentCall.componentManager;
-//    }
 
     private Context getAvalonContext() {
         return currentCall.avalonContext;

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/XMLFileModule.java	Sat Oct 23 11:15:02 2004
@@ -145,7 +145,7 @@
          * Returns the Document belonging to the configured
          * source. Transparently handles reloading and caching.
          *
-         * @param manager a <code>ComponentManager</code> value
+         * @param manager a <code>ServiceManager</code> value
          * @param resolver a <code>SourceResolver</code> value
          * @return a <code>Document</code> value
          * @exception Exception if an error occurs

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java	Sat Oct 23 11:15:02 2004
@@ -129,8 +129,8 @@
     /** The current Processor */
     protected Processor processor;
 
-    /**
-     * Composable Interface
+    /* (non-Javadoc)
+     * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service (ServiceManager manager)
     throws ServiceException {
@@ -191,8 +191,7 @@
     /**
      * Set the generator that will be used as the initial step in the pipeline.
      * The generator role is given : the actual <code>Generator</code> is fetched
-     * from the latest <code>ComponentManager</code> given by <code>compose()</code>
-     * or <code>recompose()</code>.
+     * from the latest <code>ServiceManager</code>.
      *
      * @param role the generator role in the component manager.
      * @param source the source where to produce XML from, or <code>null</code> if no
@@ -227,8 +226,7 @@
     /**
      * Add a transformer at the end of the pipeline.
      * The transformer role is given : the actual <code>Transformer</code> is fetched
-     * from the latest <code>ComponentManager</code> given by <code>compose()</code>
-     * or <code>recompose()</code>.
+     * from the latest <code>ServiceManager</code>.
      *
      * @param role the transformer role in the component manager.
      * @param source the source used to setup the transformer (e.g. XSL file), or

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/ProcessingPipeline.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/ProcessingPipeline.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/ProcessingPipeline.java	Sat Oct 23 11:15:02 2004
@@ -36,14 +36,10 @@
  * </ul>
  *
  * <p>
- * A <code>ProcessingPipeline</code> is <code>Recomposable</code> since the
- * <code>ComponentManager</code> used to get the generator, transformers etc.
- * depends on the pipeline assembly engine where they are defined (i.e. a given
- * sitemap file).
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Id: ProcessingPipeline.java,v 1.7 2004/07/15 12:49:49 sylvain Exp $
+ * @version CVS $Id$
  */
 public interface ProcessingPipeline {
 
@@ -57,8 +53,7 @@
     /**
      * Set the generator that will be used as the initial step in the pipeline.
      * The generator role is given : the actual <code>Generator</code> is fetched
-     * from the latest <code>ComponentManager</code> given by <code>compose()</code>
-     * or <code>recompose()</code>.
+     * from the latest <code>ServiceManager</code>.
      *
      * @param role the generator role in the component manager.
      * @param source the source where to produce XML from, or <code>null</code> if no
@@ -88,10 +83,9 @@
     /**
      * Add a transformer at the end of the pipeline.
      * The transformer role is given : the actual <code>Transformer</code> is fetched
-     * from the latest <code>ComponentManager</code> given by <code>compose()</code>
-     * or <code>recompose()</code>.
+     * from the latest <code>ServiceManager</code>.
      *
-     * @param role the transformer role in the component manager.
+     * @param role the transformer role in the service manager.
      * @param source the source used to setup the transformer (e.g. XSL file), or
      *        <code>null</code> if no source is given.
      * @param param the parameters for the transfomer.

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java	Sat Oct 23 11:15:02 2004
@@ -113,7 +113,7 @@
     }
 
     /* (non-Javadoc)
-     * @see org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
+     * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager manager) throws ServiceException {
         this.ownManager = manager;
@@ -190,7 +190,7 @@
     }
 
     /**
-     * Create a component manager that will be used for all <code>Composable</code>
+     * Create a service manager that will be used for all <code>Serviceable</code>
      * <code>ProcessingNodeBuilder</code>s and <code>ProcessingNode</code>s.
      * <p>
      * The default here is to simply return the manager set by <code>compose()</code>,

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ProcessingNodeBuilder.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ProcessingNodeBuilder.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ProcessingNodeBuilder.java	Sat Oct 23 11:15:02 2004
@@ -22,15 +22,8 @@
  * <p>
  * Lifecycle information : a <code>TreeBuilder</code> can be recycled
  * and used to build several <code>Processor</code>s, each one defining
- * a different <code>ComponentManager</code>. As a consequence, a
- * <code>ProcessingNodeBuilder</code> that needs access to the
- * <code>ComponentManager</code> of the <code>Processor</code> being
- * built must be not only <code>Composable</code> but also
- * <strong><code>Recomposable</code></strong>.
+ * a different <code>ServiceManager</code>.
  * <p>
- * Note however that being <code>Recomposable</code> doesn't forbid to be
- * <code>ThreadSafe</code> since a <code>ProcessingNodeBuilder</code> is
- * used by only one <code>TreeBuilder</code> at a time.
  *
  * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
  * @version CVS $Id$

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ProcessorComponentInfo.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ProcessorComponentInfo.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/ProcessorComponentInfo.java	Sat Oct 23 11:15:02 2004
@@ -29,7 +29,7 @@
  * <code>OutputComponentSelector</code>), which led to a strong dependency on the chosen component
  * container implementation.
  * 
- * @version CVS $Id: ProcessorComponentInfo.java,v 1.2 2004/07/16 12:36:45 sylvain Exp $
+ * @version CVS $Id$
  */
 public class ProcessorComponentInfo {
     

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeBuilder.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeBuilder.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/TreeBuilder.java	Sat Oct 23 11:15:02 2004
@@ -81,7 +81,7 @@
 
     /**
      * Get the type for a statement : it returns the 'type' attribute if present,
-     * and otherwhise the default hint for the <code>ComponentSelector</code> identified by
+     * and otherwhise the default hint for the <code>ServiceSelector</code> identified by
      * the role <code>role</code>.
      * 
      * @param statement the statement

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java	Sat Oct 23 11:15:02 2004
@@ -32,7 +32,7 @@
 /**
  *
  * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: PreparableMatchNode.java,v 1.9 2004/07/16 12:36:45 sylvain Exp $
+ * @version CVS $Id$
  */
 public class PreparableMatchNode extends SimpleSelectorProcessingNode
     implements ParameterizableProcessingNode, Initializable {
@@ -61,7 +61,7 @@
     }
 
     /* (non-Javadoc)
-     * @see org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
+     * @see org.apache.avalon.framework.activity.Initializable#initialize()
      */
     public void initialize() throws Exception {
 

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java	Sat Oct 23 11:15:02 2004
@@ -104,14 +104,11 @@
         setupMimeTypes(config, Serializer.ROLE, "serializers");
         setupMimeTypes(config, Reader.ROLE, "readers");
         
-        // Wrap the ComponentManager in a ServiceManager
-        ServiceManager result = newManager;
-        
         // Register manager and prevent further modifications
-        getProcessor().getComponentInfo().setServiceManager(result);
+        getProcessor().getComponentInfo().setServiceManager(newManager);
         getProcessor().getComponentInfo().lock();
         
-        return result;
+        return newManager;
     }
     
     /**

Modified: cocoon/trunk/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java	Sat Oct 23 11:15:02 2004
@@ -180,12 +180,8 @@
         super.recycle();
     }
 
-    /**
-     * Serviceable
-     *
-     * @param manager the ComponentManager
-     *
-     * @throws ServiceException in case a component could not be found
+    /* (non-Javadoc)
+     * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager manager)
     throws ServiceException {

Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java	Sat Oct 23 11:15:02 2004
@@ -18,18 +18,14 @@
 import org.apache.avalon.excalibur.logger.Log4JLoggerManager;
 import org.apache.avalon.excalibur.logger.LogKitLoggerManager;
 import org.apache.avalon.excalibur.logger.LoggerManager;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.ComponentManager;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
 import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.context.Contextualizable;
 import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.logger.LogEnabled;
 import org.apache.avalon.framework.logger.LogKitLogger;
 import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceManager;
 
 import org.apache.cocoon.Cocoon;
 import org.apache.cocoon.ConnectionResetException;
@@ -191,11 +187,11 @@
     protected ClassLoader classLoader = this.getClass().getClassLoader();
     protected boolean initClassLoader = false;
 
-    private String parentComponentManagerClass;
-    private String parentComponentManagerInitParam;
+    private String parentServiceManagerClass;
+    private String parentServiceManagerInitParam;
 
-    /** The parent ComponentManager, if any. Stored here in order to be able to dispose it in destroy(). */
-    private ComponentManager parentComponentManager;
+    /** The parent ServiceManager, if any. Stored here in order to be able to dispose it in destroy(). */
+    private ServiceManager parentServiceManager;
 
     protected String forceLoadParameter;
     protected String forceSystemProperty;
@@ -457,12 +453,12 @@
             }
         }
 
-        parentComponentManagerClass = getInitParameter("parent-component-manager", null);
-        if (parentComponentManagerClass != null) {
-            int dividerPos = parentComponentManagerClass.indexOf('/');
+        parentServiceManagerClass = getInitParameter("parent-service-manager", null);
+        if (parentServiceManagerClass != null) {
+            int dividerPos = parentServiceManagerClass.indexOf('/');
             if (dividerPos != -1) {
-                parentComponentManagerInitParam = parentComponentManagerClass.substring(dividerPos + 1);
-                parentComponentManagerClass = parentComponentManagerClass.substring(0, dividerPos);
+                parentServiceManagerInitParam = parentServiceManagerInitParam.substring(dividerPos + 1);
+                parentServiceManagerClass = parentServiceManagerClass.substring(0, dividerPos);
             }
         }
 
@@ -507,9 +503,7 @@
             this.instrumentManager.dispose();
         }
 
-        if (this.parentComponentManager != null && this.parentComponentManager instanceof Disposable) {
-            ((Disposable) this.parentComponentManager).dispose();
-        }
+        ContainerUtil.dispose( this.parentServiceManager );
     }
 
     /**
@@ -1311,41 +1305,33 @@
     }
 
     /**
-     * Instatiates the parent component manager, as specified in the
-     * parent-component-manager init parameter.
+     * Instatiates the parent service manager, as specified in the
+     * parent-service-manager init parameter.
      *
      * If none is specified, the method returns <code>null</code>.
      *
-     * @return the parent component manager, or <code>null</code>.
+     * @return the parent service manager, or <code>null</code>.
      */
-    protected synchronized ComponentManager getParentComponentManager() {
-        if (parentComponentManager != null && parentComponentManager instanceof Disposable) {
-            ((Disposable) parentComponentManager).dispose();
-        }
+    protected synchronized ServiceManager getParentServiceManager() {
+        ContainerUtil.dispose(this.parentServiceManager);
 
-        parentComponentManager = null;
-        if (parentComponentManagerClass != null) {
+        this.parentServiceManager = null;
+        if (parentServiceManagerClass != null) {
             try {
-                Class pcm = ClassUtils.loadClass(parentComponentManagerClass);
+                Class pcm = ClassUtils.loadClass(parentServiceManagerClass);
                 Constructor pcmc = pcm.getConstructor(new Class[]{String.class});
-                parentComponentManager = (ComponentManager) pcmc.newInstance(new Object[]{parentComponentManagerInitParam});
+                parentServiceManager = (ServiceManager) pcmc.newInstance(new Object[]{parentServiceManagerInitParam});
 
-                if (parentComponentManager instanceof LogEnabled) {
-                    ((LogEnabled) parentComponentManager).enableLogging(getLogger());
-                }
-                if (parentComponentManager instanceof Contextualizable) {
-                    ((Contextualizable) parentComponentManager).contextualize(this.appContext);
-                }
-                if (parentComponentManager instanceof Initializable) {
-                    ((Initializable) parentComponentManager).initialize();
-                }
+                ContainerUtil.enableLogging(parentServiceManager, getLogger());
+                ContainerUtil.contextualize(parentServiceManager, this.appContext);
+                ContainerUtil.initialize(parentServiceManager);
             } catch (Exception e) {
                 if (getLogger().isErrorEnabled()) {
                     getLogger().error("Could not initialize parent component manager.", e);
                 }
             }
         }
-        return parentComponentManager;
+        return parentServiceManager;
     }
 
     /**
@@ -1376,10 +1362,9 @@
             ContainerUtil.enableLogging(c, getCocoonLogger());
             c.setLoggerManager(getLoggerManager());
             ContainerUtil.contextualize(c, this.appContext);
-            // TODO - ServiceManager
-            final ComponentManager parent = this.getParentComponentManager();
+            final ServiceManager parent = this.getParentServiceManager();
             if (parent != null) {
-                ContainerUtil.compose(c, parent);
+                ContainerUtil.service(c, parent);
             }
             ContainerUtil.initialize(c);
             this.creationTime = System.currentTimeMillis();

Modified: cocoon/trunk/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java	Sat Oct 23 11:15:02 2004
@@ -38,7 +38,7 @@
  * An Abstract DOM Transformer, for use when a transformer needs a DOM-based
  * view of the document.
  * Subclass this interface and implement <code>transform(Document doc)</code>.
- * If you need a ComponentManager there is an instance variable
+ * If you need a ServiceManager there is an instance variable
  * <code>manager</code> for use.
  *
  * @author <a href="mailto:rossb@apache.org">Ross Burton</a>

Modified: cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractDOMFragment.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractDOMFragment.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/xml/AbstractDOMFragment.java	Sat Oct 23 11:15:02 2004
@@ -43,7 +43,7 @@
      * result of <code>toDOM()</code>.
      */
     public void toSAX(ContentHandler handler) throws SAXException {
-        // The ComponentManager is unknown here : use JAXP to create a document
+        // The ServiceManager is unknown here : use JAXP to create a document
         DocumentBuilder builder;
         try {
             builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();

Modified: cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/Configurator.java
==============================================================================
--- cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/Configurator.java	(original)
+++ cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/Configurator.java	Sat Oct 23 11:15:02 2004
@@ -23,14 +23,14 @@
 import java.util.Hashtable;
 
 /**
- * This class sets up the configuration used by the ParentComponentManager sample.
+ * This class sets up the configuration used by the ParentServiceManager sample.
  * The class also holds a reference to the initial context in which the configuration
  * is available.
  * <p>
  * The configuration is bound to <code>org/apache/cocoon/samples/parentcm/ParentCMConfiguration</code>.
  *
  * @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
- * @version CVS $Id: Configurator.java,v 1.2 2004/03/05 13:03:02 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class Configurator  {
 

Copied: cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentServiceManager.java (from rev 55379, cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentComponentManager.java)
==============================================================================
--- cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentComponentManager.java	(original)
+++ cocoon/trunk/src/samples/org/apache/cocoon/samples/parentcm/ParentServiceManager.java	Sat Oct 23 11:15:02 2004
@@ -15,29 +15,28 @@
  */
 package org.apache.cocoon.samples.parentcm;
 
-import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
 import org.apache.avalon.excalibur.naming.memory.MemoryInitialContextFactory;
 import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.context.DefaultContext;
 import org.apache.avalon.framework.logger.LogEnabled;
 import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.core.container.CocoonServiceManager;
 
 import javax.naming.Context;
 import java.util.Hashtable;
 
 /**
  * A sample parent component manager. This manager will lookup the configuration object
- * given by the initialization parameter in JNDI, use it to configure an ExcaliburComponentManager
+ * given by the initialization parameter in JNDI, use it to configure an CocoonServiceManager
  * and delegate any requests to it.
  *
  * @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
- * @version CVS $Id: ParentComponentManager.java,v 1.2 2004/03/05 13:03:02 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public class ParentComponentManager implements ComponentManager, LogEnabled, Initializable {
+public class ParentServiceManager implements ServiceManager, LogEnabled, Initializable {
 
     /**
      * Our logger.
@@ -53,17 +52,20 @@
      * The delegate that will be configured and provide the
      * functionality for this component manager.
      */
-    private final ExcaliburComponentManager delegate;
+    private final CocoonServiceManager delegate;
 
-    public ParentComponentManager(final String jndiName) {
+    public ParentServiceManager(final String jndiName) {
         this.jndiName = jndiName;
 
         // Initialize it here so we can let it be final.
-        this.delegate = new ExcaliburComponentManager();
+        this.delegate = new CocoonServiceManager(null, null);
     }
 
-    public boolean hasComponent(final String role) {
-        return delegate.hasComponent(role);
+    /* (non-Javadoc)
+     * @see org.apache.avalon.framework.service.ServiceManager#hasService(java.lang.String)
+     */
+    public boolean hasService(final String role) {
+        return delegate.hasService(role);
     }
 
     /**
@@ -88,7 +90,7 @@
 
         Configuration config = (Configuration) initialContext.lookup(this.jndiName);
 
-        // We ignore the setRoleManager call, as ExcaliburComponentManager handles that
+        // We ignore the setRoleManager call, as CocoonServiceManager handles that
         // in configure().
         this.delegate.enableLogging(logger);
         this.delegate.contextualize(new DefaultContext());
@@ -98,11 +100,17 @@
         this.logger.debug("Component manager successfully initialized.");
     }
 
-    public Component lookup(final String role) throws ComponentException {
+    /* (non-Javadoc)
+     * @see org.apache.avalon.framework.service.ServiceManager#lookup(java.lang.String)
+     */
+    public Object lookup(final String role) throws ServiceException {
         return this.delegate.lookup(role);
     }
 
-    public void release(final Component component) {
+    /* (non-Javadoc)
+     * @see org.apache.avalon.framework.service.ServiceManager#release(java.lang.Object)
+     */
+    public void release(final Object component) {
         this.delegate.release(component);
     }
 

Modified: cocoon/trunk/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.acting.ActionSelector"
         shorthand="actions"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -43,7 +43,7 @@
  <roles>
   <role name="org.apache.cocoon.components.modules.input.InputModuleSelector"
         shorthand="input-modules"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -56,7 +56,7 @@
 
   <role name="org.apache.cocoon.generation.GeneratorSelector"
         shorthand="generators"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.matching.MatcherSelector"
         shorthand="matchers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/HeaderMatcherTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/matching/HeaderMatcherTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/matching/HeaderMatcherTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.matching.MatcherSelector"
         shorthand="matchers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/ParameterMatcherTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/matching/ParameterMatcherTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/matching/ParameterMatcherTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.matching.MatcherSelector"
         shorthand="matchers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/RegexpURIMatcherTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/matching/RegexpURIMatcherTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/matching/RegexpURIMatcherTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.matching.MatcherSelector"
         shorthand="matchers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/RequestAttributeMatcherTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/matching/RequestAttributeMatcherTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/matching/RequestAttributeMatcherTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.matching.MatcherSelector"
         shorthand="matchers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/RequestParameterMatcherTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/matching/RequestParameterMatcherTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/matching/RequestParameterMatcherTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.matching.MatcherSelector"
         shorthand="matchers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.matching.MatcherSelector"
         shorthand="matchers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.matching.MatcherSelector"
         shorthand="matchers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -51,7 +51,7 @@
 
   <role name="org.apache.cocoon.selection.SelectorSelector"
         shorthand="selectors"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
  </roles>
 
  <components>

Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.java
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.java	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.java	Sat Oct 23 11:15:02 2004
@@ -63,7 +63,7 @@
     
     /** Testcase for augment transformation
      *
-     * @throws Exception iff ComponentManager enterEnvironment fails
+     * @throws Exception if ServiceManager enterEnvironment fails
      */
     public void testAugment1() throws Exception {
         getLogger().debug("testAugment1");

Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/transformation/AugmentTransformerTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -60,7 +60,7 @@
 
   <role name="org.apache.cocoon.transformation.TransformerSelector"
         shorthand="transformers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
         
   <role name="org.apache.excalibur.store.Store/TransientStore"
         shorthand="transient-store"

Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java	Sat Oct 23 11:15:02 2004
@@ -60,7 +60,7 @@
     
     /** Testcase for cinclude simple include
      *
-     * @throws Exception iff ComponentManager enterEnvironment fails
+     * @throws Exception if ServiceManager enterEnvironment fails
      */
     public void testCInclude1() throws Exception {
         getLogger().debug("testCInclude1");
@@ -88,7 +88,7 @@
     /**
      * Testcase for cinclude specifying element for wrapping included content
      *
-     * @throws Exception iff ComponentManager enterEnvironment fails
+     * @throws Exception if  enterEnvironment fails
      */
     public void testCInclude2() throws Exception {
         getLogger().debug("testCInclude2");
@@ -116,7 +116,7 @@
     /**
      * Testcase for cinclude specifying select attribute, selection elements from the included document
      *
-     * @throws Exception iff ComponentManager enterEnvironment fails
+     * @throws Exception if  enterEnvironment fails
      */
     public void testCInclude3() throws Exception {
         getLogger().debug("testCInclude3");

Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -75,7 +75,7 @@
 
   <role name="org.apache.cocoon.transformation.TransformerSelector"
         shorthand="transformers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.excalibur.store.Store/TransientStore"
         shorthand="transient-store"

Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.java
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.java	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.java	Sat Oct 23 11:15:02 2004
@@ -65,7 +65,7 @@
     
     /** Testcase for encode url transformation
      *
-     * @throws Exception iff ComponentManager enterEnvironment fails
+     * @throws Exception if ServiceManager enterEnvironment fails
      */
     public void testEncodeURL1() throws Exception {
         getLogger().debug("testEncodeURL1");
@@ -98,7 +98,7 @@
     
     /** Testcase for encode url transformation
      *
-     * @throws Exception iff ComponentManager enterEnvironment fails
+     * @throws Exception if ServiceManager enterEnvironment fails
      */
     public void testEncodeURL2() throws Exception {
         getLogger().debug("testEncodeURL2");

Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/transformation/EncodeURLTransformerTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -60,7 +60,7 @@
 
   <role name="org.apache.cocoon.transformation.TransformerSelector"
         shorthand="transformers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.excalibur.store.Store/TransientStore"
         shorthand="transient-store"

Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/FilterTransformerTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/transformation/FilterTransformerTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/transformation/FilterTransformerTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -63,7 +63,7 @@
 
   <role name="org.apache.cocoon.transformation.TransformerSelector"
         shorthand="transformers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.excalibur.store.Store/TransientStore"
         shorthand="transient-store"

Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java	Sat Oct 23 11:15:02 2004
@@ -60,7 +60,7 @@
     
     /** Testcase for i18n
      *
-     * @throws Exception iff ComponentManager enterEnvironment fails
+     * @throws Exception if ServiceManager enterEnvironment fails
      */
     public void testI18n1() throws Exception {
         getLogger().debug("testI18n1");
@@ -87,7 +87,7 @@
     
     /** Testcase for i18n
      *
-     * @throws Exception iff ComponentManager enterEnvironment fails
+     * @throws Exception if ServiceManager enterEnvironment fails
      */
     public void testI18n2() throws Exception {
         getLogger().debug("testI18n2");

Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -75,7 +75,7 @@
 
   <role name="org.apache.cocoon.transformation.TransformerSelector"
         shorthand="transformers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.excalibur.store.Store/TransientStore"
         shorthand="transient-store"

Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -63,7 +63,7 @@
 
   <role name="org.apache.cocoon.transformation.TransformerSelector"
         shorthand="transformers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.excalibur.store.Store/TransientStore"
         shorthand="transient-store"

Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java	Sat Oct 23 11:15:02 2004
@@ -60,7 +60,7 @@
     
     /** Testcase for xinclude simple include
      *
-     * @throws Exception iff ComponentManager enterEnvironment fails
+     * @throws Exception if ServiceManager enterEnvironment fails
      */
     public void testXInclude1() throws Exception {
         getLogger().debug("testXInclude1");
@@ -85,7 +85,7 @@
     }
     /** Testcase for xinclude simple text include
      *
-     * @throws Exception iff ComponentManager enterEnvironment fails
+     * @throws Exception if ServiceManager enterEnvironment fails
      */
     public void testXInclude2() throws Exception {
         getLogger().debug("testXInclude2");

Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.xtest
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.xtest	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.xtest	Sat Oct 23 11:15:02 2004
@@ -75,7 +75,7 @@
 
   <role name="org.apache.cocoon.transformation.TransformerSelector"
         shorthand="transformers"
-        default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
+        default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
 
   <role name="org.apache.excalibur.store.Store/TransientStore"
         shorthand="transient-store"

Modified: cocoon/trunk/src/webapp/WEB-INF/web.xml
==============================================================================
--- cocoon/trunk/src/webapp/WEB-INF/web.xml	(original)
+++ cocoon/trunk/src/webapp/WEB-INF/web.xml	Sat Oct 23 11:15:02 2004
@@ -173,7 +173,7 @@
     <init-param>
       <param-name>load-class</param-name>
       <param-value>
-        <!-- For parent ComponentManager sample:
+        <!-- For parent ServiceManager sample:
         org.apache.cocoon.samples.parentcm.Configurator -->
         <!-- For IBM WebSphere:
         com.ibm.servlet.classloader.Handler -->
@@ -278,7 +278,7 @@
     -->
 
     <!--
-      This parameter allows you to select the parent component manager.
+      This parameter allows you to select the parent service manager.
       The class will be instantiated via the constructor that takes a single
       String as a parameter. That String will be equal to the text after the
       '/'.
@@ -290,8 +290,8 @@
       sample, which will look up a configuration via JNDI at
       org/apache/cocoon/samples/parentcm/ParentCMConfiguration and use it.
     <init-param>
-      <param-name>parent-component-manager</param-name>
-      <param-value>org.apache.cocoon.samples.parentcm.ParentComponentManager/org/apache/cocoon/samples/parentcm/ParentCMConfiguration</param-value>
+      <param-name>parent-service-manager</param-name>
+      <param-value>org.apache.cocoon.samples.parentcm.ParentServiceManager/org/apache/cocoon/samples/parentcm/ParentCMConfiguration</param-value>
     </init-param>
     -->
 

Mime
View raw message