cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: rev 55454 - in cocoon/branches/BRANCH_2_1_X: . lib lib/core src/blocks/chaperon/test/org/apache/cocoon/generation src/blocks/chaperon/test/org/apache/cocoon/transformation src/blocks/forms/test/org/apache/cocoon/forms/datatype src/blocks/midi/test/org/apache/cocoon/generation src/blocks/midi/test/org/apache/cocoon/serialization src/blocks/webdav/test/org/apache/cocoon/components/source/impl src/blocks/woody/test/org/apache/cocoon/woody/datatype src/test/org/apache/cocoon src/test/org/apache/cocoon/acting src/test/org/apache/cocoon/components/source src/test/org/apache/cocoon/components/treeprocessor/variables src/test/org/apache/cocoon/core src/test/org/apache/cocoon/core/container src/test/org/apache/cocoon/generation src/test/org/apache/cocoon/matching src/test/org/apache/cocoon/selection src/test/org/apache/cocoon/transformation tools/targets
Date Sun, 24 Oct 2004 18:02:40 GMT
Author: cziegeler
Date: Sun Oct 24 11:02:39 2004
New Revision: 55454

Added:
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/core/
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/core/container/
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/core/container/ContainerTestCase.java
Removed:
   cocoon/branches/BRANCH_2_1_X/lib/core/excalibur-testcase-1.2.jar
Modified:
   cocoon/branches/BRANCH_2_1_X/gump.xml
   cocoon/branches/BRANCH_2_1_X/lib/jars.xml
   cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/EnumSelectionListTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/EnumSelectionListTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/SitemapComponentTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HostSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/FilterTransformerTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/FilterTransformerTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java
   cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.xtest
   cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml
   cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml
Log:
Sync testing with 2.2:
- add block tests to eclipse project
- remove dependency to excalibur-testcase

Modified: cocoon/branches/BRANCH_2_1_X/gump.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/gump.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/gump.xml	Sun Oct 24 11:02:39 2004
@@ -62,7 +62,6 @@
     <depend project="excalibur-logger"/>
     <depend project="excalibur-event" inherit="runtime"/>
     <depend project="excalibur-legacy" id="i18n"/>
-    <depend project="excalibur-testcase"/>
 
     <depend project="jakarta-regexp"/>
     <depend project="jakarta-servletapi"/>

Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml	Sun Oct 24 11:02:39 2004
@@ -69,17 +69,6 @@
   </file>
 
   <file>
-    <title>Avalon Excalibur Testcase</title>
-    <description>
-      Part of avalon, it is a set of classes and patterns that
-      support high level server development.
-    </description>
-    <used-by>Cocoon</used-by>
-    <lib>core/excalibur-testcase-1.2.jar</lib>
-    <homepage>http://avalon.apache.org/excalibur/</homepage>
-  </file>
-
-  <file>
     <title>Avalon Excalibur Event</title>
     <description>
       This is the Excalibur Event package which includes event queues,

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -16,10 +16,6 @@
 
 package org.apache.cocoon.generation;
 
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.HashMap;
-
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.SitemapComponentTestCase;
 
