cziegeler 2004/03/09 06:58:45
Modified: src/blocks/forms/test/org/apache/cocoon/forms/datatype/convertor
EnumConvertorBuilderTestCase.java
src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl
EmailValidationRule.java RegExpValidationRule.java
AssertValidationRule.java LengthValidationRule.java
AbstractValidationRule.java
ValueCountValidationRule.java
Mod10ValidationRule.java RangeValidationRule.java
src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl
AbstractDatatype.java
src/blocks/forms/java/org/apache/cocoon/forms/datatype
ValidationRule.java Datatype.java
Removed: src/blocks/forms/java/org/apache/cocoon/forms/datatype
ValidationError.java
Log:
Remove deprecated class
Revision Changes Path
1.2 +3 -3
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnumConvertorBuilderTestCase.java 9 Mar 2004 13:03:13 -0000 1.1
+++ EnumConvertorBuilderTestCase.java 9 Mar 2004 14:58:45 -0000 1.2
@@ -62,8 +62,8 @@
public void testBuild() throws Exception {
Source confSource = new
ResourceSource("resource://org/apache/cocoon/woody/datatype/convertor/EnumConvertorTestCase.conf.xml");
Document sample = parser.parse(confSource.getInputStream());
- Element convertorElement = (Element)
sample.getElementsByTagNameNS(Constants.WD_NS, "convertor").item(0);
- String enumClassName =
convertorElement.getElementsByTagNameNS(Constants.WD_NS,
"enum").item(0).getFirstChild().getNodeValue();
+ Element convertorElement = (Element)
sample.getElementsByTagNameNS(Constants.DEFINITION_NS, "convertor").item(0);
+ String enumClassName =
convertorElement.getElementsByTagNameNS(Constants.DEFINITION_NS,
"enum").item(0).getFirstChild().getNodeValue();
EnumConvertorBuilder builder = new EnumConvertorBuilder();
Convertor convertor = builder.build(convertorElement);
assertTrue("The returned convertor is not an EnumConvertor",
1.2 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/EmailValidationRule.java
Index: EmailValidationRule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/EmailValidationRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EmailValidationRule.java 9 Mar 2004 10:34:10 -0000 1.1
+++ EmailValidationRule.java 9 Mar 2004 14:58:45 -0000 1.2
@@ -16,8 +16,8 @@
package org.apache.cocoon.forms.datatype.validationruleimpl;
import org.apache.cocoon.forms.Constants;
-import org.apache.cocoon.forms.datatype.ValidationError;
import org.apache.cocoon.forms.util.I18nMessage;
+import org.apache.cocoon.forms.validation.ValidationError;
import org.outerj.expression.ExpressionContext;
/**
1.2 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RegExpValidationRule.java
Index: RegExpValidationRule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RegExpValidationRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegExpValidationRule.java 9 Mar 2004 10:34:10 -0000 1.1
+++ RegExpValidationRule.java 9 Mar 2004 14:58:45 -0000 1.2
@@ -16,8 +16,8 @@
package org.apache.cocoon.forms.datatype.validationruleimpl;
import org.apache.cocoon.forms.Constants;
-import org.apache.cocoon.forms.datatype.ValidationError;
import org.apache.cocoon.forms.util.I18nMessage;
+import org.apache.cocoon.forms.validation.ValidationError;
import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.PatternMatcher;
import org.apache.oro.text.regex.Perl5Matcher;
1.2 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AssertValidationRule.java
Index: AssertValidationRule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AssertValidationRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AssertValidationRule.java 9 Mar 2004 10:34:10 -0000 1.1
+++ AssertValidationRule.java 9 Mar 2004 14:58:45 -0000 1.2
@@ -15,8 +15,8 @@
*/
package org.apache.cocoon.forms.datatype.validationruleimpl;
-import org.apache.cocoon.forms.datatype.ValidationError;
import org.apache.cocoon.forms.formmodel.CannotYetResolveWarning;
+import org.apache.cocoon.forms.validation.ValidationError;
import org.outerj.expression.ExpressionContext;
import org.outerj.expression.ExpressionException;
import org.outerj.expression.Expression;
1.2 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/LengthValidationRule.java
Index: LengthValidationRule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/LengthValidationRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LengthValidationRule.java 9 Mar 2004 10:34:10 -0000 1.1
+++ LengthValidationRule.java 9 Mar 2004 14:58:45 -0000 1.2
@@ -16,9 +16,9 @@
package org.apache.cocoon.forms.datatype.validationruleimpl;
import org.apache.cocoon.forms.Constants;
-import org.apache.cocoon.forms.datatype.ValidationError;
import org.apache.cocoon.forms.formmodel.CannotYetResolveWarning;
import org.apache.cocoon.forms.util.I18nMessage;
+import org.apache.cocoon.forms.validation.ValidationError;
import org.outerj.expression.ExpressionContext;
import org.outerj.expression.Expression;
1.2 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AbstractValidationRule.java
Index: AbstractValidationRule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/AbstractValidationRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractValidationRule.java 9 Mar 2004 10:34:10 -0000 1.1
+++ AbstractValidationRule.java 9 Mar 2004 14:58:45 -0000 1.2
@@ -15,9 +15,9 @@
*/
package org.apache.cocoon.forms.datatype.validationruleimpl;
-import org.apache.cocoon.forms.datatype.ValidationError;
import org.apache.cocoon.forms.datatype.ValidationRule;
import org.apache.cocoon.forms.formmodel.CannotYetResolveWarning;
+import org.apache.cocoon.forms.validation.ValidationError;
import org.apache.excalibur.xml.sax.XMLizable;
import org.outerj.expression.Expression;
import org.outerj.expression.ExpressionContext;
1.3 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/ValueCountValidationRule.java
Index: ValueCountValidationRule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/ValueCountValidationRule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ValueCountValidationRule.java 9 Mar 2004 11:31:12 -0000 1.2
+++ ValueCountValidationRule.java 9 Mar 2004 14:58:45 -0000 1.3
@@ -16,9 +16,9 @@
package org.apache.cocoon.forms.datatype.validationruleimpl;
import org.apache.cocoon.forms.Constants;
-import org.apache.cocoon.forms.datatype.ValidationError;
import org.apache.cocoon.forms.formmodel.CannotYetResolveWarning;
import org.apache.cocoon.forms.util.I18nMessage;
+import org.apache.cocoon.forms.validation.ValidationError;
import org.outerj.expression.ExpressionContext;
import org.outerj.expression.Expression;
1.2 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/Mod10ValidationRule.java
Index: Mod10ValidationRule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/Mod10ValidationRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Mod10ValidationRule.java 9 Mar 2004 10:34:10 -0000 1.1
+++ Mod10ValidationRule.java 9 Mar 2004 14:58:45 -0000 1.2
@@ -16,8 +16,8 @@
package org.apache.cocoon.forms.datatype.validationruleimpl;
import org.apache.cocoon.forms.Constants;
-import org.apache.cocoon.forms.datatype.ValidationError;
import org.apache.cocoon.forms.util.I18nMessage;
+import org.apache.cocoon.forms.validation.ValidationError;
import org.outerj.expression.ExpressionContext;
/**
1.2 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RangeValidationRule.java
Index: RangeValidationRule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/validationruleimpl/RangeValidationRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RangeValidationRule.java 9 Mar 2004 10:34:10 -0000 1.1
+++ RangeValidationRule.java 9 Mar 2004 14:58:45 -0000 1.2
@@ -18,9 +18,9 @@
import java.math.BigDecimal;
import org.apache.cocoon.forms.Constants;
-import org.apache.cocoon.forms.datatype.ValidationError;
import org.apache.cocoon.forms.formmodel.CannotYetResolveWarning;
import org.apache.cocoon.forms.util.I18nMessage;
+import org.apache.cocoon.forms.validation.ValidationError;
import org.outerj.expression.Expression;
import org.outerj.expression.ExpressionContext;
1.2 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatype.java
Index: AbstractDatatype.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatype.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractDatatype.java 9 Mar 2004 10:33:57 -0000 1.1
+++ AbstractDatatype.java 9 Mar 2004 14:58:45 -0000 1.2
@@ -22,9 +22,9 @@
import org.apache.cocoon.forms.datatype.Datatype;
import org.apache.cocoon.forms.datatype.DatatypeBuilder;
-import org.apache.cocoon.forms.datatype.ValidationError;
import org.apache.cocoon.forms.datatype.ValidationRule;
import org.apache.cocoon.forms.datatype.convertor.Convertor;
+import org.apache.cocoon.forms.validation.ValidationError;
import org.outerj.expression.ExpressionContext;
/**
1.2 +2 -1
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRule.java
Index: ValidationRule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/ValidationRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValidationRule.java 9 Mar 2004 10:34:00 -0000 1.1
+++ ValidationRule.java 9 Mar 2004 14:58:45 -0000 1.2
@@ -15,6 +15,7 @@
*/
package org.apache.cocoon.forms.datatype;
+import org.apache.cocoon.forms.validation.ValidationError;
import org.outerj.expression.ExpressionContext;
/**
1.2 +2 -1
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/Datatype.java
Index: Datatype.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/datatype/Datatype.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Datatype.java 9 Mar 2004 10:34:01 -0000 1.1
+++ Datatype.java 9 Mar 2004 14:58:45 -0000 1.2
@@ -17,6 +17,7 @@
import org.outerj.expression.ExpressionContext;
import org.apache.cocoon.forms.datatype.convertor.Convertor;
+import org.apache.cocoon.forms.validation.ValidationError;
import java.util.Locale;
