You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by st...@apache.org on 2004/03/10 10:13:22 UTC
cvs commit: cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/convertor EnumConvertorBuilderTestCase.java EnumConvertorTestCase.conf.xml EnumConvertorTestCase.java
stephan 2004/03/10 01:13:22
Modified: src/blocks/forms/test/org/apache/cocoon/forms/datatype
DynamicSelectionListTestCase.dest.xml
DynamicSelectionListTestCase.java
DynamicSelectionListTestCase.source.xml
DynamicSelectionListTestCase.xtest
EnumSelectionListTestCase.dest-no-null.xml
EnumSelectionListTestCase.dest.xml
EnumSelectionListTestCase.java
EnumSelectionListTestCase.xtest
FlowJXPathSelectionListTestCase.dest.xml
FlowJXPathSelectionListTestCase.java
FlowJXPathSelectionListTestCase.source.xml
FlowJXPathSelectionListTestCase.xtest
FlowJXPathSelectionListTestCaseWithNull.dest.xml
src/blocks/forms/test/org/apache/cocoon/forms/datatype/convertor
EnumConvertorBuilderTestCase.java
EnumConvertorTestCase.conf.xml
EnumConvertorTestCase.java
Log:
woody -> forms
Revision Changes Path
1.2 +5 -5 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.dest.xml
Index: DynamicSelectionListTestCase.dest.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.dest.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DynamicSelectionListTestCase.dest.xml 9 Mar 2004 13:03:10 -0000 1.1
+++ DynamicSelectionListTestCase.dest.xml 10 Mar 2004 09:13:22 -0000 1.2
@@ -3,7 +3,7 @@
Copyright 1999-2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
+ you may not use this file except in compliance fith the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -14,8 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<wi:selection-list xmlns:wi="http://apache.org/cocoon/woody/instance/1.0">
+<fi:selection-list xmlns:fi="http://apache.org/cocoon/forms/1.0#instance">
- <wi:item value="10/11/03"><wi:label>10/11/03</wi:label></wi:item>
- <wi:item value="2/4/63"><wi:label>My birthdate</wi:label></wi:item>
-</wi:selection-list>
+ <fi:item value="10/11/03"><fi:label>10/11/03</fi:label></fi:item>
+ <fi:item value="2/4/63"><fi:label>My birthdate</fi:label></fi:item>
+</fi:selection-list>
1.3 +3 -3 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.java
Index: DynamicSelectionListTestCase.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DynamicSelectionListTestCase.java 9 Mar 2004 13:08:46 -0000 1.2
+++ DynamicSelectionListTestCase.java 10 Mar 2004 09:13:22 -0000 1.3
@@ -83,7 +83,7 @@
public void testGenerateSaxFragment() throws Exception {
DOMBuilder dest = new DOMBuilder();
ResourceSource source =
- new ResourceSource("resource://org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.source.xml");
+ new ResourceSource("resource://org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.source.xml");
Document sourceDoc = parser.parse(source.getInputStream());
Element datatypeElement = (Element) sourceDoc.getElementsByTagNameNS(Constants.DEFINITION_NS, "convertor").item(0);
Datatype datatype = datatypeManager.createDatatype(datatypeElement, false);
@@ -91,7 +91,7 @@
new DynamicSelectionList(datatype, null, serviceManager);
list.generateSaxFragment(dest, Locale.ENGLISH, source);
ResourceSource expectedSource =
- new ResourceSource("resource://org/apache/cocoon/woody/datatype/DynamicSelectionListTestCase.dest.xml");
+ new ResourceSource("resource://org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.dest.xml");
Document expected = parser.parse(expectedSource.getInputStream());
assertEqual("Test if output is what is expected",
expected, dest.getDocument());
1.2 +10 -10 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.source.xml
Index: DynamicSelectionListTestCase.source.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.source.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DynamicSelectionListTestCase.source.xml 9 Mar 2004 13:03:10 -0000 1.1
+++ DynamicSelectionListTestCase.source.xml 10 Mar 2004 09:13:22 -0000 1.2
@@ -20,12 +20,12 @@
| $Id$
+-->
-<wd:selection-list xmlns:wd="http://apache.org/cocoon/woody/definition/1.0">
- <wd:convertor type="formatting" base="date">
- <wd:patterns>
- <wd:pattern>yyyy-MM-dd</wd:pattern>
- </wd:patterns>
- </wd:convertor>
- <wd:item value="2003-10-11"/>
- <wd:item value="1963-02-04"><wd:label>My birthdate</wd:label></wd:item>
-</wd:selection-list>
+<fd:selection-list xmlns:fd="http://apache.org/cocoon/forms/1.0#definition">
+ <fd:convertor type="formatting" base="date">
+ <fd:patterns>
+ <fd:pattern>yyyy-MM-dd</fd:pattern>
+ </fd:patterns>
+ </fd:convertor>
+ <fd:item value="2003-10-11"/>
+ <fd:item value="1963-02-04"><fd:label>My birthdate</fd:label></fd:item>
+</fd:selection-list>
1.2 +33 -33 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.xtest
Index: DynamicSelectionListTestCase.xtest
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/DynamicSelectionListTestCase.xtest,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DynamicSelectionListTestCase.xtest 9 Mar 2004 13:03:10 -0000 1.1
+++ DynamicSelectionListTestCase.xtest 10 Mar 2004 09:13:22 -0000 1.2
@@ -42,13 +42,13 @@
<roles>
- <role name="org.apache.cocoon.woody.datatype.DatatypeManager"
- shorthand="woody-datatype"
- default-class="org.apache.cocoon.woody.datatype.DefaultDatatypeManager"/>
-
- <role name="org.apache.cocoon.woody.expression.ExpressionManager"
- shorthand="woody-expression"
- default-class="org.apache.cocoon.woody.expression.DefaultExpressionManager"/>
+ <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"
@@ -61,55 +61,55 @@
</roles>
<components>
- <woody-datatype logger="woody">
+ <forms-datatype logger="forms">
<datatypes>
- <datatype name="string" src="org.apache.cocoon.woody.datatype.typeimpl.StringTypeBuilder">
+ <datatype name="string" src="org.apache.cocoon.forms.datatype.typeimpl.StringTypeBuilder">
<convertors default="dummy" plain="dummy">
- <convertor name="dummy" src="org.apache.cocoon.woody.datatype.convertor.DummyStringConvertorBuilder"/>
+ <convertor name="dummy" src="org.apache.cocoon.forms.datatype.convertor.DummyStringConvertorBuilder"/>
</convertors>
</datatype>
- <datatype name="long" src="org.apache.cocoon.woody.datatype.typeimpl.LongTypeBuilder">
+ <datatype name="long" src="org.apache.cocoon.forms.datatype.typeimpl.LongTypeBuilder">
<convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.woody.datatype.convertor.PlainLongConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.woody.datatype.convertor.FormattingLongConvertorBuilder"/>
+ <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.woody.datatype.typeimpl.DecimalTypeBuilder">
+ <datatype name="decimal" src="org.apache.cocoon.forms.datatype.typeimpl.DecimalTypeBuilder">
<convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.woody.datatype.convertor.PlainDecimalConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.woody.datatype.convertor.FormattingDecimalConvertorBuilder"/>
+ <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.woody.datatype.typeimpl.DateTypeBuilder">
+ <datatype name="date" src="org.apache.cocoon.forms.datatype.typeimpl.DateTypeBuilder">
<convertors default="formatting" plain="millis">
- <convertor name="formatting" src="org.apache.cocoon.woody.datatype.convertor.FormattingDateConvertorBuilder"/>
- <convertor name="millis" src="org.apache.cocoon.woody.datatype.convertor.MillisDateConvertorBuilder"/>
+ <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.woody.datatype.typeimpl.BooleanTypeBuilder">
+ <datatype name="boolean" src="org.apache.cocoon.forms.datatype.typeimpl.BooleanTypeBuilder">
<convertors default="plain" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.woody.datatype.convertor.PlainBooleanConvertorBuilder"/>
+ <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainBooleanConvertorBuilder"/>
</convertors>
</datatype>
- <datatype name="integer" src="org.apache.cocoon.woody.datatype.typeimpl.IntegerTypeBuilder">
+ <datatype name="integer" src="org.apache.cocoon.forms.datatype.typeimpl.IntegerTypeBuilder">
<convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.woody.datatype.convertor.PlainIntegerConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.woody.datatype.convertor.FormattingIntegerConvertorBuilder"/>
+ <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.woody.datatype.validationruleimpl.LengthValidationRuleBuilder"/>
- <validation-rule name="email" src="org.apache.cocoon.woody.datatype.validationruleimpl.EmailValidationRuleBuilder"/>
- <validation-rule name="value-count" src="org.apache.cocoon.woody.datatype.validationruleimpl.ValueCountValidationRuleBuilder"/>
- <validation-rule name="range" src="org.apache.cocoon.woody.datatype.validationruleimpl.RangeValidationRuleBuilder"/>
- <validation-rule name="assert" src="org.apache.cocoon.woody.datatype.validationruleimpl.AssertValidationRuleBuilder"/>
- <validation-rule name="mod10" src="org.apache.cocoon.woody.datatype.validationruleimpl.Mod10ValidationRuleBuilder"/>
- <validation-rule name="regexp" src="org.apache.cocoon.woody.datatype.validationruleimpl.RegExpValidationRuleBuilder"/>
+ <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>
- </woody-datatype>
+ </forms-datatype>
- <woody-expression logger="woody.expression"/>
+ <forms-expression logger="forms.expression"/>
</components>
1.2 +4 -4 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.dest-no-null.xml
Index: EnumSelectionListTestCase.dest-no-null.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.dest-no-null.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnumSelectionListTestCase.dest-no-null.xml 9 Mar 2004 13:03:10 -0000 1.1
+++ EnumSelectionListTestCase.dest-no-null.xml 10 Mar 2004 09:13:22 -0000 1.2
@@ -3,7 +3,7 @@
Copyright 1999-2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
+ you may not use this file except in compliance fith the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -14,6 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<wi:selection-list
- xmlns:wi="http://apache.org/cocoon/woody/instance/1.0"
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1"><wi:item value="org.apache.cocoon.woody.datatype.Sex.MALE"><wi:label><i18n:text>org.apache.cocoon.woody.datatype.Sex.MALE</i18n:text></wi:label></wi:item><wi:item value="org.apache.cocoon.woody.datatype.Sex.FEMALE"><wi:label><i18n:text>org.apache.cocoon.woody.datatype.Sex.FEMALE</i18n:text></wi:label></wi:item></wi:selection-list>
+<fi:selection-list
+ xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1"><fi:item value="org.apache.cocoon.forms.datatype.Sex.MALE"><fi:label><i18n:text>org.apache.cocoon.forms.datatype.Sex.MALE</i18n:text></fi:label></fi:item><fi:item value="org.apache.cocoon.forms.datatype.Sex.FEMALE"><fi:label><i18n:text>org.apache.cocoon.forms.datatype.Sex.FEMALE</i18n:text></fi:label></fi:item></fi:selection-list>
1.2 +4 -4 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.dest.xml
Index: EnumSelectionListTestCase.dest.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.dest.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnumSelectionListTestCase.dest.xml 9 Mar 2004 13:03:10 -0000 1.1
+++ EnumSelectionListTestCase.dest.xml 10 Mar 2004 09:13:22 -0000 1.2
@@ -3,7 +3,7 @@
Copyright 1999-2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
+ you may not use this file except in compliance fith the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -14,6 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<wi:selection-list
- xmlns:wi="http://apache.org/cocoon/woody/instance/1.0"
- xmlns:i18n="http://apache.org/cocoon/i18n/2.1"><wi:item value=""/><wi:item value="org.apache.cocoon.woody.datatype.Sex.MALE"><wi:label><i18n:text>org.apache.cocoon.woody.datatype.Sex.MALE</i18n:text></wi:label></wi:item><wi:item value="org.apache.cocoon.woody.datatype.Sex.FEMALE"><wi:label><i18n:text>org.apache.cocoon.woody.datatype.Sex.FEMALE</i18n:text></wi:label></wi:item></wi:selection-list>
+<fi:selection-list
+ xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
+ xmlns:i18n="http://apache.org/cocoon/i18n/2.1"><fi:item value=""/><fi:item value="org.apache.cocoon.forms.datatype.Sex.MALE"><fi:label><i18n:text>org.apache.cocoon.forms.datatype.Sex.MALE</i18n:text></fi:label></fi:item><fi:item value="org.apache.cocoon.forms.datatype.Sex.FEMALE"><fi:label><i18n:text>org.apache.cocoon.forms.datatype.Sex.FEMALE</i18n:text></fi:label></fi:item></fi:selection-list>
1.4 +3 -3 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java
Index: EnumSelectionListTestCase.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EnumSelectionListTestCase.java 10 Mar 2004 07:55:55 -0000 1.3
+++ EnumSelectionListTestCase.java 10 Mar 2004 09:13:22 -0000 1.4
@@ -87,7 +87,7 @@
new EnumSelectionList(Sex.class.getName(), new EnumType(), false);
list.generateSaxFragment(dest, Locale.ENGLISH);
ResourceSource expectedSource =
- new ResourceSource("resource://org/apache/cocoon/woody/datatype/EnumSelectionListTestCase.dest-no-null.xml");
+ new ResourceSource("resource://org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.dest-no-null.xml");
Document expected = parser.parse(expectedSource.getInputStream());
assertEqual("Test if output is what is expected",
expected, dest.getDocument());
@@ -104,7 +104,7 @@
new EnumSelectionList(Sex.class.getName(), new EnumType(), true);
list.generateSaxFragment(dest, Locale.ENGLISH);
ResourceSource expectedSource =
- new ResourceSource("resource://org/apache/cocoon/woody/datatype/EnumSelectionListTestCase.dest.xml");
+ new ResourceSource("resource://org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.dest.xml");
Document expected = parser.parse(expectedSource.getInputStream());
assertEqual("Test if output is what is expected",
expected, dest.getDocument());
1.2 +33 -33 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.xtest
Index: EnumSelectionListTestCase.xtest
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/EnumSelectionListTestCase.xtest,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnumSelectionListTestCase.xtest 9 Mar 2004 13:03:10 -0000 1.1
+++ EnumSelectionListTestCase.xtest 10 Mar 2004 09:13:22 -0000 1.2
@@ -42,13 +42,13 @@
<roles>
- <role name="org.apache.cocoon.woody.datatype.DatatypeManager"
- shorthand="woody-datatype"
- default-class="org.apache.cocoon.woody.datatype.DefaultDatatypeManager"/>
-
- <role name="org.apache.cocoon.woody.expression.ExpressionManager"
- shorthand="woody-expression"
- default-class="org.apache.cocoon.woody.expression.DefaultExpressionManager"/>
+ <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"
@@ -61,55 +61,55 @@
</roles>
<components>
- <woody-datatype logger="woody">
+ <forms-datatype logger="forms">
<datatypes>
- <datatype name="string" src="org.apache.cocoon.woody.datatype.typeimpl.StringTypeBuilder">
+ <datatype name="string" src="org.apache.cocoon.forms.datatype.typeimpl.StringTypeBuilder">
<convertors default="dummy" plain="dummy">
- <convertor name="dummy" src="org.apache.cocoon.woody.datatype.convertor.DummyStringConvertorBuilder"/>
+ <convertor name="dummy" src="org.apache.cocoon.forms.datatype.convertor.DummyStringConvertorBuilder"/>
</convertors>
</datatype>
- <datatype name="long" src="org.apache.cocoon.woody.datatype.typeimpl.LongTypeBuilder">
+ <datatype name="long" src="org.apache.cocoon.forms.datatype.typeimpl.LongTypeBuilder">
<convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.woody.datatype.convertor.PlainLongConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.woody.datatype.convertor.FormattingLongConvertorBuilder"/>
+ <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.woody.datatype.typeimpl.DecimalTypeBuilder">
+ <datatype name="decimal" src="org.apache.cocoon.forms.datatype.typeimpl.DecimalTypeBuilder">
<convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.woody.datatype.convertor.PlainDecimalConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.woody.datatype.convertor.FormattingDecimalConvertorBuilder"/>
+ <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.woody.datatype.typeimpl.DateTypeBuilder">
+ <datatype name="date" src="org.apache.cocoon.forms.datatype.typeimpl.DateTypeBuilder">
<convertors default="formatting" plain="millis">
- <convertor name="formatting" src="org.apache.cocoon.woody.datatype.convertor.FormattingDateConvertorBuilder"/>
- <convertor name="millis" src="org.apache.cocoon.woody.datatype.convertor.MillisDateConvertorBuilder"/>
+ <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.woody.datatype.typeimpl.BooleanTypeBuilder">
+ <datatype name="boolean" src="org.apache.cocoon.forms.datatype.typeimpl.BooleanTypeBuilder">
<convertors default="plain" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.woody.datatype.convertor.PlainBooleanConvertorBuilder"/>
+ <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainBooleanConvertorBuilder"/>
</convertors>
</datatype>
- <datatype name="integer" src="org.apache.cocoon.woody.datatype.typeimpl.IntegerTypeBuilder">
+ <datatype name="integer" src="org.apache.cocoon.forms.datatype.typeimpl.IntegerTypeBuilder">
<convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.woody.datatype.convertor.PlainIntegerConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.woody.datatype.convertor.FormattingIntegerConvertorBuilder"/>
+ <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.woody.datatype.validationruleimpl.LengthValidationRuleBuilder"/>
- <validation-rule name="email" src="org.apache.cocoon.woody.datatype.validationruleimpl.EmailValidationRuleBuilder"/>
- <validation-rule name="value-count" src="org.apache.cocoon.woody.datatype.validationruleimpl.ValueCountValidationRuleBuilder"/>
- <validation-rule name="range" src="org.apache.cocoon.woody.datatype.validationruleimpl.RangeValidationRuleBuilder"/>
- <validation-rule name="assert" src="org.apache.cocoon.woody.datatype.validationruleimpl.AssertValidationRuleBuilder"/>
- <validation-rule name="mod10" src="org.apache.cocoon.woody.datatype.validationruleimpl.Mod10ValidationRuleBuilder"/>
- <validation-rule name="regexp" src="org.apache.cocoon.woody.datatype.validationruleimpl.RegExpValidationRuleBuilder"/>
+ <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>
- </woody-datatype>
+ </forms-datatype>
- <woody-expression logger="woody.expression"/>
+ <forms-expression logger="forms.expression"/>
</components>
1.2 +2 -2 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.dest.xml
Index: FlowJXPathSelectionListTestCase.dest.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.dest.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FlowJXPathSelectionListTestCase.dest.xml 9 Mar 2004 13:03:10 -0000 1.1
+++ FlowJXPathSelectionListTestCase.dest.xml 10 Mar 2004 09:13:22 -0000 1.2
@@ -3,7 +3,7 @@
Copyright 1999-2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
+ you may not use this file except in compliance fith the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<wi:selection-list xmlns:wi="http://apache.org/cocoon/woody/instance/1.0"><wi:item value="1"><wi:label>One</wi:label></wi:item><wi:item value="2"><wi:label>Two</wi:label></wi:item></wi:selection-list>
+<fi:selection-list xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"><fi:item value="1"><fi:label>One</fi:label></fi:item><fi:item value="2"><fi:label>Two</fi:label></fi:item></fi:selection-list>
1.3 +5 -5 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java
Index: FlowJXPathSelectionListTestCase.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FlowJXPathSelectionListTestCase.java 9 Mar 2004 13:08:46 -0000 1.2
+++ FlowJXPathSelectionListTestCase.java 10 Mar 2004 09:13:22 -0000 1.3
@@ -103,7 +103,7 @@
Map contextObjectModel = new HashMap();
contextObjectModel.put(ContextHelper.CONTEXT_OBJECT_MODEL, objectModel);
Context context = new DefaultContext(contextObjectModel);
- Source sampleSource = new ResourceSource("resource://org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCase.source.xml");
+ Source sampleSource = new ResourceSource("resource://org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.source.xml");
Document sample = parser.parse(sampleSource.getInputStream());
Element datatypeElement = (Element) sample.getElementsByTagNameNS(Constants.DEFINITION_NS, "datatype").item(0);
Datatype datatype = datatypeManager.createDatatype(datatypeElement, false);
@@ -111,7 +111,7 @@
(context, "beans", "key", "value", datatype);
DOMBuilder dest = new DOMBuilder();
list.generateSaxFragment(dest, Locale.ENGLISH);
- Source expectedSource = new ResourceSource("resource://org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCase.dest.xml");
+ Source expectedSource = new ResourceSource("resource://org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.dest.xml");
Document expected = parser.parse(expectedSource.getInputStream());
assertEqual("Test if generated list matches expected",
expected, dest.getDocument());
@@ -134,7 +134,7 @@
Map contextObjectModel = new HashMap();
contextObjectModel.put(ContextHelper.CONTEXT_OBJECT_MODEL, objectModel);
Context context = new DefaultContext(contextObjectModel);
- Source sampleSource = new ResourceSource("resource://org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCase.source.xml");
+ Source sampleSource = new ResourceSource("resource://org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.source.xml");
Document sample = parser.parse(sampleSource.getInputStream());
Element datatypeElement = (Element) sample.getElementsByTagNameNS(Constants.DEFINITION_NS, "datatype").item(0);
Datatype datatype = datatypeManager.createDatatype(datatypeElement, false);
@@ -142,7 +142,7 @@
(context, "beans", "key", "value", datatype);
DOMBuilder dest = new DOMBuilder();
list.generateSaxFragment(dest, Locale.ENGLISH);
- Source expectedSource = new ResourceSource("resource://org/apache/cocoon/woody/datatype/FlowJXPathSelectionListTestCaseWithNull.dest.xml");
+ Source expectedSource = new ResourceSource("resource://org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCaseWithNull.dest.xml");
Document expected = parser.parse(expectedSource.getInputStream());
assertEqual("Test if generated list matches expected",
expected, dest.getDocument());
1.2 +5 -5 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.source.xml
Index: FlowJXPathSelectionListTestCase.source.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.source.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FlowJXPathSelectionListTestCase.source.xml 9 Mar 2004 13:03:10 -0000 1.1
+++ FlowJXPathSelectionListTestCase.source.xml 10 Mar 2004 09:13:22 -0000 1.2
@@ -20,8 +20,8 @@
| $Id$
+-->
-<wd:field xmlns:wd="http://apache.org/cocoon/woody/definition/1.0"
+<fd:field xmlns:fd="http://apache.org/cocoon/forms/1.0#definition"
id="sample" required="false">
- <wd:datatype base="string"/>
- <wd:selection-list model="beans"/>
-</wd:field>
+ <fd:datatype base="string"/>
+ <fd:selection-list model="beans"/>
+</fd:field>
1.2 +32 -32 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.xtest
Index: FlowJXPathSelectionListTestCase.xtest
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.xtest,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FlowJXPathSelectionListTestCase.xtest 9 Mar 2004 13:03:10 -0000 1.1
+++ FlowJXPathSelectionListTestCase.xtest 10 Mar 2004 09:13:22 -0000 1.2
@@ -42,66 +42,66 @@
<roles>
- <role name="org.apache.cocoon.woody.datatype.DatatypeManager"
- shorthand="woody-datatype"
- default-class="org.apache.cocoon.woody.datatype.DefaultDatatypeManager"/>
+ <role name="org.apache.cocoon.forms.datatype.DatatypeManager"
+ shorthand="forms-datatype"
+ default-class="org.apache.cocoon.forms.datatype.DefaultDatatypeManager"/>
- <role name="org.apache.cocoon.woody.expression.ExpressionManager"
- shorthand="woody-expression"
- default-class="org.apache.cocoon.woody.expression.DefaultExpressionManager"/>
+ <role name="org.apache.cocoon.forms.expression.ExpressionManager"
+ shorthand="forms-expression"
+ default-class="org.apache.cocoon.forms.expression.DefaultExpressionManager"/>
</roles>
<components>
- <woody-datatype logger="woody">
+ <forms-datatype logger="forms">
<datatypes>
- <datatype name="string" src="org.apache.cocoon.woody.datatype.typeimpl.StringTypeBuilder">
+ <datatype name="string" src="org.apache.cocoon.forms.datatype.typeimpl.StringTypeBuilder">
<convertors default="dummy" plain="dummy">
- <convertor name="dummy" src="org.apache.cocoon.woody.datatype.convertor.DummyStringConvertorBuilder"/>
+ <convertor name="dummy" src="org.apache.cocoon.forms.datatype.convertor.DummyStringConvertorBuilder"/>
</convertors>
</datatype>
- <datatype name="long" src="org.apache.cocoon.woody.datatype.typeimpl.LongTypeBuilder">
+ <datatype name="long" src="org.apache.cocoon.forms.datatype.typeimpl.LongTypeBuilder">
<convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.woody.datatype.convertor.PlainLongConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.woody.datatype.convertor.FormattingLongConvertorBuilder"/>
+ <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.woody.datatype.typeimpl.DecimalTypeBuilder">
+ <datatype name="decimal" src="org.apache.cocoon.forms.datatype.typeimpl.DecimalTypeBuilder">
<convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.woody.datatype.convertor.PlainDecimalConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.woody.datatype.convertor.FormattingDecimalConvertorBuilder"/>
+ <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.woody.datatype.typeimpl.DateTypeBuilder">
+ <datatype name="date" src="org.apache.cocoon.forms.datatype.typeimpl.DateTypeBuilder">
<convertors default="formatting" plain="millis">
- <convertor name="formatting" src="org.apache.cocoon.woody.datatype.convertor.FormattingDateConvertorBuilder"/>
- <convertor name="millis" src="org.apache.cocoon.woody.datatype.convertor.MillisDateConvertorBuilder"/>
+ <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.woody.datatype.typeimpl.BooleanTypeBuilder">
+ <datatype name="boolean" src="org.apache.cocoon.forms.datatype.typeimpl.BooleanTypeBuilder">
<convertors default="plain" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.woody.datatype.convertor.PlainBooleanConvertorBuilder"/>
+ <convertor name="plain" src="org.apache.cocoon.forms.datatype.convertor.PlainBooleanConvertorBuilder"/>
</convertors>
</datatype>
- <datatype name="integer" src="org.apache.cocoon.woody.datatype.typeimpl.IntegerTypeBuilder">
+ <datatype name="integer" src="org.apache.cocoon.forms.datatype.typeimpl.IntegerTypeBuilder">
<convertors default="formatting" plain="plain">
- <convertor name="plain" src="org.apache.cocoon.woody.datatype.convertor.PlainIntegerConvertorBuilder"/>
- <convertor name="formatting" src="org.apache.cocoon.woody.datatype.convertor.FormattingIntegerConvertorBuilder"/>
+ <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.woody.datatype.validationruleimpl.LengthValidationRuleBuilder"/>
- <validation-rule name="email" src="org.apache.cocoon.woody.datatype.validationruleimpl.EmailValidationRuleBuilder"/>
- <validation-rule name="value-count" src="org.apache.cocoon.woody.datatype.validationruleimpl.ValueCountValidationRuleBuilder"/>
- <validation-rule name="range" src="org.apache.cocoon.woody.datatype.validationruleimpl.RangeValidationRuleBuilder"/>
- <validation-rule name="assert" src="org.apache.cocoon.woody.datatype.validationruleimpl.AssertValidationRuleBuilder"/>
- <validation-rule name="mod10" src="org.apache.cocoon.woody.datatype.validationruleimpl.Mod10ValidationRuleBuilder"/>
- <validation-rule name="regexp" src="org.apache.cocoon.woody.datatype.validationruleimpl.RegExpValidationRuleBuilder"/>
+ <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>
- </woody-datatype>
+ </forms-datatype>
- <woody-expression logger="woody.expression"/>
+ <forms-expression logger="forms.expression"/>
</components>
1.2 +2 -2 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCaseWithNull.dest.xml
Index: FlowJXPathSelectionListTestCaseWithNull.dest.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCaseWithNull.dest.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FlowJXPathSelectionListTestCaseWithNull.dest.xml 9 Mar 2004 13:03:10 -0000 1.1
+++ FlowJXPathSelectionListTestCaseWithNull.dest.xml 10 Mar 2004 09:13:22 -0000 1.2
@@ -3,7 +3,7 @@
Copyright 1999-2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
+ you may not use this file except in compliance fith the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<wi:selection-list xmlns:wi="http://apache.org/cocoon/woody/instance/1.0"><wi:item value=""/><wi:item value="1"><wi:label>One</wi:label></wi:item><wi:item value="2"><wi:label>Two</wi:label></wi:item></wi:selection-list>
+<fi:selection-list xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"><fi:item value=""/><fi:item value="1"><fi:label>One</fi:label></fi:item><fi:item value="2"><fi:label>Two</fi:label></fi:item></fi:selection-list>
1.3 +2 -2 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/convertor/EnumConvertorBuilderTestCase.java
Index: EnumConvertorBuilderTestCase.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/convertor/EnumConvertorBuilderTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EnumConvertorBuilderTestCase.java 9 Mar 2004 14:58:45 -0000 1.2
+++ EnumConvertorBuilderTestCase.java 10 Mar 2004 09:13:22 -0000 1.3
@@ -60,7 +60,7 @@
* @throws Exception
*/
public void testBuild() throws Exception {
- Source confSource = new ResourceSource("resource://org/apache/cocoon/woody/datatype/convertor/EnumConvertorTestCase.conf.xml");
+ Source confSource = new ResourceSource("resource://org/apache/cocoon/forms/datatype/convertor/EnumConvertorTestCase.conf.xml");
Document sample = parser.parse(confSource.getInputStream());
Element convertorElement = (Element) sample.getElementsByTagNameNS(Constants.DEFINITION_NS, "convertor").item(0);
String enumClassName = convertorElement.getElementsByTagNameNS(Constants.DEFINITION_NS, "enum").item(0).getFirstChild().getNodeValue();
1.2 +9 -9 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/convertor/EnumConvertorTestCase.conf.xml
Index: EnumConvertorTestCase.conf.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/convertor/EnumConvertorTestCase.conf.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnumConvertorTestCase.conf.xml 9 Mar 2004 13:03:13 -0000 1.1
+++ EnumConvertorTestCase.conf.xml 10 Mar 2004 09:13:22 -0000 1.2
@@ -15,12 +15,12 @@
limitations under the License.
-->
-<wd:field id="sex" xmlns:wd="http://apache.org/cocoon/woody/definition/1.0">
- <wd:label>Sex</wd:label>
- <wd:datatype base="enum">
- <wd:convertor type="enum">
- <wd:enum>org.apache.cocoon.woody.datatype.Sex</wd:enum>
- </wd:convertor>
- </wd:datatype>
- <wd:selection-list type="enum" class="org.apache.cocoon.woody.datatype.Sex"/>
-</wd:field>
+<fd:field id="sex" xmlns:fd="http://apache.org/cocoon/forms/1.0#definition">
+ <fd:label>Sex</fd:label>
+ <fd:datatype base="enum">
+ <fd:convertor type="enum">
+ <fd:enum>org.apache.cocoon.forms.datatype.Sex</fd:enum>
+ </fd:convertor>
+ </fd:datatype>
+ <fd:selection-list type="enum" class="org.apache.cocoon.forms.datatype.Sex"/>
+</fd:field>
1.2 +5 -5 cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/convertor/EnumConvertorTestCase.java
Index: EnumConvertorTestCase.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/forms/test/org/apache/cocoon/forms/datatype/convertor/EnumConvertorTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnumConvertorTestCase.java 9 Mar 2004 13:03:13 -0000 1.1
+++ EnumConvertorTestCase.java 10 Mar 2004 09:13:22 -0000 1.2
@@ -33,22 +33,22 @@
}
/**
- * Test the {@link EnumConvertor#convertFromString(java.lang.String, java.util.Locale, org.apache.cocoon.woody.datatype.convertor.Convertor.FormatCache)
+ * Test the {@link EnumConvertor#convertFromString(java.lang.String, java.util.Locale, org.apache.cocoon.forms.datatype.convertor.Convertor.FormatCache)
* method.
*/
public void testConvertFromString() {
- EnumConvertor convertor = new EnumConvertor("org.apache.cocoon.woody.datatype.Sex");
+ EnumConvertor convertor = new EnumConvertor("org.apache.cocoon.forms.datatype.Sex");
Object sex = convertor.convertFromString
(Sex.class.getName() + ".FEMALE", Locale.getDefault(), null);
assertSame("Returned sex must be FEMALE", Sex.FEMALE, sex);
}
/**
- * Test the {@link EnumConvertor##convertToString(java.lang.Object, java.util.Locale, org.apache.cocoon.woody.datatype.convertor.Convertor.FormatCache)
+ * Test the {@link EnumConvertor##convertToString(java.lang.Object, java.util.Locale, org.apache.cocoon.forms.datatype.convertor.Convertor.FormatCache)
* method.
*/
public void testConvertToString() {
- EnumConvertor convertor = new EnumConvertor("org.apache.cocoon.woody.datatype.Sex");
+ EnumConvertor convertor = new EnumConvertor("org.apache.cocoon.forms.datatype.Sex");
assertEquals("Converted value must match string",
Sex.class.getName() + ".MALE",
convertor.convertToString