You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/12/26 20:51:43 UTC
svn commit: r606939 - in
/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl: ./
src/test/java/org/apache/cocoon/forms/datatype/
src/test/java/org/apache/cocoon/forms/formmodel/
src/test/resources/org/apache/cocoon/forms/datatype/ src/test/resources/or...
Author: gkossakowski
Date: Wed Dec 26 11:51:41 2007
New Revision: 606939
URL: http://svn.apache.org/viewvc?rev=606939&view=rev
Log:
Enabled all test-cases of Forms that were excluded for various reasons. Configuration of test-cases has been adjusted to the springified Forms which is the first step to make test-cases independent from our testing architecture ([Cocoon/Container]TestCase class) that is very heavy-weight.
This commit incorporates work-around invented by Joerg for COCOON-2155.
It fixes COCOON-1688.
Added:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.spring.xml (with props)
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.spring.xml (with props)
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/FieldTestCase.spring.xml (with props)
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/GroupTestCase.spring.xml (with props)
Modified:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/AbstractSelectionListTestCase.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/formmodel/FieldTestCase.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/formmodel/GroupTestCase.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.xtest
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.xtest
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/FieldTestCase.xtest
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/GroupTestCase.xtest
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml?rev=606939&r1=606938&r2=606939&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml Wed Dec 26 11:51:41 2007
@@ -45,13 +45,6 @@
<include>**/*TestCase.class</include>
<include>**/*Test.class</include>
</includes>
- <excludes>
- <exclude>**/DynamicSelectionListTestCase*</exclude>
- <exclude>**/EnumSelectionListTestCase*</exclude>
- <exclude>**/FlowJXPathSelectionListTestCase*</exclude>
- <exclude>**/FieldTestCase*</exclude>
- <exclude>**/GroupTestCase*</exclude>
- </excludes>
</configuration>
</plugin>
</plugins>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/AbstractSelectionListTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/AbstractSelectionListTestCase.java?rev=606939&r1=606938&r2=606939&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/AbstractSelectionListTestCase.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/AbstractSelectionListTestCase.java Wed Dec 26 11:51:41 2007
@@ -25,17 +25,15 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.cocoon.core.container.ContainerTestCase;
-
+import org.apache.cocoon.CocoonTestCase;
import org.custommonkey.xmlunit.Diff;
-
import org.w3c.dom.Document;
/**
* Abstract TestCase for CForms's SelectionList datatypes.
* @version $Id$
*/
-public abstract class AbstractSelectionListTestCase extends ContainerTestCase {
+public abstract class AbstractSelectionListTestCase extends CocoonTestCase {
protected DatatypeManager datatypeManager;
protected DocumentBuilder parser;
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.java?rev=606939&r1=606938&r2=606939&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.java Wed Dec 26 11:51:41 2007
@@ -55,6 +55,8 @@
ResourceSource expectedSource =
new ResourceSource("resource://org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.dest.xml");
Document expected = this.parser.parse(expectedSource.getInputStream());
+ // FIXME: Why is the namespace declaration available as attribute on the expected document? (see COCOON-2155)
+ expected.getDocumentElement().removeAttribute("xmlns:" + FormsConstants.INSTANCE_PREFIX);
assertEqual("Test if output is what is expected",
expected, dest.getDocument());
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java?rev=606939&r1=606938&r2=606939&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java Wed Dec 26 11:51:41 2007
@@ -19,6 +19,7 @@
import java.util.Locale;
+import org.apache.cocoon.forms.FormsConstants;
import org.apache.cocoon.forms.datatype.typeimpl.EnumType;
import org.apache.cocoon.xml.dom.DOMBuilder;
@@ -47,6 +48,9 @@
new ResourceSource("resource://org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.dest-no-null.xml");
Document expected = this.parser.parse(expectedSource.getInputStream());
Document destDocument = dest.getDocument();
+ // FIXME: Why is the namespace declaration available as attribute on the expected document? (see COCOON-2155)
+ expected.getDocumentElement().removeAttribute("xmlns:" + FormsConstants.INSTANCE_PREFIX);
+ expected.getDocumentElement().removeAttribute("xmlns:i18n");
assertEqual("Test if output is what is expected",
expected, destDocument);
}
@@ -65,6 +69,9 @@
new ResourceSource("resource://org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.dest.xml");
Document expected = this.parser.parse(expectedSource.getInputStream());
Document destDocument = dest.getDocument();
+ // FIXME: Why is the namespace declaration available as attribute on the expected document? (see COCOON-2155)
+ expected.getDocumentElement().removeAttribute("xmlns:" + FormsConstants.INSTANCE_PREFIX);
+ expected.getDocumentElement().removeAttribute("xmlns:i18n");
assertEqual("Test if output is what is expected",
expected, destDocument);
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/formmodel/FieldTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/formmodel/FieldTestCase.java?rev=606939&r1=606938&r2=606939&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/formmodel/FieldTestCase.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/formmodel/FieldTestCase.java Wed Dec 26 11:51:41 2007
@@ -17,7 +17,7 @@
package org.apache.cocoon.forms.formmodel;
-import org.apache.cocoon.core.container.ContainerTestCase;
+import org.apache.cocoon.CocoonTestCase;
import org.apache.cocoon.environment.mock.MockRequest;
import org.apache.cocoon.forms.FormContext;
import org.apache.cocoon.forms.event.ValueChangedEvent;
@@ -30,7 +30,7 @@
* @version $Id$
*/
-public class FieldTestCase extends ContainerTestCase {
+public class FieldTestCase extends CocoonTestCase {
public static final String VALUE_PATH = "fi:fragment/fi:field/fi:value";
public static final String VALIDATION_PATH = "fi:fragment/fi:field/fi:validation-message";
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/formmodel/GroupTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/formmodel/GroupTestCase.java?rev=606939&r1=606938&r2=606939&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/formmodel/GroupTestCase.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/formmodel/GroupTestCase.java Wed Dec 26 11:51:41 2007
@@ -19,7 +19,7 @@
import junit.framework.Assert;
-import org.apache.cocoon.core.container.ContainerTestCase;
+import org.apache.cocoon.CocoonTestCase;
import org.apache.cocoon.forms.datatype.typeimpl.IntegerType;
/**
@@ -28,7 +28,7 @@
* @version $Id$
*/
-public class GroupTestCase extends ContainerTestCase {
+public class GroupTestCase extends CocoonTestCase {
/**
* checks for correct inheritance
Added: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.spring.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.spring.xml?rev=606939&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.spring.xml (added)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.spring.xml Wed Dec 26 11:51:41 2007
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
+
+ <import resource="classpath:META-INF/cocoon/spring/cocoon-forms.xml" />
+ <import resource="classpath:META-INF/cocoon/spring/cocoon-xml-impl.xml" />
+
+</beans>
\ No newline at end of file
Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.spring.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.spring.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.xtest
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.xtest?rev=606939&r1=606938&r2=606939&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.xtest (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.xtest Wed Dec 26 11:51:41 2007
@@ -17,76 +17,10 @@
-->
<testcase>
<roles>
-
- <role name="org.apache.cocoon.forms.datatype.DatatypeManager"
- shorthand="forms-datatype"
- default-class="org.apache.cocoon.forms.datatype.DefaultDatatypeManager"/>
-
- <role name="org.apache.cocoon.forms.expression.ExpressionManager"
- shorthand="forms-expression"
- default-class="org.apache.cocoon.forms.expression.DefaultExpressionManager"/>
-
- <role name="org.apache.excalibur.xmlizer.XMLizer"
- shorthand="xmlizer"
- default-class="org.apache.excalibur.xmlizer.DefaultXMLizer"/>
-
- <role name="org.apache.excalibur.xml.sax.SAXParser"
- shorthand="xml-parser"
- default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
+
+ <role name="org.apache.excalibur.xml.xpath.XPathProcessor"
+ default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
</roles>
-
- <components>
- <forms-datatype logger="forms">
- <datatypes>
- <datatype name="string" src="org.apache.cocoon.forms.datatype.typeimpl.StringTypeBuilder">
- <convertors default="dummy" plain="dummy">
- <convertor name="dummy" src="org.apache.cocoon.forms.datatype.convertor.DummyStringConvertorBuilder"/>
- </convertors>
- </datatype>
- <datatype name="long" src="org.apache.cocoon.forms.datatype.typeimpl.LongTypeBuilder">
- <convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainLongConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.forms.datatype.convertor.FormattingLongConvertorBuilder"/>
- </convertors>
- </datatype>
- <datatype name="decimal" src="org.apache.cocoon.forms.datatype.typeimpl.DecimalTypeBuilder">
- <convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainDecimalConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.forms.datatype.convertor.FormattingDecimalConvertorBuilder"/>
- </convertors>
- </datatype>
- <datatype name="date" src="org.apache.cocoon.forms.datatype.typeimpl.DateTypeBuilder">
- <convertors default="formatting" plain="millis">
- <convertor name="formatting" src="org.apache.cocoon.forms.datatype.convertor.FormattingDateConvertorBuilder"/>
- <convertor name="millis" src="org.apache.cocoon.forms.datatype.convertor.MillisDateConvertorBuilder"/>
- </convertors>
- </datatype>
- <datatype name="boolean" src="org.apache.cocoon.forms.datatype.typeimpl.BooleanTypeBuilder">
- <convertors default="plain" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainBooleanConvertorBuilder"/>
- </convertors>
- </datatype>
- <datatype name="integer" src="org.apache.cocoon.forms.datatype.typeimpl.IntegerTypeBuilder">
- <convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainIntegerConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.forms.datatype.convertor.FormattingIntegerConvertorBuilder"/>
- </convertors>
- </datatype>
- </datatypes>
- <validation-rules>
- <validation-rule name="length" src="org.apache.cocoon.forms.datatype.validationruleimpl.LengthValidationRuleBuilder"/>
- <validation-rule name="email" src="org.apache.cocoon.forms.datatype.validationruleimpl.EmailValidationRuleBuilder"/>
- <validation-rule name="value-count" src="org.apache.cocoon.forms.datatype.validationruleimpl.ValueCountValidationRuleBuilder"/>
- <validation-rule name="range" src="org.apache.cocoon.forms.datatype.validationruleimpl.RangeValidationRuleBuilder"/>
- <validation-rule name="assert" src="org.apache.cocoon.forms.datatype.validationruleimpl.AssertValidationRuleBuilder"/>
- <validation-rule name="mod10" src="org.apache.cocoon.forms.datatype.validationruleimpl.Mod10ValidationRuleBuilder"/>
- <validation-rule name="regexp" src="org.apache.cocoon.forms.datatype.validationruleimpl.RegExpValidationRuleBuilder"/>
- </validation-rules>
- </forms-datatype>
-
- <forms-expression logger="forms.expression"/>
-
- </components>
</testcase>
Added: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.spring.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.spring.xml?rev=606939&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.spring.xml (added)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.spring.xml Wed Dec 26 11:51:41 2007
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
+
+ <import resource="classpath:META-INF/cocoon/spring/cocoon-forms.xml" />
+ <import resource="classpath:META-INF/cocoon/spring/cocoon-xml-impl.xml" />
+
+</beans>
\ No newline at end of file
Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.spring.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.spring.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.xtest
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.xtest?rev=606939&r1=606938&r2=606939&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.xtest (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.xtest Wed Dec 26 11:51:41 2007
@@ -18,75 +18,9 @@
<testcase>
<roles>
- <role name="org.apache.cocoon.forms.datatype.DatatypeManager"
- shorthand="forms-datatype"
- default-class="org.apache.cocoon.forms.datatype.DefaultDatatypeManager"/>
-
- <role name="org.apache.cocoon.forms.expression.ExpressionManager"
- shorthand="forms-expression"
- default-class="org.apache.cocoon.forms.expression.DefaultExpressionManager"/>
-
- <role name="org.apache.excalibur.xmlizer.XMLizer"
- shorthand="xmlizer"
- default-class="org.apache.excalibur.xmlizer.DefaultXMLizer"/>
-
- <role name="org.apache.excalibur.xml.sax.SAXParser"
- shorthand="xml-parser"
- default-class="org.apache.excalibur.xml.impl.JaxpParser"/>
+ <role name="org.apache.excalibur.xml.xpath.XPathProcessor"
+ default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
</roles>
-
- <components>
- <forms-datatype logger="forms">
- <datatypes>
- <datatype name="string" src="org.apache.cocoon.forms.datatype.typeimpl.StringTypeBuilder">
- <convertors default="dummy" plain="dummy">
- <convertor name="dummy" src="org.apache.cocoon.forms.datatype.convertor.DummyStringConvertorBuilder"/>
- </convertors>
- </datatype>
- <datatype name="long" src="org.apache.cocoon.forms.datatype.typeimpl.LongTypeBuilder">
- <convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainLongConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.forms.datatype.convertor.FormattingLongConvertorBuilder"/>
- </convertors>
- </datatype>
- <datatype name="decimal" src="org.apache.cocoon.forms.datatype.typeimpl.DecimalTypeBuilder">
- <convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainDecimalConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.forms.datatype.convertor.FormattingDecimalConvertorBuilder"/>
- </convertors>
- </datatype>
- <datatype name="date" src="org.apache.cocoon.forms.datatype.typeimpl.DateTypeBuilder">
- <convertors default="formatting" plain="millis">
- <convertor name="formatting" src="org.apache.cocoon.forms.datatype.convertor.FormattingDateConvertorBuilder"/>
- <convertor name="millis" src="org.apache.cocoon.forms.datatype.convertor.MillisDateConvertorBuilder"/>
- </convertors>
- </datatype>
- <datatype name="boolean" src="org.apache.cocoon.forms.datatype.typeimpl.BooleanTypeBuilder">
- <convertors default="plain" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainBooleanConvertorBuilder"/>
- </convertors>
- </datatype>
- <datatype name="integer" src="org.apache.cocoon.forms.datatype.typeimpl.IntegerTypeBuilder">
- <convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainIntegerConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.forms.datatype.convertor.FormattingIntegerConvertorBuilder"/>
- </convertors>
- </datatype>
- </datatypes>
- <validation-rules>
- <validation-rule name="length" src="org.apache.cocoon.forms.datatype.validationruleimpl.LengthValidationRuleBuilder"/>
- <validation-rule name="email" src="org.apache.cocoon.forms.datatype.validationruleimpl.EmailValidationRuleBuilder"/>
- <validation-rule name="value-count" src="org.apache.cocoon.forms.datatype.validationruleimpl.ValueCountValidationRuleBuilder"/>
- <validation-rule name="range" src="org.apache.cocoon.forms.datatype.validationruleimpl.RangeValidationRuleBuilder"/>
- <validation-rule name="assert" src="org.apache.cocoon.forms.datatype.validationruleimpl.AssertValidationRuleBuilder"/>
- <validation-rule name="mod10" src="org.apache.cocoon.forms.datatype.validationruleimpl.Mod10ValidationRuleBuilder"/>
- <validation-rule name="regexp" src="org.apache.cocoon.forms.datatype.validationruleimpl.RegExpValidationRuleBuilder"/>
- </validation-rules>
- </forms-datatype>
-
- <forms-expression logger="forms.expression"/>
-
- </components>
</testcase>
Added: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/FieldTestCase.spring.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/FieldTestCase.spring.xml?rev=606939&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/FieldTestCase.spring.xml (added)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/FieldTestCase.spring.xml Wed Dec 26 11:51:41 2007
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
+
+ <import resource="classpath:META-INF/cocoon/spring/cocoon-forms.xml" />
+ <import resource="classpath:META-INF/cocoon/spring/cocoon-xml-impl.xml" />
+
+</beans>
\ No newline at end of file
Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/FieldTestCase.spring.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/FieldTestCase.spring.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/FieldTestCase.xtest
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/FieldTestCase.xtest?rev=606939&r1=606938&r2=606939&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/FieldTestCase.xtest (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/FieldTestCase.xtest Wed Dec 26 11:51:41 2007
@@ -18,65 +18,9 @@
<testcase>
<roles>
- <role name="org.apache.cocoon.forms.datatype.DatatypeManager"
- shorthand="forms-datatype"
- default-class="org.apache.cocoon.forms.datatype.DefaultDatatypeManager"/>
+ <role name="org.apache.excalibur.xml.xpath.XPathProcessor"
+ default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
- <role name="org.apache.cocoon.forms.expression.ExpressionManager"
- shorthand="forms-expression"
- default-class="org.apache.cocoon.forms.expression.DefaultExpressionManager"/>
-
- <role name="org.apache.cocoon.forms.FormManager"
- shorthand="forms-formmanager"
- default-class="org.apache.cocoon.forms.DefaultFormManager"/>
-
- <role name="org.apache.cocoon.forms.CacheManager"
- shorthand="forms-cachemanager"
- default-class="org.apache.cocoon.forms.DefaultCacheManager"/>
-
- <role name="org.apache.cocoon.forms.validation.WidgetValidatorBuilderSelector"
- shorthand="forms-validators"
- default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
-
- <role name="org.apache.cocoon.forms.event.WidgetListenerBuilderSelector"
- shorthand="forms-widgetlisteners"
- default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
-</roles>
-
- <components>
- <forms-datatype logger="forms">
- <datatypes>
- <datatype name="string" src="org.apache.cocoon.forms.datatype.typeimpl.StringTypeBuilder">
- <convertors default="dummy" plain="dummy">
- <convertor name="dummy" src="org.apache.cocoon.forms.datatype.convertor.DummyStringConvertorBuilder"/>
- </convertors>
- </datatype>
- <datatype name="integer" src="org.apache.cocoon.forms.datatype.typeimpl.IntegerTypeBuilder">
- <convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainIntegerConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.forms.datatype.convertor.FormattingIntegerConvertorBuilder"/>
- </convertors>
- </datatype>
- </datatypes>
- <!--validation-rules>
- <validation-rule name="range" src="org.apache.cocoon.forms.datatype.validationruleimpl.RangeValidationRuleBuilder"/>
- </validation-rules-->
- </forms-datatype>
-
- <forms-validators>
- <validator name="range" class="org.apache.cocoon.forms.validation.impl.RangeValidatorBuilder"/>
- </forms-validators>
-
- <forms-formmanager>
- <widgets>
- <widget name="form" src="org.apache.cocoon.forms.formmodel.FormDefinitionBuilder"/>
- <widget name="field" src="org.apache.cocoon.forms.formmodel.FieldDefinitionBuilder"/>
- <widget name="action" src="org.apache.cocoon.forms.formmodel.ActionDefinitionBuilder"/>
- </widgets>
- </forms-formmanager>
-
- <forms-expression logger="forms.expression"/>
-
- </components>
+ </roles>
</testcase>
Added: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/GroupTestCase.spring.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/GroupTestCase.spring.xml?rev=606939&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/GroupTestCase.spring.xml (added)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/GroupTestCase.spring.xml Wed Dec 26 11:51:41 2007
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:configurator="http://cocoon.apache.org/schema/configurator"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
+
+ <import resource="classpath:META-INF/cocoon/spring/cocoon-forms.xml" />
+ <import resource="classpath:META-INF/cocoon/spring/cocoon-xml-impl.xml" />
+
+</beans>
\ No newline at end of file
Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/GroupTestCase.spring.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/GroupTestCase.spring.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/GroupTestCase.xtest
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/GroupTestCase.xtest?rev=606939&r1=606938&r2=606939&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/GroupTestCase.xtest (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/resources/org/apache/cocoon/forms/formmodel/GroupTestCase.xtest Wed Dec 26 11:51:41 2007
@@ -18,72 +18,9 @@
<testcase>
<roles>
- <role name="org.apache.cocoon.forms.datatype.DatatypeManager"
- shorthand="forms-datatype"
- default-class="org.apache.cocoon.forms.datatype.DefaultDatatypeManager"/>
+ <role name="org.apache.excalibur.xml.xpath.XPathProcessor"
+ default-class="org.apache.excalibur.xml.xpath.XPathProcessorImpl"/>
- <role name="org.apache.cocoon.forms.expression.ExpressionManager"
- shorthand="forms-expression"
- default-class="org.apache.cocoon.forms.expression.DefaultExpressionManager"/>
-
- <role name="org.apache.cocoon.forms.FormManager"
- shorthand="forms-formmanager"
- default-class="org.apache.cocoon.forms.DefaultFormManager"/>
-
- <role name="org.apache.cocoon.forms.CacheManager"
- shorthand="forms-cachemanager"
- default-class="org.apache.cocoon.forms.DefaultCacheManager"/>
-
- <role name="org.apache.cocoon.forms.validation.WidgetValidatorBuilderSelector"
- shorthand="forms-validators"
- default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
-
- <role name="org.apache.cocoon.forms.event.WidgetListenerBuilderSelector"
- shorthand="forms-widgetlisteners"
- default-class="org.apache.cocoon.components.ExtendedComponentSelector"/>
-</roles>
-
- <components>
- <forms-datatype logger="forms">
- <datatypes>
- <datatype name="string" src="org.apache.cocoon.forms.datatype.typeimpl.StringTypeBuilder">
- <convertors default="dummy" plain="dummy">
- <convertor name="dummy" src="org.apache.cocoon.forms.datatype.convertor.DummyStringConvertorBuilder"/>
- </convertors>
- </datatype>
- <datatype name="integer" src="org.apache.cocoon.forms.datatype.typeimpl.IntegerTypeBuilder">
- <convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainIntegerConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.forms.datatype.convertor.FormattingIntegerConvertorBuilder"/>
- </convertors>
- </datatype>
- <datatype name="float" src="org.apache.cocoon.forms.datatype.typeimpl.FloatTypeBuilder">
- <convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainFloatConvertorBuilder"/>
- </convertors>
- </datatype>
- </datatypes>
- </forms-datatype>
-
- <!--forms-validators>
- <validator name="range" class="org.apache.cocoon.forms.validation.impl.RangeValidatorBuilder"/>
- </forms-validators-->
-
- <forms-formmanager>
- <widgets>
- <widget name="form" src="org.apache.cocoon.forms.formmodel.FormDefinitionBuilder"/>
- <widget name="group" src="org.apache.cocoon.forms.formmodel.GroupDefinitionBuilder"/>
- <widget name="field" src="org.apache.cocoon.forms.formmodel.FieldDefinitionBuilder"/>
- <widget name="action" src="org.apache.cocoon.forms.formmodel.ActionDefinitionBuilder"/>
- </widgets>
- </forms-formmanager>
-
- <forms-expression logger="forms.expression"/>
-
- <forms-cachemanager logger="forms.cache"/>
-
- <forms-widgetlisteners logger="forms.listeners"/>
-
- </components>
+ </roles>
</testcase>