You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/04/14 23:15:39 UTC
svn commit: r394201 - in /cocoon/trunk:
blocks/cocoon-midi/cocoon-midi-impl/src/test/resources/org/apache/cocoon/generation/
blocks/cocoon-midi/cocoon-midi-impl/src/test/resources/org/apache/cocoon/serialization/
blocks/cocoon-template/cocoon-template-...
Author: cziegeler
Date: Fri Apr 14 14:15:34 2006
New Revision: 394201
URL: http://svn.apache.org/viewcvs?rev=394201&view=rev
Log:
Fix all test cases
Added:
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest
Modified:
cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/test/resources/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest
cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/test/resources/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/components/accessor/AccessorTestCase.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/components/expression/ExpressionTestCase.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/environment/FOMTestCase.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/components/expression/ExpressionTestCase.xtest
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.xtest
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest
cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/test/resources/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.xtest
cocoon/trunk/core/cocoon-core/pom.xml
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigReader.java
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java
cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest
Modified: cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/test/resources/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/test/resources/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/test/resources/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest (original)
+++ cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/test/resources/org/apache/cocoon/generation/XMidiGeneratorTestCase.xtest Fri Apr 14 14:15:34 2006
@@ -17,24 +17,12 @@
<testcase>
<roles>
- <role name="org.apache.excalibur.xml.sax.SAXParser"
- shorthand="xml-parser"
- default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
-
<role name="org.apache.cocoon.generation.GeneratorSelector"
shorthand="generators"
- default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/>
+ default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
</roles>
<components>
- <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser">
- <parameter name="validate" value="false"/>
- <parameter name="namespace-prefixes" value="false"/>
- <parameter name="stop-on-warning" value="true"/>
- <parameter name="stop-on-recoverable-error" value="true"/>
- <parameter name="reuse-parsers" value="false"/>
- </xml-parser>
-
<generators logger="test">
<component-instance class="org.apache.cocoon.generation.XMidiGenerator" name="midi"/>
</generators>
Modified: cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/test/resources/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/test/resources/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/test/resources/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest (original)
+++ cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/src/test/resources/org/apache/cocoon/serialization/XMidiSerializerTestCase.xtest Fri Apr 14 14:15:34 2006
@@ -17,24 +17,12 @@
<testcase>
<roles>
- <role name="org.apache.excalibur.xml.sax.SAXParser"
- shorthand="xml-parser"
- default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
-
<role name="org.apache.cocoon.serialization.SerializerSelector"
shorthand="serializers"
- default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/>
+ default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
</roles>
<components>
- <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser">
- <parameter name="validate" value="false"/>
- <parameter name="namespace-prefixes" value="false"/>
- <parameter name="stop-on-warning" value="true"/>
- <parameter name="stop-on-recoverable-error" value="true"/>
- <parameter name="reuse-parsers" value="false"/>
- </xml-parser>
-
<serializers logger="test">
<component-instance class="org.apache.cocoon.serialization.XMidiSerializer" name="midi"/>
</serializers>
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/components/accessor/AccessorTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/components/accessor/AccessorTestCase.java?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/components/accessor/AccessorTestCase.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/components/accessor/AccessorTestCase.java Fri Apr 14 14:15:34 2006
@@ -17,8 +17,6 @@
import java.util.Map;
-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.ServiceSelector;
import org.apache.cocoon.SitemapComponentTestCase;
@@ -28,11 +26,6 @@
import org.apache.cocoon.environment.Session;
public class AccessorTestCase extends SitemapComponentTestCase {
- private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
-
- protected Logger getLogger() {
- return this.logger;
- }
public void testRequestAccessor() throws ServiceException {
ServiceSelector accessorSelector =
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/components/expression/ExpressionTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/components/expression/ExpressionTestCase.java?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/components/expression/ExpressionTestCase.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/components/expression/ExpressionTestCase.java Fri Apr 14 14:15:34 2006
@@ -15,17 +15,10 @@
*/
package org.apache.cocoon.components.expression;
-import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.CocoonTestCase;
public class ExpressionTestCase extends CocoonTestCase {
- private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
-
- protected Logger getLogger() {
- return this.logger;
- }
public void testContext() {
ExpressionContext parentContext = new ExpressionContext();
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/environment/FOMTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/environment/FOMTestCase.java?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/environment/FOMTestCase.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/environment/FOMTestCase.java Fri Apr 14 14:15:34 2006
@@ -15,8 +15,6 @@
*/
package org.apache.cocoon.environment;
-import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.SitemapComponentTestCase;
@@ -27,11 +25,6 @@
import org.apache.cocoon.template.environment.FlowObjectModelHelper;
public class FOMTestCase extends SitemapComponentTestCase {
- private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
-
- protected Logger getLogger() {
- return this.logger;
- }
public void testFOMJexl() throws ExpressionException, ServiceException {
ExpressionFactory factory = (ExpressionFactory)this.lookup(ExpressionFactory.ROLE);
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java Fri Apr 14 14:15:34 2006
@@ -20,8 +20,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.SitemapComponentTestCase;
import org.apache.cocoon.components.flow.FlowHelper;
@@ -31,7 +29,6 @@
* 14:00:24Z lgawron $
*/
public class JXTemplateGeneratorTestCase extends SitemapComponentTestCase {
- private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
String docBase = "resource://org/apache/cocoon/template/jxtg/";
String JX = "jx";
Map flowContext = new HashMap();
@@ -61,10 +58,6 @@
public Map getFlowContext() {
return this.flowContext;
- }
-
- protected Logger getLogger() {
- return this.logger;
}
public void testGenerate() throws Exception {
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/components/expression/ExpressionTestCase.xtest
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/components/expression/ExpressionTestCase.xtest?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/components/expression/ExpressionTestCase.xtest (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/components/expression/ExpressionTestCase.xtest Fri Apr 14 14:15:34 2006
@@ -20,12 +20,11 @@
<role name="org.apache.cocoon.components.expression.ExpressionCompilerSelector"
shorthand="expression-compilers"
default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
- <role name="org.apache.cocoon.components.expression.ExpressionFactory"
- shorthand="expression-factory"
- default-class="org.apache.cocoon.components.expression.DefaultExpressionFactory"/>
</roles>
<components>
+ <component role="org.apache.cocoon.components.expression.ExpressionFactory"
+ class="org.apache.cocoon.components.expression.DefaultExpressionFactory"/>
<expression-compilers>
<component-instance class="org.apache.cocoon.components.expression.jxpath.JXPathCompiler" name="default"/>
<component-instance class="org.apache.cocoon.components.expression.jexl.JexlCompiler" name="jexl"/>
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.xtest
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.xtest?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.xtest (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.xtest Fri Apr 14 14:15:34 2006
@@ -20,12 +20,11 @@
<role name="org.apache.cocoon.components.expression.ExpressionCompilerSelector"
shorthand="expression-compilers"
default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
- <role name="org.apache.cocoon.components.expression.ExpressionFactory"
- shorthand="expression-factory"
- default-class="org.apache.cocoon.components.expression.DefaultExpressionFactory"/>
</roles>
<components>
+ <component role="org.apache.cocoon.components.expression.ExpressionFactory"
+ class="org.apache.cocoon.components.expression.DefaultExpressionFactory"/>
<expression-compilers>
<component-instance class="org.apache.cocoon.components.expression.jexl.JexlCompiler" name="jexl"/>
<component-instance class="org.apache.cocoon.components.expression.jxpath.JXPathCompiler" name="jxpath"/>
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.xtest Fri Apr 14 14:15:34 2006
@@ -19,10 +19,11 @@
<role name="org.apache.cocoon.generation.GeneratorSelector" shorthand="generators" default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
<role name="org.apache.excalibur.store.Store/TransientStore" shorthand="store" default-class="org.apache.excalibur.store.impl.MemoryStore"/>
<role name="org.apache.cocoon.components.expression.ExpressionCompilerSelector" shorthand="expression-compilers" default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
- <role name="org.apache.cocoon.components.expression.ExpressionFactory" shorthand="expression-factory" default-class="org.apache.cocoon.components.expression.DefaultExpressionFactory"/>
<role name="org.apache.cocoon.template.expression.StringTemplateParserSelector" shorthand="string-template-parsers" default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
</roles>
<components>
+ <component role="org.apache.cocoon.components.expression.ExpressionFactory"
+ class="org.apache.cocoon.components.expression.DefaultExpressionFactory"/>
<generators logger="test">
<component-instance class="org.apache.cocoon.template.JXTemplateGenerator" name="jx"/>
</generators>
Modified: cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/test/resources/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.xtest
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-webdav/cocoon-webdav-impl/src/test/resources/org/apache/cocoon/components/source/impl/WebDAVSourceTestCase.xtest?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
Binary files - no diff available.
Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/pom.xml?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Fri Apr 14 14:15:34 2006
@@ -66,10 +66,6 @@
<exclude>**/ContainerTestCase*</exclude>
<exclude>**/CocoonTestCase*</exclude>
<exclude>**/Virtual*TestCase*</exclude>
- <exclude>**/CIncludeTransformerTestCase*</exclude>
- <exclude>**/I18NTransformerTestCase*</exclude>
- <exclude>**/TraxTransformerTestCase*</exclude>
- <exclude>**/XIncludeTransformerTestCase*</exclude>
</excludes>
<!-- currently triggers NPE in surefire plugin
<systemProperties>
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigReader.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigReader.java?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigReader.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigReader.java Fri Apr 14 14:15:34 2006
@@ -68,8 +68,17 @@
AvalonEnvironment env,
SourceResolver resolver)
throws Exception {
+ return readConfiguration(config, null, parentInfo, env, resolver);
+ }
+
+ public static ConfigurationInfo readConfiguration(Configuration rolesConfig,
+ Configuration componentConfig,
+ ConfigurationInfo parentInfo,
+ AvalonEnvironment env,
+ SourceResolver resolver)
+ throws Exception {
final ConfigReader converter = new ConfigReader(env, parentInfo, resolver);
- converter.convert(config, null);
+ converter.convert(rolesConfig, componentConfig, null);
return converter.configInfo;
}
@@ -120,14 +129,14 @@
final ConfigurationBuilder b = new ConfigurationBuilder(this.environment.settings);
final Configuration config = b.build(SourceUtil.getInputSource(root));
- this.convert(config, root.getURI());
+ this.convert(config, null, root.getURI());
} finally {
this.resolver.release(root);
}
}
- protected void convert(Configuration config, String rootUri)
+ protected void convert(Configuration config, Configuration additionalConfig, String rootUri)
throws Exception {
if ( this.getLogger().isInfoEnabled() ) {
this.getLogger().info("Converting Avalon configuration from configuration object: " + config);
@@ -162,6 +171,14 @@
}
}
}
+ if ( additionalConfig != null ) {
+ if ( "role-list".equals(additionalConfig.getName()) || "roles".equals(additionalConfig.getName())) {
+ this.configureRoles(additionalConfig);
+ } else {
+ this.parseConfiguration(additionalConfig, null, loadedConfigs);
+ }
+ }
+
// add roles as components
final Iterator i = this.configInfo.getClassNames().values().iterator();
while ( i.hasNext() ) {
Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java Fri Apr 14 14:15:34 2006
@@ -25,8 +25,11 @@
import org.apache.excalibur.source.impl.ResourceSourceFactory;
import org.apache.excalibur.source.impl.SourceResolverImpl;
import org.apache.excalibur.source.impl.URLSourceFactory;
+import org.apache.excalibur.xml.dom.DOMParser;
import org.apache.excalibur.xml.impl.JaxpParser;
import org.apache.excalibur.xml.sax.SAXParser;
+import org.apache.excalibur.xmlizer.DefaultXMLizer;
+import org.apache.excalibur.xmlizer.XMLizer;
/**
* Testcase for Cocoon.
@@ -66,6 +69,7 @@
component.setDefaultValue("*");
component.setConfiguration(new DefaultConfiguration("-"));
info.addComponent(component);
+ info.getShorthands().put("source-factories", SourceFactory.ROLE + "Selector");
}
if ( this.addSourceResolver() ) {
ComponentInfo component = new ComponentInfo();
@@ -81,6 +85,20 @@
component.setConfiguration(new DefaultConfiguration("-"));
info.addComponent(component);
}
+ if ( this.addDOMParser() ) {
+ ComponentInfo component = new ComponentInfo();
+ component.setComponentClassName(JaxpParser.class.getName());
+ component.setRole(DOMParser.ROLE);
+ component.setConfiguration(new DefaultConfiguration("-"));
+ info.addComponent(component);
+ }
+ if ( this.addXMLizer() ) {
+ ComponentInfo component = new ComponentInfo();
+ component.setComponentClassName(DefaultXMLizer.class.getName());
+ component.setRole(XMLizer.ROLE);
+ component.setConfiguration(new DefaultConfiguration("-"));
+ info.addComponent(component);
+ }
}
/**
@@ -107,6 +125,24 @@
* default is true.
*/
protected boolean addSAXParser() {
+ return true;
+ }
+
+ /**
+ * This method should return true if the dom parser should
+ * be added automatically. Can be overwritten by subclasses. The
+ * default is true.
+ */
+ protected boolean addDOMParser() {
+ return true;
+ }
+
+ /**
+ * This method should return true if the xmlizer should
+ * be added automatically. Can be overwritten by subclasses. The
+ * default is true.
+ */
+ protected boolean addXMLizer() {
return true;
}
}
Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java Fri Apr 14 14:15:34 2006
@@ -137,6 +137,9 @@
/** The root bean factory. */
private ConfigurableListableBeanFactory rootBeanFactory;
+ /** The bean factory containing the avalon components. */
+ private ConfigurableListableBeanFactory beanFactory;
+
/** Return the logger */
protected Logger getLogger() {
return logger;
@@ -149,7 +152,7 @@
/** Return the bean factory. */
protected ConfigurableListableBeanFactory getBeanFactory() {
- return this.rootBeanFactory;
+ return this.beanFactory;
}
/**
@@ -211,7 +214,7 @@
// setup context
this.context = this.setupContext( conf.getChild( "context" ) );
- this.setupManagers( conf.getChild( "components" ), conf.getChild( "roles" ) );
+ this.setupBeanFactories( conf.getChild( "components" ), conf.getChild( "roles" ) );
}
/**
@@ -286,8 +289,8 @@
// subclasses can add components here
}
- final private void setupManagers( final Configuration confCM,
- final Configuration confRM)
+ final private void setupBeanFactories( final Configuration confCM,
+ final Configuration confRM)
throws Exception {
final AvalonEnvironment avalonEnv = new AvalonEnvironment();
avalonEnv.logger = this.logger;
@@ -296,16 +299,12 @@
avalonEnv.servletContext = new MockContext();
this.rootBeanFactory = BeanFactoryUtil.createRootBeanFactory(avalonEnv);
- // read roles
- ConfigurationInfo rolesInfo = ConfigReader.readConfiguration(confRM, null, avalonEnv, null);
+ // read roles and components
+ ConfigurationInfo rolesInfo = ConfigReader.readConfiguration(confRM, confCM, null, avalonEnv, null);
this.addComponents( rolesInfo );
- ConfigurableListableBeanFactory rolesContext = BeanFactoryUtil.createBeanFactory(avalonEnv, rolesInfo, null, this.rootBeanFactory, false);
-
- // read components
- ConfigurationInfo componentsInfo = ConfigReader.readConfiguration(confCM, rolesInfo, avalonEnv, null);
- ConfigurableListableBeanFactory componentsContext = BeanFactoryUtil.createBeanFactory(avalonEnv, componentsInfo, null, rolesContext, false);
+ this.beanFactory = BeanFactoryUtil.createBeanFactory(avalonEnv, rolesInfo, null, this.rootBeanFactory, false);
- this.manager = (ServiceManager)componentsContext.getBean(ServiceManager.class.getName());
+ this.manager = (ServiceManager)this.beanFactory.getBean(ServiceManager.class.getName());
}
protected final Object lookup( final String key )
Added: cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest?rev=394201&view=auto
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest (added)
+++ cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/CIncludeTransformerTestCase.xtest Fri Apr 14 14:15:34 2006
@@ -0,0 +1,27 @@
+<?xml version="1.0" ?>
+<!--
+ Copyright 1999-2006 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.
+-->
+<testcase>
+ <roles>
+ <role name="org.apache.excalibur.xml.xpath.XPathProcessor"
+ default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
+
+ </roles>
+
+ <components>
+ </components>
+
+</testcase>
Modified: cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest?rev=394201&r1=394200&r2=394201&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest (original)
+++ cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/transformation/TraxTransformerTestCase.xtest Fri Apr 14 14:15:34 2006
@@ -16,21 +16,13 @@
-->
<testcase>
<roles>
- <role name="org.apache.excalibur.xml.sax.SAXParser"
- shorthand="xml-parser"
- default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
-
- <role name="org.apache.excalibur.xmlizer.XMLizer"
- shorthand="xmlizer"
- default-class="org.apache.excalibur.xmlizer.DefaultXMLizer"/>
-
<role name="org.apache.excalibur.xml.xslt.XSLTProcessor"
shorthand="xslt-processor"
default-class="org.apache.excalibur.xml.xslt.XSLTProcessorImpl"/>
<role name="org.apache.cocoon.transformation.TransformerSelector"
shorthand="transformers"
- default-class="org.apache.cocoon.core.container.StandaloneServiceSelector"/>
+ default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
<role name="org.apache.excalibur.store.Store/TransientStore"
shorthand="transient-store"
@@ -42,20 +34,6 @@
</roles>
<components>
- <xml-parser class="org.apache.excalibur.xml.impl.JaxpParser">
- <parameter name="validate" value="false"/>
- <parameter name="namespace-prefixes" value="false"/>
- <parameter name="stop-on-warning" value="true"/>
- <parameter name="stop-on-recoverable-error" value="true"/>
- <parameter name="reuse-parsers" value="false"/>
- </xml-parser>
-
- <xmlizer/>
-
- <transient-store/>
-
- <persistent-store/>
-
<xslt-processor logger="core.xslt-processor">
<parameter name="use-store" value="true"/>
<parameter name="incremental-processing" value="true"/>