Author: cziegeler Date: Fri Jan 14 06:18:32 2005 New Revision: 125167 URL: http://svn.apache.org/viewcvs?view=rev&rev=125167 Log: Remove unused class Added: cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ConfigurationBuilder.java - copied, changed from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ConfigurationBuilder.java cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.java (contents, props changed) Removed: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ConfigurationBuilder.java 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/faces/WEB-INF/xconf/cocoon-faces-samples.xconf cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.xconf 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/taglib/WEB-INF/xconf/cocoon-taglib.xconf cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest cocoon/trunk/src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.xtest cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentEnvironment.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java cocoon/trunk/src/documentation/xdocs/developing/httprequest.xml cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.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/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/I18NTransformerTestCase.xtest cocoon/trunk/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest
Modified: cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.xtest&r2=125167 ============================================================================== --- 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 Fri Jan 14 06:18:32 2005 @@ -22,7 +22,7 @@ <role name="org.apache.cocoon.generation.GeneratorSelector" shorthand="generators" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.xtest&r1=125166&p2=cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.xtest&r2=125167 ============================================================================== --- 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 Fri Jan 14 06:18:32 2005 @@ -26,7 +26,7 @@ <role name="org.apache.cocoon.transformation.TransformerSelector" shorthand="transformers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> <role name="org.apache.excalibur.store.Store/TransientStore" shorthand="transient-store" Modified: cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.xtest&r1=125166&p2=cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.xtest&r2=125167 ============================================================================== --- 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 Fri Jan 14 06:18:32 2005 @@ -26,7 +26,7 @@ <role name="org.apache.cocoon.transformation.TransformerSelector" shorthand="transformers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> <role name="org.apache.excalibur.store.Store/TransientStore" shorthand="transient-store" Modified: cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.xtest&r1=125166&p2=cocoon/trunk/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.xtest&r2=125167 ============================================================================== --- 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 Fri Jan 14 06:18:32 2005 @@ -26,7 +26,7 @@ <role name="org.apache.cocoon.transformation.TransformerSelector" shorthand="transformers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> <role name="org.apache.excalibur.store.Store/TransientStore" shorthand="transient-store" Modified: cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces-samples.xconf Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces-samples.xconf?view=diff&rev=125167&p1=cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces-samples.xconf&r1=125166&p2=cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces-samples.xconf&r2=125167 ============================================================================== --- cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces-samples.xconf (original) +++ cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces-samples.xconf Fri Jan 14 06:18:32 2005 @@ -20,7 +20,7 @@ <!-- - CarStore Demo taglib: Custom components --> - <taglib name="http://java.sun.com/jsf/demo/components"; logger="sitemap.taglib.jsf.demo" class="org.apache.cocoon.core.container.CocoonServiceSelector"> + <taglib name="http://java.sun.com/jsf/demo/components"; logger="sitemap.taglib.jsf.demo" class="org.apache.cocoon.core.container.StandaloneServiceSelector"> <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> @@ -28,7 +28,7 @@ <!-- - CarStore Demo taglib: Custom validator --> - <taglib name="urn:carstoretaglibrary_1.1" logger="sitemap.taglib.jsf.carstore" class="org.apache.cocoon.core.container.CocoonServiceSelector"> + <taglib name="urn:carstoretaglibrary_1.1" logger="sitemap.taglib.jsf.carstore" class="org.apache.cocoon.core.container.StandaloneServiceSelector"> <tag name="format_validator" class="org.apache.cocoon.faces.samples.carstore.FormatValidatorTag" logger="sitemap.taglib.jsf.carstore"/> </taglib> Modified: cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.xconf Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.xconf?view=diff&rev=125167&p1=cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.xconf&r1=125166&p2=cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.xconf&r2=125167 ============================================================================== --- cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.xconf (original) +++ cocoon/trunk/src/blocks/faces/WEB-INF/xconf/cocoon-faces.xconf Fri Jan 14 06:18:32 2005 @@ -17,7 +17,7 @@ <components> <component-instance role="org.apache.cocoon.taglib.TagSelector" class="org.apache.cocoon.core.container.DefaultServiceSelector"> - <taglib name="http://java.sun.com/jsf/core"; logger="sitemap.taglib.jsf" class="org.apache.cocoon.core.container.CocoonServiceSelector"> + <taglib name="http://java.sun.com/jsf/core"; logger="sitemap.taglib.jsf" class="org.apache.cocoon.core.container.StandaloneServiceSelector"> <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"/> @@ -37,7 +37,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.core.container.CocoonServiceSelector"> + <taglib name="http://java.sun.com/jsf/html"; logger="sitemap.taglib.jsf.html" class="org.apache.cocoon.core.container.StandaloneServiceSelector"> <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/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest&r2=125167 ============================================================================== --- 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 Fri Jan 14 06:18:32 2005 @@ -23,7 +23,7 @@ <role name="org.apache.cocoon.generation.GeneratorSelector" shorthand="generators" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest&r1=125166&p2=cocoon/trunk/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest&r2=125167 ============================================================================== --- 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 Fri Jan 14 06:18:32 2005 @@ -23,7 +23,7 @@ <role name="org.apache.cocoon.serialization.SerializerSelector" shorthand="serializers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/blocks/scratchpad/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/scratchpad/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/blocks/scratchpad/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest&r1=125166&p2=cocoon/trunk/src/blocks/scratchpad/test/org/apache/cocoon/components/source/impl/CachingSourceTestCase.xtest&r2=125167 ============================================================================== Binary files. No diff available. Modified: cocoon/trunk/src/blocks/taglib/WEB-INF/xconf/cocoon-taglib.xconf Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/taglib/WEB-INF/xconf/cocoon-taglib.xconf?view=diff&rev=125167&p1=cocoon/trunk/src/blocks/taglib/WEB-INF/xconf/cocoon-taglib.xconf&r1=125166&p2=cocoon/trunk/src/blocks/taglib/WEB-INF/xconf/cocoon-taglib.xconf&r2=125167 ============================================================================== --- cocoon/trunk/src/blocks/taglib/WEB-INF/xconf/cocoon-taglib.xconf (original) +++ cocoon/trunk/src/blocks/taglib/WEB-INF/xconf/cocoon-taglib.xconf Fri Jan 14 06:18:32 2005 @@ -21,26 +21,26 @@ logger="core.jxpath"/> <component role="org.apache.cocoon.taglib.TagSelector" class="org.apache.cocoon.core.container.DefaultServiceSelector"> - <taglib name="urn:apache:taglib:core" class="org.apache.cocoon.core.container.CocoonServiceSelector" logger="sitemap.taglib.core"> + <taglib name="urn:apache:taglib:core" class="org.apache.cocoon.core.container.StandaloneServiceSelector" 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.core.container.CocoonServiceSelector" logger="sitemap.taglib.datetime"> + <taglib name="urn:apache:taglib:datetime" class="org.apache.cocoon.core.container.StandaloneServiceSelector" 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.core.container.CocoonServiceSelector" logger="sitemap.taglib.i18n"> + <taglib name="urn:apache:taglib:i18n" class="org.apache.cocoon.core.container.StandaloneServiceSelector" 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.core.container.CocoonServiceSelector" logger="sitemap.taglib.jxpath"> + <taglib name="urn:apache:taglib:jxpath:core" class="org.apache.cocoon.core.container.StandaloneServiceSelector" 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.core.container.CocoonServiceSelector" logger="sitemap.taglib.string"> + <taglib name="urn:apache:taglib:string" class="org.apache.cocoon.core.container.StandaloneServiceSelector" 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.core.container.CocoonServiceSelector" logger="sitemap.taglib.test"> + <taglib name="urn:apache:taglib:test" class="org.apache.cocoon.core.container.StandaloneServiceSelector" 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/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest (original) +++ cocoon/trunk/src/blocks/template/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -22,7 +22,7 @@ default-class="org.apache.excalibur.xml.impl.JaxpParser"/> <role name="org.apache.cocoon.generation.GeneratorSelector" shorthand="generators" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.xtest&r1=125166&p2=cocoon/trunk/src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.xtest&r2=125167 ============================================================================== Binary files. No diff available. Copied: cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ConfigurationBuilder.java (from r125148, cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ConfigurationBuilder.java) Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ConfigurationBuilder.java?view=diff&rev=125167&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ConfigurationBuilder.java&r1=125148&p2=cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ConfigurationBuilder.java&r2=125167 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ConfigurationBuilder.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ConfigurationBuilder.java Fri Jan 14 06:18:32 2005 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.core.container; +package org.apache.cocoon.configuration; import java.io.IOException; import java.io.InputStream; Added: cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.java?view=auto&rev=125167 ============================================================================== --- (empty file) +++ cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.java Fri Jan 14 06:18:32 2005 @@ -0,0 +1,52 @@ +/* + * Copyright 2005 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cocoon.configuration; + +import java.util.Properties; + +/** + * + * @version CVS $Revision: 1.33 $ $Date: 2004/04/03 23:55:54 $ + */ +public class Settings { + + protected String classloaderClassName; + protected boolean initClassloader; + protected String[] forceProperties; + protected String configuration; + protected String loggingConfiguration; + protected String cocoonLogger; + protected String logLevel; + protected String loggerClassName; + protected boolean allowReload; + protected String[] loadClasses; + protected boolean enableUploads; + protected String uploadDirectory; + protected boolean autosaveUploads; + protected boolean overwriteUploads; + protected long maxUploadSize; + protected String cacheDirectory; + protected String workDirectory; + protected String[] extraClasspaths; + protected String parentServiceManagerClassName; + protected boolean showTime; + protected boolean manageExceptions; + protected String formEncoding; + + public Settings(Properties properties) { + // ignore + } +} Deleted: /cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceSelector.java?view=auto&rev=125166 ============================================================================== Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentEnvironment.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentEnvironment.java?view=diff&rev=125167&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentEnvironment.java&r1=125166&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentEnvironment.java&r2=125167 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentEnvironment.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentEnvironment.java Fri Jan 14 06:18:32 2005 @@ -25,7 +25,7 @@ * The component enviromnent contains all objects necessary to create * a new component; it's just a "container" of objects. * - * @version CVS $Id: CocoonServiceSelector.java 123716 2004-12-30 14:16:00Z vgritsenko $ + * @version CVS $Id: 123716 2004-12-30 14:16:00Z vgritsenko $ */ public class ComponentEnvironment { Deleted: /cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ConfigurationBuilder.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ConfigurationBuilder.java?view=auto&rev=125166 ============================================================================== Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java?view=diff&rev=125167&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java&r1=125166&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java&r2=125167 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreServiceManager.java Fri Jan 14 06:18:32 2005 @@ -43,6 +43,7 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.components.ComponentInfo; +import org.apache.cocoon.configuration.ConfigurationBuilder; import org.apache.cocoon.core.container.handler.AbstractComponentHandler; import org.apache.cocoon.core.container.handler.AliasComponentHandler; import org.apache.cocoon.core.container.handler.ComponentHandler; Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java?view=diff&rev=125167&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java&r1=125166&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/RoleManager.java&r2=125167 ============================================================================== --- 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 Fri Jan 14 06:18:32 2005 @@ -111,7 +111,7 @@ /** * Retrieves a default class name for a role/key combination. * This is only called when a role is mapped to a - * CocoonServiceSelector, and the configuration elements use + * StandaloneServiceSelector, 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/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java?view=diff&rev=125167&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java&r1=125166&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java&r2=125167 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java Fri Jan 14 06:18:32 2005 @@ -45,7 +45,7 @@ protected ServiceManager serviceManager; /** The parent selector, if any */ - protected CocoonServiceSelector parentSelector; + protected StandaloneServiceSelector parentSelector; /** The parent locator, if any */ protected ServiceManager parentLocator; @@ -427,7 +427,7 @@ * @param locator * @throws ServiceException */ - private void setParentLocator(ServiceManager locator, String role) + void setParentLocator(ServiceManager locator, String role) throws ServiceException { if (this.parentSelector != null) { throw new ServiceException(null, "Parent selector is already set"); @@ -438,8 +438,8 @@ // Get the parent, unwrapping it as far as needed Object parent = locator.lookup(role); - if (parent instanceof CocoonServiceSelector) { - this.parentSelector = (CocoonServiceSelector)parent; + if (parent instanceof StandaloneServiceSelector) { + this.parentSelector = (StandaloneServiceSelector)parent; } else { throw new IllegalArgumentException("Parent selector is not an extended component selector (" + parent + ")"); } Modified: cocoon/trunk/src/documentation/xdocs/developing/httprequest.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/documentation/xdocs/developing/httprequest.xml?view=diff&rev=125167&p1=cocoon/trunk/src/documentation/xdocs/developing/httprequest.xml&r1=125166&p2=cocoon/trunk/src/documentation/xdocs/developing/httprequest.xml&r2=125167 ============================================================================== --- cocoon/trunk/src/documentation/xdocs/developing/httprequest.xml (original) +++ cocoon/trunk/src/documentation/xdocs/developing/httprequest.xml Fri Jan 14 06:18:32 2005 @@ -131,7 +131,7 @@ <component role="org.apache.cocoon.components.language.markup.MarkupLanguageSelector" - class="org.apache.cocoon.core.container.CocoonServiceSelector"> + class="org.apache.cocoon.core.container.StandaloneServiceSelector"> <component-instance name="xsp" class="org.apache.cocoon.components.language.markup.xsp.XSPMarkupLanguage"> <parameter name="prefix" value="xsp"/> Modified: cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java?view=diff&rev=125167&p1=cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java&r1=125166&p2=cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java&r2=125167 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java Fri Jan 14 06:18:32 2005 @@ -42,7 +42,7 @@ import org.apache.cocoon.components.container.ComponentContext; import org.apache.cocoon.components.source.SourceUtil; import org.apache.cocoon.components.source.impl.DelayedRefreshSourceWrapper; -import org.apache.cocoon.core.container.ConfigurationBuilder; +import org.apache.cocoon.configuration.ConfigurationBuilder; import org.apache.cocoon.core.container.RoleManager; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.ObjectModelHelper; Modified: cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java?view=diff&rev=125167&p1=cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java&r1=125166&p2=cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java&r2=125167 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/DefaultTreeBuilder.java Fri Jan 14 06:18:32 2005 @@ -35,7 +35,7 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.ServiceSelector; import org.apache.avalon.framework.service.Serviceable; -import org.apache.cocoon.core.container.CocoonServiceSelector; +import org.apache.cocoon.core.container.StandaloneServiceSelector; import org.apache.cocoon.components.LifecycleHelper; import org.apache.cocoon.components.source.SourceUtil; import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory; @@ -336,7 +336,7 @@ // Create & initialize the NodeBuilder selector. { - CocoonServiceSelector selector = new CocoonServiceSelector() { + StandaloneServiceSelector selector = new StandaloneServiceSelector() { protected String getComponentInstanceName() { return "node"; } Modified: cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java (original) +++ cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java Fri Jan 14 06:18:32 2005 @@ -20,7 +20,7 @@ import org.apache.avalon.framework.configuration.DefaultConfiguration; import org.apache.avalon.framework.service.ServiceException; import org.apache.cocoon.core.container.CoreServiceManager; -import org.apache.cocoon.core.container.CocoonServiceSelector; +import org.apache.cocoon.core.container.StandaloneServiceSelector; import org.apache.cocoon.core.container.ContainerTestCase; import org.apache.excalibur.source.SourceResolver; import org.apache.excalibur.source.impl.ResourceSourceFactory; @@ -52,7 +52,7 @@ factory.setAttribute("name", "*"); df.addChild(factory); manager.addComponent("org.apache.excalibur.source.SourceFactorySelector", - CocoonServiceSelector.class.getName(), + StandaloneServiceSelector.class.getName(), df); } if ( this.addSourceResolver() ) { Modified: cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java (original) +++ cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java Fri Jan 14 06:18:32 2005 @@ -41,7 +41,7 @@ import org.apache.cocoon.components.flow.Interpreter; import org.apache.cocoon.components.source.SourceResolverAdapter; import org.apache.cocoon.core.container.CoreServiceManager; -import org.apache.cocoon.core.container.CocoonServiceSelector; +import org.apache.cocoon.core.container.StandaloneServiceSelector; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.internal.EnvironmentHelper; import org.apache.cocoon.environment.mock.MockContext; @@ -146,7 +146,7 @@ factory.setAttribute("name", key); df.addChild(factory); manager.addComponent(typeClassName + "Selector", - CocoonServiceSelector.class.getName(), + StandaloneServiceSelector.class.getName(), df); } } Modified: cocoon/trunk/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.excalibur.source.SourceFactorySelector" shorthand="source-factories" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> <role name="org.apache.excalibur.source.SourceResolver" shorthand="source-resolver" @@ -26,7 +26,7 @@ <role name="org.apache.cocoon.acting.ActionSelector" shorthand="actions" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest&r2=125167 ============================================================================== --- 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 Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.components.modules.input.InputModuleSelector" shorthand="input-modules" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.matching.MatcherSelector" shorthand="matchers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/HeaderMatcherTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/matching/HeaderMatcherTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/matching/HeaderMatcherTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/matching/HeaderMatcherTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/matching/HeaderMatcherTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/matching/HeaderMatcherTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.excalibur.source.SourceFactorySelector" shorthand="source-factories" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> <role name="org.apache.excalibur.source.SourceResolver" shorthand="source-resolver" @@ -26,7 +26,7 @@ <role name="org.apache.cocoon.matching.MatcherSelector" shorthand="matchers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/ParameterMatcherTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/matching/ParameterMatcherTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/matching/ParameterMatcherTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/matching/ParameterMatcherTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/matching/ParameterMatcherTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/matching/ParameterMatcherTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.matching.MatcherSelector" shorthand="matchers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/RegexpURIMatcherTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/matching/RegexpURIMatcherTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/matching/RegexpURIMatcherTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/matching/RegexpURIMatcherTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/matching/RegexpURIMatcherTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/matching/RegexpURIMatcherTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.matching.MatcherSelector" shorthand="matchers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/RequestAttributeMatcherTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/matching/RequestAttributeMatcherTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/matching/RequestAttributeMatcherTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/matching/RequestAttributeMatcherTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/matching/RequestAttributeMatcherTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/matching/RequestAttributeMatcherTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.matching.MatcherSelector" shorthand="matchers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/RequestParameterMatcherTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/matching/RequestParameterMatcherTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/matching/RequestParameterMatcherTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/matching/RequestParameterMatcherTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/matching/RequestParameterMatcherTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/matching/RequestParameterMatcherTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.matching.MatcherSelector" shorthand="matchers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/matching/SessionAttributeMatcherTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.matching.MatcherSelector" shorthand="matchers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.matching.MatcherSelector" shorthand="matchers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -18,7 +18,7 @@ <roles> <role name="org.apache.cocoon.selection.SelectorSelector" shorthand="selectors" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> </roles> <components> Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -41,7 +41,7 @@ <role name="org.apache.cocoon.transformation.TransformerSelector" shorthand="transformers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> <role name="org.apache.excalibur.store.Store/TransientStore" shorthand="transient-store" Modified: cocoon/trunk/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest?view=diff&rev=125167&p1=cocoon/trunk/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest&r1=125166&p2=cocoon/trunk/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest&r2=125167 ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest (original) +++ cocoon/trunk/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest Fri Jan 14 06:18:32 2005 @@ -30,7 +30,7 @@ <role name="org.apache.cocoon.transformation.TransformerSelector" shorthand="transformers" - default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/> + default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/> <role name="org.apache.excalibur.store.Store/TransientStore" shorthand="transient-store"