@@ -27,13 +23,9 @@
  *
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: TextGeneratorTestCase.java,v 1.5 2004/03/05 13:01:48 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class TextGeneratorTestCase extends SitemapComponentTestCase {
-
-    public TextGeneratorTestCase(String name) {
-        super(name);
-    }
 
     public void testTextGenerator1() throws Exception {
         String src = "resource://org/apache/cocoon/generation/texttest-input1.txt";

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/generation/TextGeneratorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: TextGenerator
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.xml.sax.SAXParser"
         shorthand="xml-parser"

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.java	Sun Oct 24 11:02:39 2004
@@ -16,8 +16,6 @@
 
 package org.apache.cocoon.transformation;
 
-import java.util.HashMap;
-
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.SitemapComponentTestCase;
 
@@ -25,13 +23,9 @@
  *
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: LexicalTransformerTestCase.java,v 1.6 2004/03/05 13:01:48 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class LexicalTransformerTestCase extends SitemapComponentTestCase {
-
-    public LexicalTransformerTestCase(String name) {
-        super(name);
-    }
 
     public void testLexicalTransformer1() throws Exception {
         String src = "resource://org/apache/cocoon/transformation/lexertest-lexicon1.xml";

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/LexicalTransformerTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: LexicalTransformer
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.xml.sax.SAXParser"
         shorthand="xml-parser"

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.java	Sun Oct 24 11:02:39 2004
@@ -16,8 +16,6 @@
 
 package org.apache.cocoon.transformation;
 
-import java.util.HashMap;
-
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.SitemapComponentTestCase;
 
@@ -25,13 +23,9 @@
  *
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: ParserTransformerTestCase.java,v 1.6 2004/03/05 13:01:48 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class ParserTransformerTestCase extends SitemapComponentTestCase {
-
-    public ParserTransformerTestCase(String name) {
-        super(name);
-    }
 
     public void testParserTransformer1() throws Exception {
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/ParserTransformerTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: ParserTransformer
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.xml.sax.SAXParser"
         shorthand="xml-parser"

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.java	Sun Oct 24 11:02:39 2004
@@ -16,8 +16,6 @@
 
 package org.apache.cocoon.transformation;
 
-import java.util.HashMap;
-
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.SitemapComponentTestCase;
 
@@ -25,13 +23,9 @@
  *
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: PatternTransformerTestCase.java,v 1.5 2004/03/05 13:01:48 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class PatternTransformerTestCase extends SitemapComponentTestCase {
-
-    public PatternTransformerTestCase(String name) {
-        super(name);
-    }
 
     public void testPatternTransformer() throws Exception {
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/chaperon/test/org/apache/cocoon/transformation/PatternTransformerTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: PatternTransformer
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.xml.sax.SAXParser"
         shorthand="xml-parser"

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.java	Sun Oct 24 11:02:39 2004
@@ -25,9 +25,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.WrapperServiceManager;
+import org.apache.cocoon.core.container.ContainerTestCase;
 import org.apache.cocoon.forms.Constants;
 import org.apache.cocoon.xml.dom.DOMBuilder;
 import org.apache.excalibur.source.impl.ResourceSource;
@@ -37,29 +35,19 @@
 
 /**
  * Test case for CForms's DynamicSelectionList datatype.
- * @version CVS $Id: DynamicSelectionListTestCase.java,v 1.4 2004/03/11 02:56:32 joerg Exp $
+ * @version CVS $Id$
  */
-public class DynamicSelectionListTestCase extends ExcaliburTestCase {
+public class DynamicSelectionListTestCase extends ContainerTestCase {
 
-    protected ServiceManager serviceManager;
     protected DatatypeManager datatypeManager;
     protected DocumentBuilder parser;
 
-    /**
-     * Construct a new test case.
-     * @param name The test case's name.
-     */
-    public DynamicSelectionListTestCase(String name) {
-        super(name);
-    }
-
     /* (non-Javadoc)
      * @see junit.framework.TestCase#setUp()
      */
     protected void setUp() throws Exception {
         super.setUp();
-        serviceManager = new WrapperServiceManager(manager); 
-        datatypeManager = (DatatypeManager) serviceManager.lookup(DatatypeManager.ROLE);
+        datatypeManager = (DatatypeManager) this.lookup(DatatypeManager.ROLE);
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setNamespaceAware(true);
         parser = factory.newDocumentBuilder();
@@ -70,7 +58,7 @@
      */
     protected void tearDown() throws Exception {
         if (datatypeManager != null) {
-            serviceManager.release(datatypeManager);
+            this.release(datatypeManager);
         }
         super.tearDown();
     }
@@ -88,7 +76,7 @@
         Element datatypeElement = (Element) sourceDoc.getElementsByTagNameNS(Constants.DEFINITION_NS, "convertor").item(0);
         Datatype datatype = datatypeManager.createDatatype(datatypeElement, false);
         DynamicSelectionList list = 
-            new DynamicSelectionList(datatype, null, serviceManager);
+            new DynamicSelectionList(datatype, null, this.getManager());
         list.generateSaxFragment(dest, Locale.ENGLISH, source);
         ResourceSource expectedSource =
             new ResourceSource("resource://org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.dest.xml");

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.xtest
==============================================================================
Binary files. No diff available.

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java	Sun Oct 24 11:02:39 2004
@@ -25,10 +25,8 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.WrapperServiceManager;
 import org.apache.cocoon.transformation.I18nTransformer;
+import org.apache.cocoon.core.container.ContainerTestCase;
 import org.apache.cocoon.forms.Constants;
 import org.apache.cocoon.forms.datatype.typeimpl.EnumType;
 import org.apache.cocoon.xml.dom.DOMBuilder;
@@ -38,29 +36,19 @@
 
 /**
  * Test case for CForms's DynamicSelectionList datatype.
- * @version CVS $Id: EnumSelectionListTestCase.java,v 1.5 2004/03/11 02:56:32 joerg Exp $
+ * @version CVS $Id$
  */
-public class EnumSelectionListTestCase extends ExcaliburTestCase {
+public class EnumSelectionListTestCase extends ContainerTestCase {
 
-    protected ServiceManager serviceManager;
     protected DatatypeManager datatypeManager;
     protected DocumentBuilder parser;
 
-    /**
-     * Construct a new test case.
-     * @param name The test case's name.
-     */
-    public EnumSelectionListTestCase(String name) {
-        super(name);
-    }
-
     /* (non-Javadoc)
      * @see junit.framework.TestCase#setUp()
      */
     protected void setUp() throws Exception {
         super.setUp();
-        serviceManager = new WrapperServiceManager(manager); 
-        datatypeManager = (DatatypeManager) serviceManager.lookup(DatatypeManager.ROLE);
+        datatypeManager = (DatatypeManager) this.lookup(DatatypeManager.ROLE);
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setNamespaceAware(true);
         parser = factory.newDocumentBuilder();
@@ -71,7 +59,7 @@
      */
     protected void tearDown() throws Exception {
         if (datatypeManager != null) {
-            serviceManager.release(datatypeManager);
+            this.release(datatypeManager);
         }
         super.tearDown();
     }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.xtest
==============================================================================
Binary files. No diff available.

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java	Sun Oct 24 11:02:39 2004
@@ -29,13 +29,11 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.WrapperServiceManager;
 import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.components.flow.FlowHelper;
+import org.apache.cocoon.core.container.ContainerTestCase;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.mock.MockRequest;
@@ -49,29 +47,19 @@
 
 /**
  * Test case for CForms's FlowModelSelectionList datatype.
- * @version CVS $Id: FlowJXPathSelectionListTestCase.java,v 1.5 2004/04/26 21:29:50 bruno Exp $
+ * @version CVS $Id$
  */
-public class FlowJXPathSelectionListTestCase extends ExcaliburTestCase {
+public class FlowJXPathSelectionListTestCase extends ContainerTestCase {
 
-    protected ServiceManager serviceManager;
     protected DatatypeManager datatypeManager;
     protected DocumentBuilder parser;
 
-    /**
-     * Construct a new test case.
-     * @param name The test case's name.
-     */
-    public FlowJXPathSelectionListTestCase(String name) {
-        super(name);
-    }
-
     /* (non-Javadoc)
      * @see junit.framework.TestCase#setUp()
      */
     protected void setUp() throws Exception {
         super.setUp();
-        serviceManager = new WrapperServiceManager(manager); 
-        datatypeManager = (DatatypeManager) serviceManager.lookup(DatatypeManager.ROLE);
+        datatypeManager = (DatatypeManager) this.lookup(DatatypeManager.ROLE);
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setNamespaceAware(true);
         parser = factory.newDocumentBuilder();
@@ -82,7 +70,7 @@
      */
     protected void tearDown() throws Exception {
         if (datatypeManager != null) {
-            serviceManager.release(datatypeManager);
+            this.release(datatypeManager);
         }
         super.tearDown();
     }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.xtest
==============================================================================
Binary files. No diff available.

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -23,21 +23,14 @@
  * Test case for the MIDIGenerator
  * @author Mark Leicester
  */
-public class XMidiGeneratorTestCase extends SitemapComponentTestCase
-{
+public class XMidiGeneratorTestCase extends SitemapComponentTestCase {
 
-  public XMidiGeneratorTestCase(String name)
-  {
-    super(name);
-  }
-
-  public void testMIDIGenerator() throws Exception
-  {
-    String type = "midi";
-    String src = "resource://org/apache/cocoon/generation/prelude.mid";
-    Parameters parameters = new Parameters();
-    String result = "resource://org/apache/cocoon/generation/prelude.xmi";
-
-    assertEqual(load(result), generate(type, src, parameters));
-  }
+    public void testMIDIGenerator() throws Exception {
+        String type = "midi";
+        String src = "resource://org/apache/cocoon/generation/prelude.mid";
+        Parameters parameters = new Parameters();
+        String result = "resource://org/apache/cocoon/generation/prelude.xmi";
+        
+        assertEqual(load(result), generate(type, src, parameters));
+    }
 }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -20,27 +20,6 @@
   Test Cases: XMidiGenerator
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.xml.sax.SAXParser"
         shorthand="xml-parser"

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.java	Sun Oct 24 11:02:39 2004
@@ -23,21 +23,14 @@
  * Test case for the MIDISerializer
  * @author Mark Leicester
  */
-public class XMidiSerializerTestCase extends SitemapComponentTestCase
-{
+public class XMidiSerializerTestCase extends SitemapComponentTestCase {
 
-  public XMidiSerializerTestCase(String name)
-  {
-    super(name);
-  }
-
-  public void testMIDISerializer() throws Exception
-  {
-    String type = "midi";
-    String input = "resource://org/apache/cocoon/generation/prelude.xmi";
-    Parameters parameters = new Parameters();
-    String control = "resource://org/apache/cocoon/generation/prelude.mid";
-
-		assertIdentical(loadByteArray(control), serialize(type, parameters, load(input)));
-  }
+    public void testMIDISerializer() throws Exception {
+        String type = "midi";
+        String input = "resource://org/apache/cocoon/generation/prelude.xmi";
+        Parameters parameters = new Parameters();
+        String control = "resource://org/apache/cocoon/generation/prelude.mid";
+        
+        assertIdentical(loadByteArray(control), serialize(type, parameters, load(input)));
+    }
 }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/midi/test/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -20,27 +20,6 @@
   Test Cases: XMidiSerializer
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.xml.sax.SAXParser"
         shorthand="xml-parser"

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.java	Sun Oct 24 11:02:39 2004
@@ -15,22 +15,14 @@
  */
 package org.apache.cocoon.components.source.impl;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Iterator;
-
-import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
-import org.apache.cocoon.components.source.impl.WebDAVSource;
-import org.apache.commons.httpclient.HttpURL;
-import org.apache.excalibur.source.ModifiableTraversableSource;
+import org.apache.cocoon.core.container.ContainerTestCase;
 import org.apache.excalibur.source.SourceResolver;
-import org.apache.excalibur.source.TraversableSource;
 import org.apache.webdav.lib.WebdavResource;
 
 /**
  * @version $Id$
  */
-public class WebDAVSourceTestCase extends ExcaliburTestCase {
+public class WebDAVSourceTestCase extends ContainerTestCase {
     
     private String m_scheme = "webdav";
     private String m_credentials = "usr:pwd";
@@ -41,10 +33,6 @@
     private String m_secure = m_scheme + "://" + m_authority + m_path + m_name;
     private String m_options = "?cocoon:webdav-action=" + WebdavResource.NOACTION + "&cocoon:webdav-depth=0";
     
-    
-    public WebDAVSourceTestCase(String name) {
-        super(name);
-    }
     
     public void testResolve() throws Exception {
         SourceResolver resolver = (SourceResolver) lookup(SourceResolver.ROLE);

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/test/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.xtest
==============================================================================
Binary files. No diff available.

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.java	Sun Oct 24 11:02:39 2004
@@ -25,9 +25,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.WrapperServiceManager;
+import org.apache.cocoon.core.container.ContainerTestCase;
 import org.apache.cocoon.woody.Constants;
 import org.apache.cocoon.xml.dom.DOMBuilder;
 import org.apache.excalibur.source.impl.ResourceSource;
@@ -37,29 +35,19 @@
 
 /**
  * Test case for Woody's DynamicSelectionList datatype.
- * @version CVS $Id: DynamicSelectionListTestCase.java,v 1.6 2004/03/09 13:54:21 reinhard Exp $
+ * @version CVS $Id$
  */
-public class DynamicSelectionListTestCase extends ExcaliburTestCase {
+public class DynamicSelectionListTestCase extends ContainerTestCase {
 
-    protected ServiceManager serviceManager;
     protected DatatypeManager datatypeManager;
     protected DocumentBuilder parser;
 
-    /**
-     * Construct a new test case.
-     * @param name The test case's name.
-     */
-    public DynamicSelectionListTestCase(String name) {
-        super(name);
-    }
-
     /* (non-Javadoc)
      * @see junit.framework.TestCase#setUp()
      */
     protected void setUp() throws Exception {
         super.setUp();
-        serviceManager = new WrapperServiceManager(manager); 
-        datatypeManager = (DatatypeManager) serviceManager.lookup(DatatypeManager.ROLE);
+        datatypeManager = (DatatypeManager) this.lookup(DatatypeManager.ROLE);
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setNamespaceAware(true);
         parser = factory.newDocumentBuilder();
@@ -70,7 +58,7 @@
      */
     protected void tearDown() throws Exception {
         if (datatypeManager != null) {
-            serviceManager.release(datatypeManager);
+            this.release(datatypeManager);
         }
         super.tearDown();
     }
@@ -88,7 +76,7 @@
         Element datatypeElement = (Element) sourceDoc.getElementsByTagNameNS(Constants.WD_NS, "convertor").item(0);
         Datatype datatype = datatypeManager.createDatatype(datatypeElement, false);
         DynamicSelectionList list = 
-            new DynamicSelectionList(datatype, null, serviceManager);
+            new DynamicSelectionList(datatype, null, this.getManager());
         list.generateSaxFragment(dest, Locale.ENGLISH, source);
         ResourceSource expectedSource =
             new ResourceSource("resource://org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.dest.xml");

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: Woody Dynamic Selection List
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="ERROR">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
 
   <role name="org.apache.cocoon.woody.datatype.DatatypeManager"

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/EnumSelectionListTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/EnumSelectionListTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/EnumSelectionListTestCase.java	Sun Oct 24 11:02:39 2004
@@ -25,9 +25,7 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.WrapperServiceManager;
+import org.apache.cocoon.core.container.ContainerTestCase;
 import org.apache.cocoon.transformation.I18nTransformer;
 import org.apache.cocoon.woody.Constants;
 import org.apache.cocoon.woody.datatype.typeimpl.EnumType;
@@ -38,29 +36,19 @@
 
 /**
  * Test case for Woody's DynamicSelectionList datatype.
- * @version CVS $Id: EnumSelectionListTestCase.java,v 1.4 2004/03/09 13:54:21 reinhard Exp $
+ * @version CVS $Id$
  */
-public class EnumSelectionListTestCase extends ExcaliburTestCase {
+public class EnumSelectionListTestCase extends ContainerTestCase {
 
-    protected ServiceManager serviceManager;
     protected DatatypeManager datatypeManager;
     protected DocumentBuilder parser;
 
-    /**
-     * Construct a new test case.
-     * @param name The test case's name.
-     */
-    public EnumSelectionListTestCase(String name) {
-        super(name);
-    }
-
     /* (non-Javadoc)
      * @see junit.framework.TestCase#setUp()
      */
     protected void setUp() throws Exception {
         super.setUp();
-        serviceManager = new WrapperServiceManager(manager); 
-        datatypeManager = (DatatypeManager) serviceManager.lookup(DatatypeManager.ROLE);
+        datatypeManager = (DatatypeManager) this.lookup(DatatypeManager.ROLE);
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setNamespaceAware(true);
         parser = factory.newDocumentBuilder();
@@ -71,7 +59,7 @@
      */
     protected void tearDown() throws Exception {
         if (datatypeManager != null) {
-            serviceManager.release(datatypeManager);
+            this.release(datatypeManager);
         }
         super.tearDown();
     }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/EnumSelectionListTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/EnumSelectionListTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/EnumSelectionListTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: Woody Enum Selection List
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="ERROR">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
 
   <role name="org.apache.cocoon.woody.datatype.DatatypeManager"

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCase.java	Sun Oct 24 11:02:39 2004
@@ -29,13 +29,11 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.WrapperServiceManager;
 import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.components.flow.FlowHelper;
+import org.apache.cocoon.core.container.ContainerTestCase;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.mock.MockRequest;
@@ -49,29 +47,19 @@
 
 /**
  * Test case for Woody's FlowModelSelectionList datatype.
- * @version CVS $Id: FlowJXPathSelectionListTestCase.java,v 1.6 2004/04/26 21:26:34 bruno Exp $
+ * @version CVS $Id$
  */
-public class FlowJXPathSelectionListTestCase extends ExcaliburTestCase {
+public class FlowJXPathSelectionListTestCase extends ContainerTestCase {
 
-    protected ServiceManager serviceManager;
     protected DatatypeManager datatypeManager;
     protected DocumentBuilder parser;
 
-    /**
-     * Construct a new test case.
-     * @param name The test case's name.
-     */
-    public FlowJXPathSelectionListTestCase(String name) {
-        super(name);
-    }
-
     /* (non-Javadoc)
      * @see junit.framework.TestCase#setUp()
      */
     protected void setUp() throws Exception {
         super.setUp();
-        serviceManager = new WrapperServiceManager(manager); 
-        datatypeManager = (DatatypeManager) serviceManager.lookup(DatatypeManager.ROLE);
+        datatypeManager = (DatatypeManager) this.lookup(DatatypeManager.ROLE);
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setNamespaceAware(true);
         parser = factory.newDocumentBuilder();
@@ -82,7 +70,7 @@
      */
     protected void tearDown() throws Exception {
         if (datatypeManager != null) {
-            serviceManager.release(datatypeManager);
+            this.release(datatypeManager);
         }
         super.tearDown();
     }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/woody/test/org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: Woody Flow Model Selection List
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="ERROR">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
 
   <role name="org.apache.cocoon.woody.datatype.DatatypeManager"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/SitemapComponentTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/SitemapComponentTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/SitemapComponentTestCase.java	Sun Oct 24 11:02:39 2004
@@ -29,18 +29,17 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentSelector;
 import org.apache.avalon.framework.context.DefaultContext;
 import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceSelector;
 import org.apache.cocoon.acting.Action;
 import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.components.flow.AbstractInterpreter;
 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;
@@ -69,8 +68,8 @@
  * @author <a href="mailto:mark.leicester@energyintellect.com">Mark Leicester</a>
  * @version CVS $Id$
  */
-public abstract class SitemapComponentTestCase extends ExcaliburTestCase
-{
+public abstract class SitemapComponentTestCase extends ContainerTestCase {
+    
     public final static Parameters EMPTY_PARAMS = Parameters.EMPTY_PARAMETERS;
 
     private MockRequest request = new MockRequest();
@@ -79,15 +78,6 @@
     private MockRedirector redirector = new MockRedirector();
     private Map objectmodel = new HashMap();
 
-    /**
-     * Create a new composite test case.
-     *
-     * @param name Name of test case.
-     */
-    public SitemapComponentTestCase(String name) {
-        super(name);
-    }
-
     public final MockRequest getRequest() {
         return request;
     }
@@ -114,7 +104,8 @@
         context.put(ContextHelper.CONTEXT_OBJECT_MODEL, objectmodel);
     }
 
-    public void setUp() {
+    public void setUp() throws Exception {
+        super.setUp();
         objectmodel.clear();
 
         request.reset();
@@ -138,17 +129,17 @@
      */
     public final Map match(String type, String pattern, Parameters parameters) throws PatternException {
 
-        ComponentSelector selector = null;
+        ServiceSelector selector = null;
         Matcher matcher = null;
         SourceResolver resolver = null;
 
         Map result = null;
         try {
-            selector = (ComponentSelector) this.manager.lookup(Matcher.ROLE +
+            selector = (ServiceSelector) this.lookup(Matcher.ROLE +
                 "Selector");
             assertNotNull("Test lookup of matcher selector", selector);
 
-            resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+            resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
             assertNotNull("Test lookup of source resolver", resolver);
 
             assertNotNull("Test if matcher name is not null", type);
@@ -157,15 +148,15 @@
 
             result = matcher.match(pattern, objectmodel, parameters);
 
-        } catch (ComponentException ce) {
+        } catch (ServiceException ce) {
             getLogger().error("Could not retrieve matcher", ce);
             fail("Could not retrieve matcher: " + ce.toString());
         } finally {
             if (matcher != null) {
                 selector.release(matcher);
             }
-            this.manager.release(selector);
-            this.manager.release(resolver);
+            this.release(selector);
+            this.release(resolver);
         }
         return result;
     }
@@ -179,17 +170,17 @@
      */
     public final boolean select(String type, String expression, Parameters parameters) {
 
-        ComponentSelector selector = null;
+        ServiceSelector selector = null;
         org.apache.cocoon.selection.Selector sel = null;
         SourceResolver resolver = null;
 
         boolean result = false;
         try {
-            selector = (ComponentSelector) this.manager.lookup(org.apache.cocoon.selection.Selector.ROLE +
+            selector = (ServiceSelector) this.lookup(org.apache.cocoon.selection.Selector.ROLE +
                 "Selector");
             assertNotNull("Test lookup of selector selector", selector);
 
-            resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+            resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
             assertNotNull("Test lookup of source resolver", resolver);
 
             assertNotNull("Test if selector name is not null", type);
@@ -199,15 +190,15 @@
 
             result = sel.select(expression, objectmodel, parameters);
 
-        } catch (ComponentException ce) {
+        } catch (ServiceException ce) {
             getLogger().error("Could not retrieve selector", ce);
             fail("Could not retrieve selector: " + ce.toString());
         } finally {
             if (sel != null) {
                 selector.release(sel);
             }
-            this.manager.release(selector);
-            this.manager.release(resolver);
+            this.release(selector);
+            this.release(resolver);
         }
         return result;
     }
@@ -223,35 +214,35 @@
         
         redirector.reset();
 
-        ComponentSelector selector = null;
+        ServiceSelector selector = null;
         Action action = null;
         SourceResolver resolver = null;
 
         Map result = null;
         try {
-            selector = (ComponentSelector) this.manager.lookup(Action.ROLE +
+            selector = (ServiceSelector) this.lookup(Action.ROLE +
                 "Selector");
             assertNotNull("Test lookup of action selector", selector);
 
-            resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+            resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
             assertNotNull("Test lookup of source resolver", resolver);
 
             assertNotNull("Test if action name is not null", type);
             action = (Action) selector.select(type);
             assertNotNull("Test lookup of action", action);
 
-            result = action.act(redirector, new SourceResolverAdapter(resolver, this.manager),
+            result = action.act(redirector, new SourceResolverAdapter(resolver),
                                 objectmodel, source, parameters);
 
-        } catch (ComponentException ce) {
+        } catch (ServiceException ce) {
             getLogger().error("Could not retrieve action", ce);
             fail("Could not retrieve action: " + ce.toString());
         } finally {
             if (action != null) {
                 selector.release(action);
             }
-            this.manager.release(selector);
-            this.manager.release(resolver);
+            this.release(selector);
+            this.release(resolver);
         }
         return result;
     }
@@ -266,21 +257,21 @@
     public final Document generate(String type, String source, Parameters parameters) 
         throws IOException, SAXException, ProcessingException {
 
-        ComponentSelector selector = null;
+        ServiceSelector selector = null;
         Generator generator = null;
         SourceResolver resolver = null;
         SAXParser parser = null;
 
         Document document = null;
         try {
-            selector = (ComponentSelector) this.manager.lookup(Generator.ROLE +
+            selector = (ServiceSelector) this.lookup(Generator.ROLE +
                 "Selector");
             assertNotNull("Test lookup of generator selector", selector);
 
-            resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+            resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
             assertNotNull("Test lookup of source resolver", resolver);
 
-            parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
+            parser = (SAXParser) this.lookup(SAXParser.ROLE);
             assertNotNull("Test lookup of parser", parser);
 
             assertNotNull("Test if generator name is not null", type);
@@ -288,7 +279,7 @@
             generator = (Generator) selector.select(type);
             assertNotNull("Test lookup of generator", generator);
 
-            generator.setup(new SourceResolverAdapter(resolver, this.manager),
+            generator.setup(new SourceResolverAdapter(resolver),
                             objectmodel, source, parameters);
 
             DOMBuilder builder = new DOMBuilder();
@@ -300,16 +291,16 @@
 
             assertNotNull("Test for generator document", document);
 
-        } catch (ComponentException ce) {
+        } catch (ServiceException ce) {
             getLogger().error("Could not retrieve generator", ce);
             fail("Could not retrieve generator: " + ce.toString());
         } finally {
             if (generator != null) {
                 selector.release(generator);
             }
-            this.manager.release(selector);
-            this.manager.release(resolver);
-            this.manager.release((Component) parser);
+            this.release(selector);
+            this.release(resolver);
+            this.release(parser);
         }
 
         return document;
@@ -326,24 +317,24 @@
     public final Document transform(String type, String source, Parameters parameters, Document input) 
         throws SAXException, ProcessingException, IOException {
 
-        ComponentSelector selector = null;
+        ServiceSelector selector = null;
         Transformer transformer = null;
         SourceResolver resolver = null;
         SAXParser parser = null;
         Source inputsource = null;
 
-        assertNotNull("Test for component manager", this.manager);
+        assertNotNull("Test for component manager", this.getManager());
 
         Document document = null;
         try {
-            selector = (ComponentSelector) this.manager.lookup(Transformer.ROLE+
+            selector = (ServiceSelector) this.lookup(Transformer.ROLE+
                 "Selector");
             assertNotNull("Test lookup of transformer selector", selector);
 
-            resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+            resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
             assertNotNull("Test lookup of source resolver", resolver);
 
-            parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
+            parser = (SAXParser) this.lookup(SAXParser.ROLE);
             assertNotNull("Test lookup of parser", parser);
 
 
@@ -351,7 +342,7 @@
             transformer = (Transformer) selector.select(type);
             assertNotNull("Test lookup of transformer", transformer);
 
-            transformer.setup(new SourceResolverAdapter(resolver, this.manager),
+            transformer.setup(new SourceResolverAdapter(resolver),
                                   objectmodel, source, parameters);
 
             DOMBuilder builder = new DOMBuilder();
@@ -364,7 +355,7 @@
             document = builder.getDocument();
             assertNotNull("Test for transformer document", document);
 
-        } catch (ComponentException ce) {
+        } catch (ServiceException ce) {
             getLogger().error("Could not retrieve transformer", ce);
             ce.printStackTrace();
             fail("Could not retrieve transformer:"+ce.toString());
@@ -374,7 +365,7 @@
             }
 
             if (selector!=null) {
-                this.manager.release(selector);
+                this.release(selector);
             }
 
             if (inputsource!=null) {
@@ -382,11 +373,11 @@
             }
 
             if (resolver!=null) {
-                this.manager.release(resolver);
+                this.release(resolver);
             }
 
             if (parser!=null) {
-                this.manager.release((Component) parser);
+                this.release(parser);
             }
         }
 
@@ -405,21 +396,21 @@
     public final byte[] serialize(String type, Parameters parameters,
                                   Document input) throws SAXException, IOException{
 
-        ComponentSelector selector = null;
+        ServiceSelector selector = null;
         Serializer serializer = null;
         SourceResolver resolver = null;
         Source inputsource = null;
 
-        assertNotNull("Test for component manager", this.manager);
+        assertNotNull("Test for component manager", this.getManager());
 
         ByteArrayOutputStream document = null;
 
         try {
-            selector = (ComponentSelector) this.manager.lookup(Serializer.ROLE+
+            selector = (ServiceSelector) this.lookup(Serializer.ROLE+
                 "Selector");
             assertNotNull("Test lookup of serializer selector", selector);
 
-            resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+            resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
             assertNotNull("Test lookup of source resolver", resolver);
 
             assertNotNull("Test if serializer name is not null", type);
@@ -433,7 +424,7 @@
             DOMStreamer streamer = new DOMStreamer(serializer);
 
             streamer.stream(input);
-        } catch (ComponentException ce) {
+        } catch (ServiceException ce) {
             getLogger().error("Could not retrieve serializer", ce);
             fail("Could not retrieve serializer:"+ce.toString());
         } finally {
@@ -442,7 +433,7 @@
             }
 
             if (selector!=null) {
-                this.manager.release(selector);
+                this.release(selector);
             }
 
             if (inputsource!=null) {
@@ -450,7 +441,7 @@
             }
 
             if (resolver!=null) {
-                this.manager.release(resolver);
+                this.release(resolver);
             }
         }
 
@@ -461,15 +452,15 @@
         
         redirector.reset();
         
-        ComponentSelector selector = null;
+        ServiceSelector selector = null;
         Interpreter interpreter = null;
         SourceResolver resolver = null;
 
         try {
-            selector = (ComponentSelector) this.manager.lookup(Interpreter.ROLE);
+            selector = (ServiceSelector) this.lookup(Interpreter.ROLE);
             assertNotNull("Test lookup of interpreter selector", selector);
 
-            resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+            resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
             assertNotNull("Test lookup of source resolver", resolver);
 
             assertNotNull("Test if interpreter name is not null", type);
@@ -487,15 +478,15 @@
             
             interpreter.callFunction(function, parameters, getRedirector());
             
-        } catch (ComponentException ce) {
+        } catch (ServiceException ce) {
             getLogger().error("Could not retrieve interpeter", ce);
             fail("Could not retrieve interpreter: " + ce.toString());
         } finally {
             if (interpreter != null) {
-                selector.release((Component) interpreter);
+                selector.release(interpreter);
             }
-            this.manager.release(selector);
-            this.manager.release(resolver);
+            this.release(selector);
+            this.release(resolver);
         }
         return FlowHelper.getWebContinuation(getObjectModel()).getId();
     }
@@ -504,15 +495,15 @@
         
         redirector.reset();
         
-        ComponentSelector selector = null;
+        ServiceSelector selector = null;
         Interpreter interpreter = null;
         SourceResolver resolver = null;
 
         try {
-            selector = (ComponentSelector) this.manager.lookup(Interpreter.ROLE);
+            selector = (ServiceSelector) this.lookup(Interpreter.ROLE);
             assertNotNull("Test lookup of interpreter selector", selector);
 
-            resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+            resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
             assertNotNull("Test lookup of source resolver", resolver);
 
             assertNotNull("Test if interpreter name is not null", type);
@@ -530,15 +521,15 @@
             
             interpreter.handleContinuation(id, parameters, getRedirector());
 
-        } catch (ComponentException ce) {
+        } catch (ServiceException ce) {
             getLogger().error("Could not retrieve interpreter", ce);
             fail("Could not retrieve interpreter: " + ce.toString());
         } finally {
             if (interpreter != null) {
-                selector.release((Component) interpreter);
+                selector.release(interpreter);
             }
-            this.manager.release(selector);
-            this.manager.release(resolver);
+            this.release(selector);
+            this.release(resolver);
         }
         return FlowHelper.getWebContinuation(getObjectModel()).getId();
     }
@@ -567,14 +558,14 @@
         SAXParser parser = null;
         Source assertionsource = null;
 
-        assertNotNull("Test for component manager", this.manager);
+        assertNotNull("Test for component manager", this.getManager());
 
         Document assertiondocument = null;
         try {
-            resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+            resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
             assertNotNull("Test lookup of source resolver", resolver);
 
-            parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
+            parser = (SAXParser) this.lookup(SAXParser.ROLE);
             assertNotNull("Test lookup of parser", parser);
 
             assertNotNull("Test if assertion document is not null",
@@ -595,7 +586,7 @@
             assertiondocument = builder.getDocument();
             assertNotNull("Test if assertion document exists", assertiondocument);
 
-        } catch (ComponentException ce) {
+        } catch (ServiceException ce) {
             getLogger().error("Could not retrieve generator", ce);
             fail("Could not retrieve generator: " + ce.toString());
         } catch (Exception e) {
@@ -605,8 +596,8 @@
             if (resolver != null) {
                 resolver.release(assertionsource);
             }
-            this.manager.release(resolver);
-            this.manager.release((Component) parser);
+            this.release(resolver);
+            this.release(parser);
         }
 
         return assertiondocument;
@@ -625,15 +616,15 @@
         SAXParser parser = null;
         Source assertionsource = null;
 
-        assertNotNull("Test for component manager", this.manager);
+        assertNotNull("Test for component manager", this.getManager());
 
         byte[] assertiondocument = null;
 
         try {
-            resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
+            resolver = (SourceResolver) this.lookup(SourceResolver.ROLE);
             assertNotNull("Test lookup of source resolver", resolver);
 
-            parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
+            parser = (SAXParser) this.lookup(SAXParser.ROLE);
             assertNotNull("Test lookup of parser", parser);
 
             assertNotNull("Test if assertion document is not null", source);
@@ -656,7 +647,7 @@
                 i++;
             }
 
-        } catch (ComponentException ce) {
+        } catch (ServiceException ce) {
             getLogger().error("Could not retrieve generator", ce);
             fail("Could not retrieve generator: "+ce.toString());
         } catch (Exception e) {
@@ -666,8 +657,8 @@
             if (resolver!=null) {
                 resolver.release(assertionsource);
             }
-            this.manager.release(resolver);
-            this.manager.release((Component) parser);
+            this.release(resolver);
+            this.release(parser);
         }
 
         return assertiondocument;

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.java	Sun Oct 24 11:02:39 2004
@@ -25,13 +25,9 @@
  *
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: RequestParamActionTestCase.java,v 1.5 2004/03/05 13:03:03 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class RequestParamActionTestCase extends SitemapComponentTestCase {
-
-    public RequestParamActionTestCase(String name) {
-        super(name);
-    }
 
     public void testRequestAction() throws Exception {
 

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/RequestParamActionTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: RequestParamAction
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.java	Sun Oct 24 11:02:39 2004
@@ -25,13 +25,9 @@
  *
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: ResourceExistsActionTestCase.java,v 1.4 2004/03/05 13:03:03 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class ResourceExistsActionTestCase extends SitemapComponentTestCase {
-
-    public ResourceExistsActionTestCase(String name) {
-        super(name);
-    }
 
     public void testExistAction() throws Exception {
 

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/acting/ResourceExistsActionTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: ResourceExistsAction
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/source/SourceResolverAdapter.java	Sun Oct 24 11:02:39 2004
@@ -20,7 +20,6 @@
 import java.net.MalformedURLException;
 import java.util.Map;
 
-import org.apache.avalon.framework.component.ComponentManager;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.environment.Source;
 import org.apache.cocoon.environment.SourceResolver;
@@ -29,13 +28,13 @@
 /**
  * An adapter for the Excalibur SourceResolver.
  *
- * @version CVS $Id: SourceResolverAdapter.java,v 1.10 2004/03/05 13:03:03 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class SourceResolverAdapter implements SourceResolver
 {
     private org.apache.excalibur.source.SourceResolver resolver;
 
-    public SourceResolverAdapter(org.apache.excalibur.source.SourceResolver resolver, ComponentManager manager) {
+    public SourceResolverAdapter(org.apache.excalibur.source.SourceResolver resolver) {
         this.resolver = resolver;
     }
 

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.java	Sun Oct 24 11:02:39 2004
@@ -19,8 +19,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.logger.LogKitLogger;
 import org.apache.cocoon.SitemapComponentTestCase;
 import org.apache.cocoon.components.treeprocessor.InvokeContext;
 import org.apache.cocoon.environment.mock.MockRequest;
@@ -30,42 +28,37 @@
  * Test case for the nested variant of the PreparedVariableResolver
  *
  * @author <a href="mailto:uv@upaya.co.uk">Upayavira</a>
- * @version CVS $Id: PreparedVariableResolverTestCase.java,v 1.5 2004/05/06 19:27:55 upayavira Exp $
+ * @version CVS $Id$
  */
 public class PreparedVariableResolverTestCase extends SitemapComponentTestCase {
 
-    public PreparedVariableResolverTestCase(String name) {
-        super(name);
-    }
-
-
-    public void testNestedExpressions() throws PatternException, ComponentException {
+    public void testNestedExpressions() throws Exception {
         String expr = "{request-param:{request-param:foo}}";
         MockRequest request = getRequest();
         request.reset();
         request.addParameter("foo", "bar");
         request.addParameter("bar", "123");
         InvokeContext context = new InvokeContext(true);
-        context.enableLogging(new LogKitLogger(getLogger()));
+        context.enableLogging(getLogger());
         
         Map sitemapElements = new HashMap();
         context.pushMap("sitemap", sitemapElements);
-        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, manager);
+        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, getManager());
         assertEquals("123", resolver.resolve(context, getObjectModel()));
     }
 
-    public void testNestedModuleAndSitemapExpressions() throws PatternException, ComponentException {
+    public void testNestedModuleAndSitemapExpressions() throws Exception {
         String expr = "{request-param:f{1}}";
         MockRequest request = getRequest();
         request.reset();
         request.addParameter("foo", "123");
         InvokeContext context = new InvokeContext(true);
-        context.enableLogging(new LogKitLogger(getLogger()));
+        context.enableLogging(getLogger());
         
         Map sitemapElements = new HashMap();
         sitemapElements.put("1", "oo");
         context.pushMap("sitemap", sitemapElements);
-        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, manager);
+        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, getManager());
         assertEquals("123", resolver.resolve(context, getObjectModel()));
     }
     
@@ -73,12 +66,12 @@
         String expr = "{#label:name}";
         
         InvokeContext context = new InvokeContext(true);
-        context.enableLogging(new LogKitLogger(getLogger()));
+        context.enableLogging(getLogger());
         
         Map sitemapElements = new HashMap();
         sitemapElements.put("name", "123");
         context.pushMap("label", sitemapElements);
-        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, manager);
+        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, getManager());
         assertEquals("123", resolver.resolve(context, getObjectModel()));        
     }
     
@@ -86,12 +79,12 @@
         String expr = "123{1}";
         
         InvokeContext context = new InvokeContext(true);
-        context.enableLogging(new LogKitLogger(getLogger()));
+        context.enableLogging(getLogger());
 
         Map sitemapElements = new HashMap();
         sitemapElements.put("1", "abc");
         context.pushMap("label", sitemapElements);
-        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, manager);
+        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, getManager());
         assertEquals("123abc", resolver.resolve(context, getObjectModel()));
     }
 
@@ -99,12 +92,12 @@
         String expr = "123{1}/def";
     
         InvokeContext context = new InvokeContext(true);
-        context.enableLogging(new LogKitLogger(getLogger()));
+        context.enableLogging(getLogger());
 
         Map sitemapElements = new HashMap();
         sitemapElements.put("1", "abc");
         context.pushMap("label", sitemapElements);
-        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, manager);
+        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, getManager());
         assertEquals("123abc/def", resolver.resolve(context, getObjectModel()));
     }
     
@@ -112,12 +105,12 @@
         String expr = "123{sitemap:1}/def";
     
         InvokeContext context = new InvokeContext(true);
-        context.enableLogging(new LogKitLogger(getLogger()));
+        context.enableLogging(getLogger());
 
         Map sitemapElements = new HashMap();
         sitemapElements.put("1", "abc");
         context.pushMap("label", sitemapElements);
-        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, manager);
+        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, getManager());
         assertEquals("123abc/def", resolver.resolve(context, getObjectModel()));
     }
 
@@ -125,7 +118,7 @@
         String expr = "from {../1} to {1}";
         
         InvokeContext context = new InvokeContext(true);
-        context.enableLogging(new LogKitLogger(getLogger()));
+        context.enableLogging(getLogger());
 
         Map sitemapElements;
         sitemapElements = new HashMap();
@@ -136,7 +129,7 @@
         sitemapElements.put("1", "oscar");
         context.pushMap("label2", sitemapElements);
 
-        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, manager);
+        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, getManager());
         assertEquals("from juliet to oscar", resolver.resolve(context, getObjectModel()));
     }
 
@@ -144,7 +137,7 @@
         String expr = "from {/1} to {1}";
         
         InvokeContext context = new InvokeContext(true);
-        context.enableLogging(new LogKitLogger(getLogger()));
+        context.enableLogging(getLogger());
 
         Map sitemapElements;
         sitemapElements = new HashMap();
@@ -155,7 +148,7 @@
         sitemapElements.put("1", "oscar");
         context.pushMap("label2", sitemapElements);
 
-        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, manager);
+        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, getManager());
         assertEquals("from juliet to oscar", resolver.resolve(context, getObjectModel()));
     }
     
@@ -163,13 +156,13 @@
         String expr = "http://cocoon.apache.org";
         
         InvokeContext context = new InvokeContext(true);
-        context.enableLogging(new LogKitLogger(getLogger()));
+        context.enableLogging(getLogger());
 
         Map sitemapElements;
         sitemapElements = new HashMap();
         context.pushMap("label", sitemapElements);
         
-        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, manager);
+        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, getManager());
         assertEquals("http://cocoon.apache.org", resolver.resolve(context, getObjectModel()));
     }
     
@@ -177,13 +170,13 @@
         String expr = ":colon-starts-this";
         
         InvokeContext context = new InvokeContext(true);
-        context.enableLogging(new LogKitLogger(getLogger()));
+        context.enableLogging(getLogger());
 
         Map sitemapElements;
         sitemapElements = new HashMap();
         context.pushMap("label", sitemapElements);
         
-        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, manager);
+        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, getManager());
         assertEquals(":colon-starts-this", resolver.resolve(context, getObjectModel()));
     }
     
@@ -191,14 +184,14 @@
         String expr = "{1}:{1}";
         
         InvokeContext context = new InvokeContext(true);
-        context.enableLogging(new LogKitLogger(getLogger()));
+        context.enableLogging(getLogger());
 
         Map sitemapElements;
         sitemapElements = new HashMap();
         sitemapElements.put("1", "abc");
         context.pushMap("label", sitemapElements);
         
-        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, manager);
+        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, getManager());
         assertEquals("abc:abc", resolver.resolve(context, getObjectModel()));
     }
 
@@ -206,24 +199,24 @@
         String expr = "This is a \\{brace\\}";
         
         InvokeContext context = new InvokeContext(true);
-        context.enableLogging(new LogKitLogger(getLogger()));
+        context.enableLogging(getLogger());
 
         Map sitemapElements;
         sitemapElements = new HashMap();
         context.pushMap("label", sitemapElements);
 
-        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, manager);
+        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, getManager());
         assertEquals("This is a {brace}", resolver.resolve(context, getObjectModel()));
     }
 
     public void testModuleWithoutOption() throws PatternException {
         String expr = "{baselink:}";
         InvokeContext context = new InvokeContext(true);
-        context.enableLogging(new LogKitLogger(getLogger()));
+        context.enableLogging(getLogger());
         
         Map sitemapElements = new HashMap();
         context.pushMap("sitemap", sitemapElements);
-        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, manager);
+        PreparedVariableResolver resolver = new PreparedVariableResolver(expr, getManager());
         assertEquals("", resolver.resolve(context, getObjectModel()));
     }
 }

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: PreparedVariableResolver
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="ERROR">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.cocoon.components.modules.input.InputModuleSelector"
         shorthand="input-modules"

Added: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/core/container/ContainerTestCase.java
==============================================================================
--- (empty file)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/core/container/ContainerTestCase.java	Sun Oct 24 11:02:39 2004
@@ -0,0 +1,319 @@
+/* 
+ * Copyright 2002-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.core.container;
+
+import java.io.InputStream;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.apache.avalon.excalibur.component.DefaultRoleManager;
+import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
+import org.apache.avalon.excalibur.logger.LoggerManager;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.WrapperServiceManager;
+
+/**
+ * JUnit TestCase for Cocoon Components.
+ * <p>
+ *   This class extends the JUnit TestCase class to setup an environment which
+ *   makes it possible to easily test Cocoon Components. The following methods
+ *   and instance variables are exposed for convenience testing:
+ * </p>
+ * <dl>
+ *   <dt>getManager()</dt>
+ *   <dd>
+ *     This instance variable contains an initialized service manager which
+ *     can be used to lookup components configured in the test configuration
+ *     file. (see below)
+ *   </dd>
+ *   <dt>getLogger()</dt>
+ *   <dd>
+ *     This method returns a logger for this test case. By default this
+ *     logger logs with log level DEBUG.
+ *   </dd>
+ * </dl>
+ * <p>
+ *   The following test case configuration can be used as a basis for new tests.
+ *   Detailed explanations of the configuration elements can be found after
+ *   the example. 
+ * </p>
+ * <pre>
+ *   &lt;testcase&gt;
+ *     &lt;annotation&gt;
+ *       &lt;![CDATA[
+ *         &lt;title&gt;{Name of test}&lt;/title&gt;
+ *         &lt;para&gt;
+ *           {Description of test}
+ *           The configuration is specified in the file located in
+ *           &lt;parameter&gt;cocoon/src/test/{path and name of conf file}.xtext&lt;/parameter&gt;.
+ *         &lt;/para&gt;
+ *       ]]&gt;
+ *     &lt;/annotation&gt;
+ *
+ *     &lt;context&gt;
+ *       &lt;entry name="foo" value="bar"/&gt;
+ *       &lt;entry name="baz" class="my.context.Class"/&gt;
+ *     &lt;/context&gt;
+ *
+ *     &lt;roles&gt;
+ *       &lt;role name="org.apache.avalon.excalibur.datasource.DataSourceComponentSelector"
+ *             shorthand="datasources"
+ *             default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector"&gt;
+ *          &lt;hint shorthand="jdbc" class="org.apache.avalon.excalibur.datasource.JdbcDataSource"/&gt;
+ *       &lt;/role&gt;
+ *     &lt;/roles&gt;
+ *
+ *     &lt;components&gt;
+ *       &lt;datasources&gt;
+ *         &lt;jdbc name="personell"&gt;
+ *           &lt;pool-controller min="5" max="10"/&gt;
+ *           &lt;jdbc name="personnel"/&gt;
+ *           &lt;dburl&gt;jdbc:odbc:test&lt;/dburl&gt;
+ *           &lt;user&gt;test&lt;/user&gt;
+ *           &lt;password&gt;test&lt;/password&gt;
+ *           &lt;driver&gt;sun.jdbc.odbc.JdbcOdbcDriver&lt;/driver&gt;
+ *         &lt;/jdbc&gt;
+ *       &lt;/datasources&gt;
+ *     &lt;/components&gt;
+ *   &lt;/testcase&gt;
+ * </pre>
+ * <p>
+ * Element Explanation:
+ * <dl>
+ * <dt>testcase</dt>
+ * <dd>Defines a test case configuration.  Must contain one each of the
+ *  following elements: <code>annotation</code>,
+ *  <code>context</code>, <code>roles</code>, and <code>components</code>
+ *  </dd>.
+ *
+ * <dt>annotation</dt>
+ * <dd>Defines a test annotation.  This element should define a block of
+ *  XML enclosed within a CDATA element.  The XML should be made up of a
+ *  <code>title</code> element, naming the test, and a <code>para</code>
+ *  element which is used to describe the test.</dd>
+ *
+ * <dt>context</dt>
+ * <dd>Allows context properties to be set in the context passed to any
+ *  Contextualizable components.</dd>
+ *
+ * <dt>roles</dt>
+ * <dd>Roles configuration for the components configured in the
+ *  <code>components</code> element.  
+ * </dd>
+ *
+ * <dt>components</dt>
+ * <dd>Used to configure any Components used by the test cases.  
+ * </dd>
+ *
+ * </dl>
+ *
+ * @version $Id: $
+ */
+public class ContainerTestCase extends TestCase {
+    
+    /** The default logger */
+    private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG);
+    
+    /** The service manager to use */
+    private ServiceManager manager;
+
+    /** Return the logger */
+    protected Logger getLogger() {
+        return logger;
+    }
+
+    /** Return the service manager */
+    protected ServiceManager getManager() {
+        return this.manager;
+    }
+    
+    /* (non-Javadoc)
+     * @see junit.framework.TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+        this.prepare();
+    }
+    
+    /**
+     * Initializes the ComponentLocator
+     *
+     * The configuration file is determined by the class name plus .xtest appended,
+     * all '.' replaced by '/' and loaded as a resource via classpath
+     */
+    protected void prepare()
+    throws Exception {
+        final String resourceName = getClass().getName().replace( '.', '/' ) + ".xtest";
+        URL resource = getClass().getClassLoader().getResource( resourceName );
+
+        if( resource != null ) {
+            getLogger().debug( "Loading resource " + resourceName );
+            prepare( resource.openStream() );
+        } else {
+            getLogger().debug( "Resource not found " + resourceName );
+        }
+    }
+
+    /**
+     * Initializes the ComponentLocator
+     *
+     * @param testconf The configuration file is passed as a <code>InputStream</code>
+     *
+     * A common way to supply a InputStream is to overwrite the initialize() method
+     * in the sub class, do there whatever is needed to get the right InputStream object
+     * supplying a conformant xtest configuartion and pass it to this initialize method.
+     * the mentioned initialize method is also the place to set a different logging priority
+     * to the member variable m_logPriority.
+     */
+    protected final void prepare( final InputStream testconf )
+    throws Exception {
+        if ( getLogger().isDebugEnabled() ) {
+            getLogger().debug( "ContainerTestCase.initialize" );
+        }
+
+        final DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder();
+        final Configuration conf = builder.build( testconf );
+
+        String annotation = conf.getChild( "annotation" ).getValue( null );
+
+        if( ( null != annotation ) && !( "".equals( annotation ) ) ) {
+            this.logger.info( annotation );
+        }
+
+        Context context = this.setupContext( conf.getChild( "context" ) );
+
+        setupManagers( conf.getChild( "components" ),
+                       conf.getChild( "roles" ),
+                       context );
+    }
+
+    /* (non-Javadoc)
+     * @see junit.framework.TestCase#tearDown()
+     */
+    protected void tearDown() throws Exception {
+        this.done();
+        super.tearDown();
+    }
+
+    /**
+     * Disposes the <code>ComponentLocator</code>
+     */
+    final private void done() {
+        if( manager != null ) {
+            ContainerUtil.dispose(manager);
+            manager = null;
+        }
+    }
+
+    /**
+     * set up a context according to the xtest configuration specifications context
+     * element.
+     *
+     * A method addContext(DefaultContext context) is called here to enable subclasses
+     * to put additional objects into the context programmatically.
+     */
+    final private Context setupContext( final Configuration conf )
+    throws Exception {
+        final DefaultContext context = new DefaultContext();
+        final Configuration[] confs = conf.getChildren( "entry" );
+        for( int i = 0; i < confs.length; i++ ) {
+            final String key = confs[ i ].getAttribute( "name" );
+            final String value = confs[ i ].getAttribute( "value", null );
+            if( value == null ) {
+                String clazz = confs[ i ].getAttribute( "class" );
+                Object obj = getClass().getClassLoader().loadClass( clazz ).newInstance();
+                context.put( key, obj );
+                if( getLogger().isInfoEnabled() ) {
+                    getLogger().info( "ContainerTestCase: added an instance of class " + clazz + " to context entry " + key );
+                }
+            } else {
+                context.put( key, value );
+                if( getLogger().isInfoEnabled() ) {
+                    getLogger().info( "ContainerTestCase: added value \"" + value + "\" to context entry " + key );
+                }
+            }
+        }
+        addContext( context );
+        return context ;
+    }
+
+    /**
+     * This method may be overwritten by subclasses to put additional objects
+     * into the context programmatically.
+     */
+    protected void addContext( DefaultContext context ) {
+    }
+
+    final private void setupManagers( final Configuration confCM,
+                                      final Configuration confRM,
+                                      final Context context )
+    throws Exception {
+        // Setup the RoleManager
+        DefaultRoleManager roleManager = new DefaultRoleManager();
+        roleManager.enableLogging( this.getLogger() );
+        roleManager.configure( confRM );
+
+        // Set up the ComponentLocator
+        ExcaliburComponentManager ecManager = new ExcaliburComponentManager();
+        ecManager.enableLogging( this.getLogger() );
+        ecManager.contextualize( context );
+        ecManager.setRoleManager( roleManager );
+        ecManager.setLoggerManager( new DefaultLoggerManager(this.logger));
+        ecManager.configure( confCM );
+        ecManager.initialize();
+        this.manager = new WrapperServiceManager(ecManager);
+    }
+
+    protected final Object lookup( final String key )
+    throws ServiceException {
+        return manager.lookup( key );
+    }
+
+    protected final void release( final Object object ) {
+        manager.release( object );
+    }
+    
+    protected static class DefaultLoggerManager implements LoggerManager {
+        
+        private Logger logger;
+        
+        public DefaultLoggerManager(Logger logger) {
+            this.logger = logger;
+        }
+        /* (non-Javadoc)
+         * @see org.apache.avalon.excalibur.logger.LoggerManager#getDefaultLogger()
+         */
+        public Logger getDefaultLogger() {
+            return this.logger;
+        }
+        /* (non-Javadoc)
+         * @see org.apache.avalon.excalibur.logger.LoggerManager#getLoggerForCategory(java.lang.String)
+         */
+        public Logger getLoggerForCategory(String arg0) {
+            return this.logger;
+        }
+    }
+}

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -21,13 +21,9 @@
 
 /**
  *
- * @version CVS $Id: FileGeneratorTestCase.java,v 1.8 2004/03/05 13:03:03 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class FileGeneratorTestCase extends SitemapComponentTestCase {
-
-    public FileGeneratorTestCase(String name) {
-        super(name);
-    }
 
     public void testFileGenerator() throws Exception {
 

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/generation/FileGeneratorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -20,27 +20,6 @@
   Test Cases: FileGenerator
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.xml.sax.SAXParser"
         shorthand="xml-parser"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.java	Sun Oct 24 11:02:39 2004
@@ -22,10 +22,6 @@
 
 public class WildcardURIMatcherTestCase extends SitemapComponentTestCase {
 
-    public WildcardURIMatcherTestCase(String name) {
-        super(name);
-    }
-
     public void testWildcardURIMatch() throws Exception {
         getRequest().setRequestURI("/test/foo/bla/end");
 

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/matching/WildcardURIMatcherTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: WildcardUriMatcher
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -24,10 +24,6 @@
 
 public class BrowserSelectorTestCase extends SitemapComponentTestCase {
 
-    public BrowserSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/BrowserSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: BrowserSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -27,10 +27,6 @@
 
     private final String COOKIE_SELECTOR = "cookie";
     
-    public CookieSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/CookieSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: CookieSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -28,10 +28,6 @@
 
     private final String EXCEPTION_SELECTOR = "exception";    
 
-    public ExceptionSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ExceptionSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: ExceptionSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -26,10 +26,6 @@
 
     private final String HEADER_SELECTOR = "header";
 
-    public HeaderSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HeaderSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: HeaderSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HostSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HostSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HostSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -26,10 +26,6 @@
 
     private final String HOST_SELECTOR = "host";
 
-    public HostSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/HostSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: HostSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -24,10 +24,6 @@
 
 public class ParameterSelectorTestCase extends SitemapComponentTestCase {
 
-    public ParameterSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ParameterSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: ParameterSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -30,10 +30,6 @@
 
     private final String REGEXP_HEADER_SELECTOR = "regexp-header";
 
-    public RegexpHeaderSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpHeaderSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: RegexpHeaderSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -24,10 +24,6 @@
 
 public class RegexpRequestParameterSelectorTestCase extends SitemapComponentTestCase {
 
-    public RegexpRequestParameterSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RegexpRequestParameterSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: RegexpRequestParameterSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -24,10 +24,6 @@
 
 public class RequestAttributeSelectorTestCase extends SitemapComponentTestCase {
 
-    public RequestAttributeSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestAttributeSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: RequestAttributeSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -24,10 +24,6 @@
 
 public class RequestMethodSelectorTestCase extends SitemapComponentTestCase {
 
-    public RequestMethodSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestMethodSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: RequestMethodSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -24,10 +24,6 @@
 
 public class RequestParameterSelectorTestCase extends SitemapComponentTestCase {
 
-    public RequestParameterSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/RequestParameterSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: RequestParameterSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -24,10 +24,6 @@
 
 public class ResourceExistsSelectorTestCase extends SitemapComponentTestCase {
 
-    public ResourceExistsSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/ResourceExistsSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: ResourceExistsSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -24,10 +24,6 @@
 
 public class SessionAttributeSelectorTestCase extends SitemapComponentTestCase {
 
-    public SessionAttributeSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SessionAttributeSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: SessionAttributeSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.java	Sun Oct 24 11:02:39 2004
@@ -24,10 +24,6 @@
 
 public class SimpleSelectorTestCase extends SitemapComponentTestCase {
 
-    public SimpleSelectorTestCase(String name) {
-        super(name);
-    }
-
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/selection/SimpleSelectorTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: SimpleSelector
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="WARN">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.source.SourceFactorySelector"
         shorthand="source-factories"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java	Sun Oct 24 11:02:39 2004
@@ -19,6 +19,8 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
+
+import org.apache.avalon.framework.component.WrapperComponentManager;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.Processor;
 import org.apache.cocoon.SitemapComponentTestCase;
@@ -29,17 +31,10 @@
  * A simple testcase for FilterTransformer.
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: CIncludeTransformerTestCase.java,v 1.2 2004/03/05 13:03:03 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class CIncludeTransformerTestCase extends SitemapComponentTestCase {
     
-    /** Create new testcase
-     * @param name of testase
-     */
-    public CIncludeTransformerTestCase(String name) {
-        super(name);
-    }
-    
     /**
      * Run this test suite from commandline
      *
@@ -76,10 +71,10 @@
         // the processing context stack
         MockEnvironment env = new
         MockEnvironment(null);
-        Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+        Processor processor = (Processor)this.lookup(Processor.ROLE);
         
         CocoonComponentManager.enterEnvironment(
-        env, this.manager, processor);
+        env, new WrapperComponentManager(this.getManager()), processor);
         
         assertEqual( load(result),
         transform("cinclude", src, parameters, load(input)));
@@ -106,10 +101,10 @@
         // the processing context stack
         MockEnvironment env = new
         MockEnvironment(null);
-        Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+        Processor processor = (Processor)this.lookup(Processor.ROLE);
         
         CocoonComponentManager.enterEnvironment(
-        env, this.manager, processor);
+        env, new WrapperComponentManager(this.getManager()), processor);
         
         assertEqual( load(result),
         transform("cinclude", src, parameters, load(input)));
@@ -136,10 +131,10 @@
         // the processing context stack
         MockEnvironment env = new
         MockEnvironment(null);
-        Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+        Processor processor = (Processor)this.lookup(Processor.ROLE);
         
         CocoonComponentManager.enterEnvironment(
-        env, this.manager, processor);
+        env, new WrapperComponentManager(this.getManager()), processor);
         
         assertEqual( load(result),
         transform("cinclude", src, parameters, load(input)));

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: CIncludeTransformer
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="DEBUG">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.cocoon.Processor"
         shorthand="sitemap"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/FilterTransformerTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/FilterTransformerTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/FilterTransformerTestCase.java	Sun Oct 24 11:02:39 2004
@@ -26,14 +26,10 @@
  * A simple testcase for FilterTransformer.
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: FilterTransformerTestCase.java,v 1.3 2004/03/05 13:03:03 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class FilterTransformerTestCase extends SitemapComponentTestCase {
 
-    public FilterTransformerTestCase(String name) {
-        super(name);
-    }
-    
     /**
      * Run this test suite from commandline
      *

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/FilterTransformerTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/FilterTransformerTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/FilterTransformerTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: FilterTransformer
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="DEBUG">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.xml.sax.SAXParser"
         shorthand="xml-parser"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java	Sun Oct 24 11:02:39 2004
@@ -19,6 +19,8 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
+
+import org.apache.avalon.framework.component.WrapperComponentManager;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.Processor;
 import org.apache.cocoon.SitemapComponentTestCase;
@@ -29,17 +31,10 @@
  * A simple testcase for FilterTransformer.
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: I18NTransformerTestCase.java,v 1.2 2004/03/05 13:03:03 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class I18NTransformerTestCase extends SitemapComponentTestCase {
     
-    /** Create new testcase
-     * @param name of testase
-     */
-    public I18NTransformerTestCase(String name) {
-        super(name);
-    }
-    
     /**
      * Run this test suite from commandline
      *
@@ -76,10 +71,10 @@
         // the processing context stack
         MockEnvironment env = new
         MockEnvironment(null);
-        Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+        Processor processor = (Processor)this.lookup(Processor.ROLE);
         
         CocoonComponentManager.enterEnvironment(
-        env, this.manager, processor);
+        env, new WrapperComponentManager(this.getManager()), processor);
         
         assertEqual( load(result),
         transform("i18n", src, parameters, load(input)));
@@ -105,10 +100,10 @@
         // the processing context stack
         MockEnvironment env = new
         MockEnvironment(null);
-        Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+        Processor processor = (Processor)this.lookup(Processor.ROLE);
         
         CocoonComponentManager.enterEnvironment(
-        env, this.manager, processor);
+        env, new WrapperComponentManager(this.getManager()), processor);
         
         assertEqual( load(result),
         transform("i18n", src, parameters, load(input)));

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: CIncludeTransformer
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="DEBUG">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.cocoon.Processor"
         shorthand="sitemap"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.java	Sun Oct 24 11:02:39 2004
@@ -25,13 +25,9 @@
  *
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: TraxTransformerTestCase.java,v 1.6 2004/03/05 13:03:03 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class TraxTransformerTestCase extends SitemapComponentTestCase {
-
-    public TraxTransformerTestCase(String name) {
-        super(name);
-    }
 
     public void testFunctionForXalan() throws Exception {
 

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: TraxTransformer
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="ERROR">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.excalibur.xml.sax.SAXParser"
         shorthand="xml-parser"

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java	Sun Oct 24 11:02:39 2004
@@ -19,6 +19,8 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
+
+import org.apache.avalon.framework.component.WrapperComponentManager;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.Processor;
 import org.apache.cocoon.SitemapComponentTestCase;
@@ -29,17 +31,10 @@
  * A simple testcase for FilterTransformer.
  *
  * @author <a href="mailto:stephan@apache.org">Stephan Michels </a>
- * @version CVS $Id: XIncludeTransformerTestCase.java,v 1.2 2004/03/05 13:03:03 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class XIncludeTransformerTestCase extends SitemapComponentTestCase {
     
-    /** Create new testcase
-     * @param name of testase
-     */
-    public XIncludeTransformerTestCase(String name) {
-        super(name);
-    }
-    
     /**
      * Run this test suite from commandline
      *
@@ -75,10 +70,10 @@
         // the processing context stack
         MockEnvironment env = new
         MockEnvironment(null);
-        Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+        Processor processor = (Processor)this.lookup(Processor.ROLE);
         
         CocoonComponentManager.enterEnvironment(
-        env, this.manager, processor);
+        env, new WrapperComponentManager(this.getManager()), processor);
         
         assertEqual( load(result),
         transform("xinclude", src, parameters, load(input)));
@@ -102,10 +97,10 @@
         // the processing context stack
         MockEnvironment env = new
         MockEnvironment(null);
-        Processor processor = (Processor)this.manager.lookup(Processor.ROLE);
+        Processor processor = (Processor)this.lookup(Processor.ROLE);
         
         CocoonComponentManager.enterEnvironment(
-        env, this.manager, processor);
+        env, new WrapperComponentManager(this.getManager()), processor);
         
         assertEqual( load(result),
         transform("xinclude", src, parameters, load(input)));

Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.xtest
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.xtest	(original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.xtest	Sun Oct 24 11:02:39 2004
@@ -19,27 +19,6 @@
   Test Cases: CIncludeTransformer
  </annotation>
 
- <logkit>
-  <factories>
-   <factory type="stream" class="org.apache.avalon.excalibur.logger.factory.StreamTargetFactory"/>
-  </factories>
-  <targets>
-   <stream id="root">
-    <stream>System.out</stream>
-    <format type="extended">
-     %7.7{priority} %5.5{time}   [%9.9{category}] (%{context}): %{message}\n%{throwable}
-    </format>
-   </stream>
-  </targets>
-  <categories>
-   <category name="test" log-level="DEBUG">
-    <log-target id-ref="root"/>
-   </category>
-  </categories>
- </logkit>
-
- <context/>
-
  <roles>
   <role name="org.apache.cocoon.Processor"
         shorthand="sitemap"

Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml	Sun Oct 24 11:02:39 2004
@@ -56,6 +56,7 @@
       <!-- blocks source dirs -->
       <dirset dir="${blocks}">
         <include name="*/java"/>
+        <include name="*/test"/>
         <include name="*/java${target.vm}"/>
       </dirset>
     </path>

Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml	Sun Oct 24 11:02:39 2004
@@ -48,6 +48,7 @@
           <exclude name="**/*$$*Test.class" />
           <exclude name="**/Abstract*.class" />
           <exclude name="**/SitemapComponentTestCase*"/>
+          <exclude name="**/ContainerTestCase*"/>
         </fileset>
       </batchtest>
     </junit>

Mime
View raw message