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 17:43:25 UTC
svn commit: r394123 - in
/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src:
main/java/org/apache/cocoon/components/expression/
test/resources/org/apache/cocoon/components/expression/
test/resources/org/apache/cocoon/environment/ test/resour...
Author: cziegeler
Date: Fri Apr 14 08:43:24 2006
New Revision: 394123
URL: http://svn.apache.org/viewcvs?rev=394123&view=rev
Log:
Some more test fixes
Modified:
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionFactory.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
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionFactory.java?rev=394123&r1=394122&r2=394123&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionFactory.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionFactory.java Fri Apr 14 08:43:24 2006
@@ -16,7 +16,8 @@
package org.apache.cocoon.components.expression;
public interface ExpressionFactory {
- public static String ROLE = ExpressionFactory.class.getName();
+
+ String ROLE = ExpressionFactory.class.getName();
Expression getExpression(String language, String expression) throws ExpressionException;
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=394123&r1=394122&r2=394123&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 08:43:24 2006
@@ -22,7 +22,7 @@
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.ExpressionFactory"/>
+ default-class="org.apache.cocoon.components.expression.DefaultExpressionFactory"/>
</roles>
<components>
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=394123&r1=394122&r2=394123&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 08:43:24 2006
@@ -22,7 +22,7 @@
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.ExpressionFactory"/>
+ default-class="org.apache.cocoon.components.expression.DefaultExpressionFactory"/>
</roles>
<components>
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=394123&r1=394122&r2=394123&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 08:43:24 2006
@@ -16,30 +16,18 @@
-->
<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"/>
+ <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.excalibur.source.SourceFactorySelector" shorthand="source-factories" default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
- <role name="org.apache.excalibur.source.SourceResolver" shorthand="source-resolver" default-class="org.apache.excalibur.source.impl.SourceResolverImpl"/>
<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.ExpressionFactory"/>
+ <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>
- <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.template.JXTemplateGenerator" name="jx"/>
</generators>
- <store logger="test"/>
<component role="org.apache.cocoon.template.script.ScriptManager" class="org.apache.cocoon.template.script.DefaultScriptManager"/>
<component role="org.apache.cocoon.template.script.InstructionFactory" class="org.apache.cocoon.template.script.DefaultInstructionFactory"/>
- <expression-factory/>
<string-template-parsers>
<component-instance class="org.apache.cocoon.template.expression.JXTGStringTemplateParser" name="jxtg"/>
<component-instance class="org.apache.cocoon.template.expression.DefaultStringTemplateParser" name="default"/>