Author: cziegeler
Date: Sun Oct 24 13:26:19 2004
New Revision: 55464
Added:
cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.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/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/core/test/org/apache/cocoon/core/container/ContainerTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.xtest
cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.java
cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.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
cocoon/trunk/tools/targets/test-build.xml
Log:
Add helper test case class
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
Sun Oct 24 13:26:19 2004
@@ -20,14 +20,6 @@
shorthand="xml-parser"
default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.generation.GeneratorSelector"
shorthand="generators"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -41,13 +33,6 @@
<parameter name="stop-on-recoverable-error" value="true"/>
<parameter name="reuse-parsers" value="false"/>
</xml-parser>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<generators>
<component-instance class="org.apache.cocoon.generation.TextGenerator"
name="text"/>
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
Sun Oct 24 13:26:19 2004
@@ -24,14 +24,6 @@
shorthand="xmlizer"
default-class="org.apache.excalibur.xmlizer.DefaultXMLizer"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -59,13 +51,6 @@
<transient-store/>
<persistent-store/>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<transformers>
<component-instance
class="org.apache.cocoon.transformation.LexicalTransformer" name="lexer"/>
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
Sun Oct 24 13:26:19 2004
@@ -24,14 +24,6 @@
shorthand="xmlizer"
default-class="org.apache.excalibur.xmlizer.DefaultXMLizer"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -59,13 +51,6 @@
<transient-store/>
<persistent-store/>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<transformers logger="test">
<component-instance
class="org.apache.cocoon.transformation.ParserTransformer"
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
Sun Oct 24 13:26:19 2004
@@ -24,14 +24,6 @@
shorthand="xmlizer"
default-class="org.apache.excalibur.xmlizer.DefaultXMLizer"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -59,13 +51,6 @@
<transient-store/>
<persistent-store/>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<transformers>
<component-instance
class="org.apache.cocoon.transformation.PatternTransformer" name="pattern"/>
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
Sun Oct 24 13:26:19 2004
@@ -24,14 +24,6 @@
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.acting.ActionSelector"
shorthand="actions"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -47,13 +39,6 @@
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<flow-interpreters default="java">
<component-instance
class="org.apache.cocoon.components.flow.java.JavaInterpreter" name="java"
debug="true">
<include class="org.apache.cocoon.components.flow.java.test.Inner*"/>
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
Sun Oct 24 13:26:19 2004
@@ -22,16 +22,7 @@
class="org.apache.cocoon.environment.mock.MockContext"/>
</context>
-
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.acting.ActionSelector"
shorthand="actions"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -47,13 +38,6 @@
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<flow-interpreters default="javascript">
<component-instance
class="org.apache.cocoon.components.flow.java.JavaInterpreter" name="java"/>
<component-instance
class="org.apache.cocoon.components.flow.javascript.JavaScriptInterpreter"
name="javascript" debug="true"/>
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
Sun Oct 24 13:26:19 2004
@@ -21,14 +21,6 @@
shorthand="xml-parser"
default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.generation.GeneratorSelector"
shorthand="generators"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -42,11 +34,6 @@
<parameter name="stop-on-recoverable-error" value="true"/>
<parameter name="reuse-parsers" value="false"/>
</xml-parser>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
<generators logger="test">
<component-instance class="org.apache.cocoon.generation.XMidiGenerator"
name="midi"/>
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
Sun Oct 24 13:26:19 2004
@@ -21,14 +21,6 @@
shorthand="xml-parser"
default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.serialization.SerializerSelector"
shorthand="serializers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -42,11 +34,6 @@
<parameter name="stop-on-recoverable-error" value="true"/>
<parameter name="reuse-parsers" value="false"/>
</xml-parser>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
<serializers logger="test">
<component-instance class="org.apache.cocoon.serialization.XMidiSerializer"
name="midi"/>
Modified:
cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java
==============================================================================
---
cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java
(original)
+++
cocoon/trunk/src/core/test/org/apache/cocoon/core/container/ContainerTestCase.java
Sun Oct 24 13:26:19 2004
@@ -239,8 +239,18 @@
* into the context programmatically.
*/
protected void addContext( DefaultContext context ) {
+ // nothing to add here
}
+ /**
+ * This method may be overwritten by subclasses to add aditional
+ * components.
+ */
+ protected void addComponents( CocoonServiceManager manager)
+ throws ServiceException {
+ // subclasses can add components here
+ }
+
final private void setupManagers( final Configuration confCM,
final Configuration confRM,
final Context context )
@@ -257,6 +267,7 @@
ecManager.setRoleManager( roleManager );
ecManager.setLoggerManager( new DefaultLoggerManager(this.logger));
ecManager.configure( confCM );
+ this.addComponents( ecManager );
ecManager.initialize();
this.manager = ecManager;
}
Added: cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java
==============================================================================
--- (empty file)
+++ cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java Sun Oct 24
13:26:19 2004
@@ -0,0 +1,81 @@
+/*
+ * Copyright 1999-2004 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;
+
+import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.cocoon.core.container.CocoonServiceManager;
+import org.apache.cocoon.core.container.CocoonServiceSelector;
+import org.apache.cocoon.core.container.ContainerTestCase;
+import org.apache.excalibur.source.SourceResolver;
+import org.apache.excalibur.source.impl.ResourceSourceFactory;
+import org.apache.excalibur.source.impl.SourceResolverImpl;
+import org.apache.excalibur.source.impl.URLSourceFactory;
+
+/**
+ * Testcase for Cocoon.
+ *
+ * @version CVS $Id: SitemapComponentTestCase.java 55427 2004-10-24 11:38:37Z
cziegeler $
+ */
+public abstract class CocoonTestCase extends ContainerTestCase {
+
+ /* (non-Javadoc)
+ * @see
org.apache.cocoon.core.container.ContainerTestCase#addComponents(org.apache.cocoon.core.container.CocoonServiceManager)
+ */
+ protected void addComponents(CocoonServiceManager manager)
+ throws ServiceException {
+ super.addComponents(manager);
+ if ( this.addSourceFactories() ) {
+ // Create configuration for source-factories
+ final DefaultConfiguration df = new
DefaultConfiguration("source-factories");
+ DefaultConfiguration factory = new
DefaultConfiguration("component-instance");
+ factory.addAttribute("class",
ResourceSourceFactory.class.getName());
+ factory.addAttribute("name", "resource");
+ df.addChild(factory);
+ factory = new DefaultConfiguration("component-instance");
+ factory.addAttribute("class", URLSourceFactory.class.getName());
+ factory.addAttribute("name", "*");
+ df.addChild(factory);
+
manager.addComponent("org.apache.excalibur.source.SourceFactorySelector",
+ CocoonServiceSelector.class,
+ df);
+ }
+ if ( this.addSourceResolver() ) {
+ manager.addComponent(SourceResolver.ROLE,
+ SourceResolverImpl.class,
+ new DefaultConfiguration("", "-"));
+ }
+ }
+
+ /**
+ * This method should return true if the source factories should
+ * be added automatically. Can be overwritten by subclasses. The
+ * default is true.
+ */
+ protected boolean addSourceFactories() {
+ return true;
+ }
+
+ /**
+ * This method should return true if the source resolver should
+ * be added automatically. Can be overwritten by subclasses. The
+ * default is true.
+ */
+ protected boolean addSourceResolver() {
+ return true;
+ }
+}
Modified: cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
Sun Oct 24 13:26:19 2004
@@ -39,7 +39,6 @@
import org.apache.cocoon.components.flow.FlowHelper;
import org.apache.cocoon.components.flow.Interpreter;
import org.apache.cocoon.components.source.SourceResolverAdapter;
-import org.apache.cocoon.core.container.ContainerTestCase;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.mock.MockContext;
import org.apache.cocoon.environment.mock.MockRedirector;
@@ -68,7 +67,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Mark Leicester</a>
* @version CVS $Id$
*/
-public abstract class SitemapComponentTestCase extends ContainerTestCase {
+public abstract class SitemapComponentTestCase extends CocoonTestCase {
public final static Parameters EMPTY_PARAMS = Parameters.EMPTY_PARAMETERS;
Modified:
cocoon/trunk/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.java
==============================================================================
---
cocoon/trunk/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.java
(original)
+++
cocoon/trunk/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.java
Sun Oct 24 13:26:19 2004
@@ -22,7 +22,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.MockLogger;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.environment.mock.MockRequest;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceNotFoundException;
import org.jmock.Mock;
@@ -42,9 +41,6 @@
}
public void testExists() throws Exception {
-
- MockRequest request = new MockRequest();
-
String src = "don't care";
Parameters parameters = new Parameters();
@@ -64,9 +60,6 @@
}
public void testNotExists() throws Exception {
-
- MockRequest request = new MockRequest();
-
String src = "don't care";
Parameters parameters = new Parameters();
Modified:
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
==============================================================================
---
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
(original)
+++
cocoon/trunk/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
Sun Oct 24 13:26:19 2004
@@ -220,4 +220,18 @@
VariableResolver resolver = VariableResolverFactory.getResolver(expr,
getManager());
assertEquals("", resolver.resolve(context, getObjectModel()));
}
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.CocoonTestCase#addSourceFactories()
+ */
+ protected boolean addSourceFactories() {
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.cocoon.CocoonTestCase#addSourceResolver()
+ */
+ protected boolean addSourceResolver() {
+ return false;
+ }
}
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
Sun Oct 24 13:26:19 2004
@@ -21,14 +21,6 @@
shorthand="xml-parser"
default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.generation.GeneratorSelector"
shorthand="generators"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -42,11 +34,6 @@
<parameter name="stop-on-recoverable-error" value="true"/>
<parameter name="reuse-parsers" value="false"/>
</xml-parser>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
<generators>
<component-instance class="org.apache.cocoon.generation.FileGenerator"
name="file"/>
Modified:
cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.java
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.java
(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/matching/CookieMatcherTestCase.java
Sun Oct 24 13:26:19 2004
@@ -81,4 +81,13 @@
System.out.println(result);
assertNull( "Test if cookie does not exist", result );
}
+
+ protected boolean addSourceFactories() {
+ return true;
+ }
+
+ protected boolean addSourceResolver() {
+ return true;
+ }
+
}
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.matching.MatcherSelector"
shorthand="matchers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<matchers logger="test">
<component-instance class="org.apache.cocoon.matching.CookieMatcher"
name="cookie"/>
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.matching.MatcherSelector"
shorthand="matchers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<matchers logger="test">
<component-instance class="org.apache.cocoon.matching.ParameterMatcher"
name="parameter"/>
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.matching.MatcherSelector"
shorthand="matchers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<matchers logger="test">
<component-instance class="org.apache.cocoon.matching.RegexpURIMatcher"
name="regexp-uri"/>
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.matching.MatcherSelector"
shorthand="matchers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<matchers logger="test">
<component-instance
class="org.apache.cocoon.matching.RequestAttributeMatcher"
name="request-attribute"/>
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.matching.MatcherSelector"
shorthand="matchers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<matchers logger="test">
<component-instance
class="org.apache.cocoon.matching.RequestParameterMatcher"
name="request-parameter"/>
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.matching.MatcherSelector"
shorthand="matchers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<matchers logger="test">
<component-instance
class="org.apache.cocoon.matching.SessionAttributeMatcher"
name="session-attribute"/>
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.matching.MatcherSelector"
shorthand="matchers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<matchers logger="test">
<component-instance class="org.apache.cocoon.matching.WildcardURIMatcher"
name="wildcard-uri"/>
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance class="org.apache.cocoon.selection.BrowserSelector"
name="browser">
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance class="org.apache.cocoon.selection.CookieSelector"
name="cookie">
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance class="org.apache.cocoon.selection.ExceptionSelector"
name="exception">
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance class="org.apache.cocoon.selection.HeaderSelector"
name="header">
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance class="org.apache.cocoon.selection.HostSelector"
name="host">
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance class="org.apache.cocoon.selection.ParameterSelector"
name="parameter">
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance
class="org.apache.cocoon.selection.RegexpHeaderSelector"
name="regexp-header">
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance
class="org.apache.cocoon.selection.RegexpRequestParameterSelector"
name="regexp-request-parameter">
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance
class="org.apache.cocoon.selection.RequestAttributeSelector"
name="request-attribute">
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance
class="org.apache.cocoon.selection.RequestMethodSelector"
name="request-method">
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance
class="org.apache.cocoon.selection.RequestParameterSelector"
name="request-parameter">
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance
class="org.apache.cocoon.selection.ResourceExistsSelector"
name="resource-exists">
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance
class="org.apache.cocoon.selection.SessionAttributeSelector"
name="session-attribute">
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
Sun Oct 24 13:26:19 2004
@@ -16,27 +16,12 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.selection.SelectorSelector"
shorthand="selectors"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
</roles>
<components>
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<selectors logger="test">
<component-instance class="org.apache.cocoon.selection.SimpleSelector"
name="simple">
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
Sun Oct 24 13:26:19 2004
@@ -42,14 +42,6 @@
shorthand="xpath-processor"
default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -82,13 +74,6 @@
<transient-store/>
<persistent-store/>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<xslt-processor logger="core.xslt-processor">
<parameter name="use-store" value="true"/>
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
Sun Oct 24 13:26:19 2004
@@ -42,14 +42,6 @@
shorthand="xpath-processor"
default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -81,13 +73,6 @@
<transient-store/>
<persistent-store/>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<xslt-processor logger="core.xslt-processor">
<parameter name="use-store" value="true"/>
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
Sun Oct 24 13:26:19 2004
@@ -42,14 +42,6 @@
shorthand="xpath-processor"
default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -81,13 +73,6 @@
<transient-store/>
<persistent-store/>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<xslt-processor logger="core.xslt-processor">
<parameter name="use-store" value="true"/>
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
Sun Oct 24 13:26:19 2004
@@ -28,14 +28,6 @@
shorthand="xslt-processor"
default-class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -63,13 +55,6 @@
<transient-store/>
<persistent-store/>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<xslt-processor logger="core.xslt-processor">
<parameter name="use-store" value="true"/>
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
Sun Oct 24 13:26:19 2004
@@ -42,14 +42,6 @@
shorthand="xpath-processor"
default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -86,13 +78,6 @@
<transient-store/>
<persistent-store/>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<xslt-processor logger="core.xslt-processor">
<parameter name="use-store" value="true"/>
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
Sun Oct 24 13:26:19 2004
@@ -28,14 +28,6 @@
shorthand="xslt-processor"
default-class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -63,13 +55,6 @@
<transient-store/>
<persistent-store/>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<xslt-processor logger="core.xslt-processor">
<parameter name="use-store" value="true"/>
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
Sun Oct 24 13:26:19 2004
@@ -42,14 +42,6 @@
shorthand="xpath-processor"
default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
- <role name="org.apache.excalibur.source.SourceFactorySelector"
- shorthand="source-factories"
-
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
-
- <role name="org.apache.excalibur.source.SourceResolver"
- shorthand="source-resolver"
- default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
-
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformers"
default-class="org.apache.cocoon.core.container.CocoonServiceSelector"/>
@@ -81,13 +73,6 @@
<transient-store/>
<persistent-store/>
-
- <source-factories>
- <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
- <component-instance
class="org.apache.excalibur.source.impl.URLSourceFactory" name="*"/>
- </source-factories>
-
- <source-resolver
class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<xslt-processor logger="core.xslt-processor">
<parameter name="use-store" value="true"/>
Modified: cocoon/trunk/tools/targets/test-build.xml
==============================================================================
--- cocoon/trunk/tools/targets/test-build.xml (original)
+++ cocoon/trunk/tools/targets/test-build.xml Sun Oct 24 13:26:19 2004
@@ -49,6 +49,7 @@
<exclude name="**/Abstract*.class" />
<exclude name="**/SitemapComponentTestCase*"/>
<exclude name="**/ContainerTestCase*"/>
+ <exclude name="**/CocoonTestCase*"/>
</fileset>
</batchtest>
</junit>
