Author: cziegeler
Date: Sat Oct 23 11:43:31 2004
New Revision: 55394
Modified:
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/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
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/scratchpad/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest
cocoon/trunk/src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.xtest
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
cocoon/trunk/src/documentation/xdocs/developing/httprequest.xml
cocoon/trunk/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.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.xtest
cocoon/trunk/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest
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.xtest
cocoon/trunk/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest
cocoon/trunk/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.xtest
Log:
Remove all uses of Component, Composable, ComponentException,
ComponentSelector, Part II
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:43:31 2004
@@ -47,7 +47,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -51,7 +51,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -51,7 +51,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -51,7 +51,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
Modified:
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
==============================================================================
---
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
(original)
+++
cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
Sat Oct 23 11:43:31 2004
@@ -166,12 +166,12 @@
<xsl:call-template name="variables"><xsl:with-param name="modifier"
select="'private'"/></xsl:call-template>
<xsl:if test=".//esql:connection/esql:pool">
- private static ComponentSelector _esql_selector = null;
+ private static ServiceSelector _esql_selector = null;
- protected ComponentSelector _esql_get_selector() throws
org.apache.avalon.framework.component.ComponentException {
+ protected ServiceSelector _esql_get_selector() throws
org.apache.avalon.framework.component.ComponentException {
if (_esql_selector == null) {
try {
- _esql_selector = (ComponentSelector)
manager.lookup(DataSourceComponent.ROLE + "Selector");
+ _esql_selector = (ServiceSelector)
manager.lookup(DataSourceComponent.ROLE + "Selector");
} catch (ComponentException cme) {
getLogger().error("Could not look up the datasource
component", cme);
}
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:43:31 2004
@@ -49,7 +49,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -49,7 +49,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -48,7 +48,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -48,7 +48,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
Modified:
cocoon/trunk/src/blocks/scratchpad/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest
==============================================================================
Binary files. No diff available.
Modified:
cocoon/trunk/src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.xtest
==============================================================================
Binary files. No diff available.
Modified:
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
==============================================================================
---
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
(original)
+++
cocoon/trunk/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Sat Oct 23 11:43:31 2004
@@ -68,7 +68,7 @@
protected boolean watchSource = false;
/**
- * The ComponentSelector for programs. Caches Program by program
+ * The service selector for programs. Caches Program by program
* source file.
*/
protected GeneratorSelector cache;
@@ -128,7 +128,7 @@
/**
* Set the global component manager. This method also sets the
- * <code>ComponentSelector</code> used as language factory for both markup
+ * <code>ServiceSelector</code> used as language factory for both markup
* and programming languages.
* @param manager The global component manager
*/
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:43:31 2004
@@ -126,26 +126,12 @@
<component role="org.apache.cocoon.components.store.Store"
class="org.apache.cocoon.components.store.MemoryStore"/>
- <component
-
role="org.apache.cocoon.components.language.programming.ProgrammingLanguageSelector"
- class="org.apache.cocoon.CocoonComponentSelector">
- <component-instance name="java"
-
class="org.apache.cocoon.components.language.programming.java.JavaLanguage">
- <parameter name="compiler"
- value="org.apache.cocoon.components.language.programming.java.Javac"/>
- <parameter name="code-formatter"
-
value="org.apache.cocoon.components.language.programming.java.JstyleFormatter"/>
- <parameter name="class-loader"
- value="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
- </component-instance>
- </component>
-
<component
role="org.apache.cocoon.components.classloader.ClassLoaderManager"
class="org.apache.cocoon.components.classloader.ClassLoaderManagerImpl"/>
<component
role="org.apache.cocoon.components.language.markup.MarkupLanguageSelector"
- class="org.apache.cocoon.CocoonComponentSelector">
+ class="org.apache.cocoon.core.container.CocoonServiceSelector">
<component-instance name="xsp"
class="org.apache.cocoon.components.language.markup.xsp.XSPMarkupLanguage">
<parameter name="prefix" value="xsp"/>
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -48,7 +48,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -43,7 +43,7 @@
<roles>
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -52,7 +52,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -67,7 +67,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -52,7 +52,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -55,7 +55,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -67,7 +67,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -55,7 +55,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
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:43:31 2004
@@ -67,7 +67,7 @@
<role name="org.apache.excalibur.source.SourceFactorySelector"
shorthand="source-factories"
-
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"/>
+
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
<role name="org.apache.excalibur.source.SourceResolver"
shorthand="source-resolver"
