You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by an...@apache.org on 2001/08/16 09:38:33 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/parsers StandardParserConfiguration.java SchemaParser.java
andyc 01/08/16 00:38:33
Modified: java Tag: xerces_j_2 build.xml
java/docs Tag: xerces_j_2 releases.xml
java/samples/xni/parser Tag: xerces_j_2
NonValidatingParserConfiguration.java
java/src/org/apache/xerces/impl Tag: xerces_j_2
Constants.java
java/src/org/apache/xerces/impl/validation/datatypes Tag:
xerces_j_2 DatatypeValidatorFactoryImpl.java
ENTITYDatatypeValidator.java
IDDatatypeValidator.java
IDREFDatatypeValidator.java
ListDatatypeValidator.java
NOTATIONDatatypeValidator.java
StatefullDatatypeValidator.java
StringDatatypeValidator.java
java/src/org/apache/xerces/impl/validation/grammars Tag:
xerces_j_2 DTDGrammar.java
java/src/org/apache/xerces/parsers Tag: xerces_j_2
StandardParserConfiguration.java
Added: java/src/org/apache/xerces/impl Tag: xerces_j_2
XMLDTDValidator.java
java/src/org/apache/xerces/impl/validation/datatypes Tag:
xerces_j_2 NMTOKENDatatypeValidator.java
Removed: java/src Tag: xerces_j_2 classfiles_updated
java/src/org/apache/xerces/impl Tag: xerces_j_2
XMLValidator.java
java/src/org/apache/xerces/impl/validation/datatypes Tag:
xerces_j_2 Base64.java BinaryDatatypeValidator.java
BooleanDatatypeValidator.java
DecimalDatatypeValidator.java
DoubleDatatypeValidator.java
FloatDatatypeValidator.java HexBin.java
QNameDatatypeValidator.java
RecurringDurationDatatypeValidator.java
TimeDurationDatatypeValidator.java
URIReferenceDatatypeValidator.java
UnionDatatypeValidator.java
java/src/org/apache/xerces/impl/validation/datatypes/eTypes/Data
Tag: xerces_j_2 BasicStringProperty.java
NamedMatch.java uri.java
java/src/org/apache/xerces/impl/validation/datatypes/eTypes/Data/Number
Tag: xerces_j_2 mNumber.java
java/src/org/apache/xerces/impl/validation/datatypes/eTypes/Data/datime
Tag: xerces_j_2 ISO8601.java ISO8601Pattern.java
ISODate.java ISODateTime.java ISOPeriod.java
ISOTime.java TimeJRep.java
java/src/org/apache/xerces/impl/validation/datatypes/eTypes/Interfaces
Tag: xerces_j_2 PO_IF.java Property.java
StringProperty.java
java/src/org/apache/xerces/impl/validation/datatypes/eTypes/Models
Tag: xerces_j_2 AbstractProperty.java Helpers.java
PartialOrder.java
java/src/org/apache/xerces/impl/validation/datatypes/eTypes/xml
Tag: xerces_j_2 XMLFixed.java XMLNumber.java
XMLRequired.java XMLString.java XMLStringIF.java
xmlFactory.java
java/src/org/apache/xerces/impl/validation/datatypes/regex
Tag: xerces_j_2 BMPattern.java Match.java Op.java
ParseException.java ParserForXMLSchema.java
REUtil.java RangeToken.java RegexParser.java
RegularExpression.java Token.java
java/src/org/apache/xerces/impl/validation/grammars Tag:
xerces_j_2 SchemaGrammar.java SchemaSymbols.java
java/src/org/apache/xerces/impl/validation/identity Tag:
xerces_j_2 Field.java FieldActivator.java
IdentityConstraint.java Key.java KeyRef.java
Selector.java Unique.java ValueStore.java
java/src/org/apache/xerces/impl/validation/validators Tag:
xerces_j_2 XMLDTDValidator.java
XMLSchemaValidator.java
java/src/org/apache/xerces/impl/xpath Tag: xerces_j_2
XPath.java XPathException.java XPathMatcher.java
java/src/org/apache/xerces/parsers Tag: xerces_j_2
SchemaParser.java
Log:
1) Removed old XML Schema code that was not being used. This code
is intended to be replaced by either a port of the Xerces 1.x
XML Schema implementation or by a re-designed, re-implemented
XML Schema implementation.
2) Updated standard parser configuration to separate DTD validation
and namespace binding in the parsing pipeline.
Revision Changes Path
No revision
No revision
1.14.2.18 +6 -4 xml-xerces/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xerces/java/build.xml,v
retrieving revision 1.14.2.17
retrieving revision 1.14.2.18
diff -u -r1.14.2.17 -r1.14.2.18
--- build.xml 2001/08/10 09:22:29 1.14.2.17
+++ build.xml 2001/08/16 07:38:29 1.14.2.18
@@ -51,7 +51,7 @@
Copyright:
Copyright (c) 2000 The Apache Software Foundation.
- $Id: build.xml,v 1.14.2.17 2001/08/10 09:22:29 andyc Exp $
+ $Id: build.xml,v 1.14.2.18 2001/08/16 07:38:29 andyc Exp $
==================================================================== -->
@@ -170,7 +170,8 @@
excludes="**/classfiles_updated **/CVS* **/.#* **/XMLMessages.java
**/SchemaImporter.java **/RevalidatingDOMParser.java
**/DatatypeContentModel.java **/ComplexTypeInfo.java
- **/DTDImporter.java ">
+ **/DTDImporter.java
+ **/v1/** **/v2/**">
</fileset>
</copy>
@@ -190,7 +191,7 @@
</copy>
<javac srcdir="${build.src}"
- excludes="**/RevalidatingDOMParser.java **/v1/** **/v2/**"
+ excludes="**/RevalidatingDOMParser.java"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
@@ -335,7 +336,8 @@
<fileset
dir="${src.dir}"
includes="**/Makefile, **/Makefile.incl, org/**, javax/**"
- excludes="**/CVS*, **/.#*, **/*.class"
+ excludes="**/CVS*, **/.#*, **/*.class
+ **/v1/** **/v2/**"
/>
</copy>
No revision
No revision
1.16.2.16 +36 -18 xml-xerces/java/docs/releases.xml
Index: releases.xml
===================================================================
RCS file: /home/cvs/xml-xerces/java/docs/releases.xml,v
retrieving revision 1.16.2.15
retrieving revision 1.16.2.16
diff -u -r1.16.2.15 -r1.16.2.16
--- releases.xml 2001/08/15 06:58:47 1.16.2.15
+++ releases.xml 2001/08/16 07:38:30 1.16.2.16
@@ -3,24 +3,42 @@
<releases>
<release version='NOT YET RELEASED'>
<desc/>
- <fix>
- <note>
- Fixed bug in scanner that allowed the built-in entity references
- to be sent via XNI. The default value for this feature should have
- been false.
- </note>
- <submitter name='Andy Clark'/>
- </fix>
- <fix>
- <note>Fixed several SAX bugs.</note>
- <submitter name='Andy Clark'/>
- </fix>
- <update>
- <note>
- Synchronized DOM implementation code from Xerces 1.x codebase.
- </note>
- <submitter name='Andy Clark'/>
- </update>
+ <changes>
+ <update>
+ <note>
+ Updated standard parser configuration to separate DTD validation
+ and namespace binding in the parsing pipeline.
+ </note>
+ <submitter name='Andy Clark'/>
+ </update>
+ <remove>
+ <note>
+ Removed old XML Schema code that was not being used. This code
+ is intended to be replaced by either a port of the Xerces 1.x
+ XML Schema implementation or by a re-designed, re-implemented
+ XML Schema implementation.
+ </note>
+ <submitter name='Andy Clark'/>
+ </remove>
+ <fix>
+ <note>
+ Fixed bug in scanner that allowed the built-in entity references
+ to be sent via XNI. The default value for this feature should have
+ been false.
+ </note>
+ <submitter name='Andy Clark'/>
+ </fix>
+ <fix>
+ <note>Fixed several SAX bugs.</note>
+ <submitter name='Andy Clark'/>
+ </fix>
+ <update>
+ <note>
+ Synchronized DOM implementation code from Xerces 1.x codebase.
+ </note>
+ <submitter name='Andy Clark'/>
+ </update>
+ </changes>
</release>
<release version='&ParserName; 2.0.0 (beta)'>
<desc>
No revision
No revision
1.1.2.2 +4 -4 xml-xerces/java/samples/xni/parser/Attic/NonValidatingParserConfiguration.java
Index: NonValidatingParserConfiguration.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/parser/Attic/NonValidatingParserConfiguration.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- NonValidatingParserConfiguration.java 2001/04/16 05:42:22 1.1.2.1
+++ NonValidatingParserConfiguration.java 2001/08/16 07:38:30 1.1.2.2
@@ -57,8 +57,8 @@
package xni.parser;
+import org.apache.xerces.impl.XMLDTDValidator;
import org.apache.xerces.impl.XMLNamespaceBinder;
-import org.apache.xerces.impl.XMLValidator;
import org.apache.xerces.parsers.StandardParserConfiguration;
import org.apache.xerces.util.SymbolTable;
@@ -70,7 +70,7 @@
*
* @author Andy Clark, IBM
*
- * @version $Id: NonValidatingParserConfiguration.java,v 1.1.2.1 2001/04/16 05:42:22 andyc Exp $
+ * @version $Id: NonValidatingParserConfiguration.java,v 1.1.2.2 2001/08/16 07:38:30 andyc Exp $
*/
public class NonValidatingParserConfiguration
extends StandardParserConfiguration {
@@ -123,8 +123,8 @@
// factory methods
/** Create a null validator. */
- protected XMLValidator createValidator() {
+ protected XMLDTDValidator createDTDValidator() {
return null;
- } // createValidator():XMLValidator
+ } // createDTDValidator():XMLDTDValidator
} // class NonValidatingParserConfiguration
No revision
No revision
1.1.2.9 +7 -1 xml-xerces/java/src/org/apache/xerces/impl/Attic/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/Constants.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- Constants.java 2001/07/26 08:03:36 1.1.2.8
+++ Constants.java 2001/08/16 07:38:30 1.1.2.9
@@ -65,7 +65,7 @@
*
* @author Andy Clark, IBM
*
- * @version $Id: Constants.java,v 1.1.2.8 2001/07/26 08:03:36 andyc Exp $
+ * @version $Id: Constants.java,v 1.1.2.9 2001/08/16 07:38:30 andyc Exp $
*/
public final class Constants {
@@ -206,6 +206,12 @@
/** Validator property ("internal/validator"). */
public static final String VALIDATOR_PROPERTY = "internal/validator";
+
+ /** Validator property ("internal/validator/dtd"). */
+ public static final String DTD_VALIDATOR_PROPERTY = "internal/validator/dtd";
+
+ /** Namespace binder property ("internal/namespace-binder"). */
+ public static final String NAMESPACE_BINDER_PROPERTY = "internal/namespace-binder";
// private
No revision
No revision
1.1.2.1 +2699 -0 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDTDValidator.java
No revision
No revision
1.1.2.14 +10 -2 xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/DatatypeValidatorFactoryImpl.java
Index: DatatypeValidatorFactoryImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/DatatypeValidatorFactoryImpl.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- DatatypeValidatorFactoryImpl.java 2001/08/09 07:08:43 1.1.2.13
+++ DatatypeValidatorFactoryImpl.java 2001/08/16 07:38:30 1.1.2.14
@@ -64,7 +64,7 @@
import org.apache.xerces.impl.validation.DatatypeValidatorFactory;
import org.apache.xerces.impl.validation.InvalidDatatypeFacetException;
import org.apache.xerces.impl.validation.InvalidDatatypeValueException;
-import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
+//import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
import org.apache.xerces.impl.validation.Grammar;
@@ -91,7 +91,7 @@
* If validation is needed, we need to instantiate a DatatypeValidatorFactoryImpl.<BR>
*
* @author Jeffrey Rodriguez
- * @version $Id: DatatypeValidatorFactoryImpl.java,v 1.1.2.13 2001/08/09 07:08:43 andyc Exp $
+ * @version $Id: DatatypeValidatorFactoryImpl.java,v 1.1.2.14 2001/08/16 07:38:30 andyc Exp $
*/
public class DatatypeValidatorFactoryImpl implements DatatypeValidatorFactory {
private static final boolean fDebug = false;
@@ -119,6 +119,7 @@
//Register Primitive Datatypes
+ /***
public void expandRegistryToFullSchemaSet() {
//Register Primitive Datatypes
@@ -290,6 +291,7 @@
}
}
}
+ /***/
@@ -327,9 +329,13 @@
createDatatypeValidator( "ENTITIES", new ENTITYDatatypeValidator(), null, true );
+ /***
Hashtable facets = new Hashtable();
facets.put(SchemaSymbols.ELT_PATTERN , "\\c+" );
createDatatypeValidator("NMTOKEN", new StringDatatypeValidator(), facets, false );
+ /***/
+ createDatatypeValidator("NMTOKEN", new NMTOKENDatatypeValidator(), null, false );
+ /***/
createDatatypeValidator("NMTOKENS",
getDatatypeValidator( "NMTOKEN" ), null, true );
@@ -376,12 +382,14 @@
if (!fgBaseTypes.containsKey("NMTOKEN")) {
initializeDTDRegistry();
}
+ /***
if (!fgBaseTypes.containsKey(name)) {
// lazily construct Schema base types
if (!fgBaseTypes.containsKey("boolean")) {
expandRegistryToFullSchemaSet();
}
}
+ /***/
}
}
base = getDatatypeValidator(name);
1.1.2.10 +3 -3 xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/ENTITYDatatypeValidator.java
Index: ENTITYDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/ENTITYDatatypeValidator.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- ENTITYDatatypeValidator.java 2000/12/01 00:31:30 1.1.2.9
+++ ENTITYDatatypeValidator.java 2001/08/16 07:38:30 1.1.2.10
@@ -66,8 +66,8 @@
import org.apache.xerces.impl.validation.XMLEntityDecl;
import org.apache.xerces.impl.validation.Grammar;
-import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
-import org.apache.xerces.impl.validation.datatypes.regex.RegularExpression;
+//import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
+//import org.apache.xerces.impl.validation.datatypes.regex.RegularExpression;
import org.apache.xerces.impl.validation.InvalidDatatypeFacetException;
import org.apache.xerces.impl.validation.InvalidDatatypeValueException;
@@ -90,7 +90,7 @@
* able to validate entities.</P>
*
* @author Jeffrey Rodriguez-
- * @version $Id: ENTITYDatatypeValidator.java,v 1.1.2.9 2000/12/01 00:31:30 ericye Exp $
+ * @version $Id: ENTITYDatatypeValidator.java,v 1.1.2.10 2001/08/16 07:38:30 andyc Exp $
* @see org.apache.xerces.impl.validation.Grammar
* @see org.apache.xerces.impl.validation.grammars.DTDGrammar
* @see org.apache.xerces.impl.validation.grammars.SchemaGrammar
1.1.2.10 +3 -3 xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/IDDatatypeValidator.java
Index: IDDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/IDDatatypeValidator.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- IDDatatypeValidator.java 2000/11/24 17:39:21 1.1.2.9
+++ IDDatatypeValidator.java 2001/08/16 07:38:30 1.1.2.10
@@ -62,8 +62,8 @@
import java.util.Vector;
import java.util.StringTokenizer;
import org.apache.xerces.impl.validation.DatatypeValidator;
-import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
-import org.apache.xerces.impl.validation.datatypes.regex.RegularExpression;
+//import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
+//import org.apache.xerces.impl.validation.datatypes.regex.RegularExpression;
import org.apache.xerces.impl.validation.InvalidDatatypeFacetException;
import org.apache.xerces.impl.validation.InvalidDatatypeValueException;
import org.apache.xerces.util.XMLChar;
@@ -126,7 +126,7 @@
* </CODE>
*
* @author Jeffrey Rodriguez
- * @version $Id: IDDatatypeValidator.java,v 1.1.2.9 2000/11/24 17:39:21 jeffreyr Exp $
+ * @version $Id: IDDatatypeValidator.java,v 1.1.2.10 2001/08/16 07:38:30 andyc Exp $
* @see org.apache.xerces.impl.validation.datatypes.AbstractDatatypeValidator
* @see org.apache.xerces.impl.validation.DatatypeValidator
* @see org.apache.xerces.impl.validation.datatypes.IDREFDatatypeValidator
1.1.2.10 +3 -3 xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/IDREFDatatypeValidator.java
Index: IDREFDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/IDREFDatatypeValidator.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- IDREFDatatypeValidator.java 2000/11/28 01:08:36 1.1.2.9
+++ IDREFDatatypeValidator.java 2001/08/16 07:38:30 1.1.2.10
@@ -62,8 +62,8 @@
import java.util.Locale;
import java.util.StringTokenizer;
import org.apache.xerces.impl.validation.DatatypeValidator;
-import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
-import org.apache.xerces.impl.validation.datatypes.regex.RegularExpression;
+//import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
+//import org.apache.xerces.impl.validation.datatypes.regex.RegularExpression;
import org.apache.xerces.impl.validation.InvalidDatatypeFacetException;
import org.apache.xerces.impl.validation.InvalidDatatypeValueException;
import org.apache.xerces.util.XMLChar;
@@ -104,7 +104,7 @@
* </CODE>
*
* @author Jeffrey Rodriguez-
- * @version $Id: IDREFDatatypeValidator.java,v 1.1.2.9 2000/11/28 01:08:36 jeffreyr Exp $
+ * @version $Id: IDREFDatatypeValidator.java,v 1.1.2.10 2001/08/16 07:38:30 andyc Exp $
* @see org.apache.xerces.impl.validation.datatypes.IDDatatypeValidator
* @see org.apache.xerces.impl.validation.datatypes.AbstractDatatypeValidator
* @see org.apache.xerces.impl.validation.DatatypeValidator
1.1.2.5 +7 -7 xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/ListDatatypeValidator.java
Index: ListDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/ListDatatypeValidator.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ListDatatypeValidator.java 2000/12/05 01:48:50 1.1.2.4
+++ ListDatatypeValidator.java 2001/08/16 07:38:30 1.1.2.5
@@ -67,9 +67,9 @@
import java.util.NoSuchElementException;
import org.apache.xerces.impl.validation.InvalidDatatypeFacetException;
import org.apache.xerces.impl.validation.InvalidDatatypeValueException;
-import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
+//import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
import org.apache.xerces.impl.validation.DatatypeValidator;
-import org.apache.xerces.impl.validation.datatypes.regex.RegularExpression;
+//import org.apache.xerces.impl.validation.datatypes.regex.RegularExpression;
@@ -89,7 +89,7 @@
private int fFacetsDefined = 0;
private boolean fDerivedByList = false;//default
- private RegularExpression fRegex = null;
+ //private RegularExpression fRegex = null;
@@ -109,7 +109,7 @@
if (facets != null) {
for (Enumeration e = facets.keys(); e.hasMoreElements();) {
String key = (String) e.nextElement();
- if (key.equals(SchemaSymbols.ELT_LENGTH)) {
+ if (key.equals("length")) {
fFacetsDefined += DatatypeValidator.FACET_LENGTH;
String lengthValue = (String)facets.get(key);
try {
@@ -120,7 +120,7 @@
if (fLength < 0)
throw new InvalidDatatypeFacetException("Length value '"+lengthValue+"' must be a nonNegativeInteger.");
- } else if (key.equals(SchemaSymbols.ELT_MINLENGTH)) {
+ } else if (key.equals("minlength")) {
fFacetsDefined += DatatypeValidator.FACET_MINLENGTH;
String minLengthValue = (String)facets.get(key);
try {
@@ -128,7 +128,7 @@
} catch (NumberFormatException nfe) {
throw new InvalidDatatypeFacetException("maxLength value '"+minLengthValue+"' is invalid.");
}
- } else if (key.equals(SchemaSymbols.ELT_MAXLENGTH)) {
+ } else if (key.equals("maxlength")) {
fFacetsDefined += DatatypeValidator.FACET_MAXLENGTH;
String maxLengthValue = (String)facets.get(key);
try {
@@ -136,7 +136,7 @@
} catch (NumberFormatException nfe) {
throw new InvalidDatatypeFacetException("maxLength value '"+maxLengthValue+"' is invalid.");
}
- } else if (key.equals(SchemaSymbols.ELT_ENUMERATION)) {
+ } else if (key.equals("enumeration")) {
fFacetsDefined += DatatypeValidator.FACET_ENUMERATION;
fEnumeration = (Vector)facets.get(key);
} else {
1.1.2.4 +3 -3 xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/NOTATIONDatatypeValidator.java
Index: NOTATIONDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/NOTATIONDatatypeValidator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- NOTATIONDatatypeValidator.java 2000/11/03 01:34:20 1.1.2.3
+++ NOTATIONDatatypeValidator.java 2001/08/16 07:38:30 1.1.2.4
@@ -63,8 +63,8 @@
import java.util.Locale;
import java.util.StringTokenizer;
import org.apache.xerces.impl.validation.DatatypeValidator;
-import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
-import org.apache.xerces.impl.validation.datatypes.regex.RegularExpression;
+//import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
+//import org.apache.xerces.impl.validation.datatypes.regex.RegularExpression;
import org.apache.xerces.impl.validation.InvalidDatatypeFacetException;
import org.apache.xerces.impl.validation.InvalidDatatypeValueException;
import org.apache.xerces.util.XMLChar;
@@ -77,7 +77,7 @@
* standalone code as well as plugins to the validator architecture.
*
* @author Jeffrey Rodriguez-
- * @version $Id: NOTATIONDatatypeValidator.java,v 1.1.2.3 2000/11/03 01:34:20 jeffreyr Exp $
+ * @version $Id: NOTATIONDatatypeValidator.java,v 1.1.2.4 2001/08/16 07:38:30 andyc Exp $
*/
public class NOTATIONDatatypeValidator extends AbstractDatatypeValidator {
private DatatypeValidator fBaseValidator = null;
1.1.2.2 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/StatefullDatatypeValidator.java
Index: StatefullDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/StatefullDatatypeValidator.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- StatefullDatatypeValidator.java 2000/11/03 01:34:22 1.1.2.1
+++ StatefullDatatypeValidator.java 2001/08/16 07:38:30 1.1.2.2
@@ -59,7 +59,7 @@
import org.apache.xerces.impl.validation.InvalidDatatypeFacetException;
import org.apache.xerces.impl.validation.InvalidDatatypeValueException;
-import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
+//import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
@@ -76,7 +76,7 @@
* the instance document<P>
*
* @author Jeffrey Rodriguez
- * @version $Id: StatefullDatatypeValidator.java,v 1.1.2.1 2000/11/03 01:34:22 jeffreyr Exp $
+ * @version $Id: StatefullDatatypeValidator.java,v 1.1.2.2 2001/08/16 07:38:30 andyc Exp $
* @see org.apache.xerces.impl.validation.datatypes.ListDatatypeValidator
* @see org.apache.xerces.impl.validation.datatypes.IDDatatypeValidator
* @see org.apache.xerces.impl.validation.datatypes.IDREFDatatypeValidator
1.1.2.7 +16 -10 xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/StringDatatypeValidator.java
Index: StringDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/StringDatatypeValidator.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- StringDatatypeValidator.java 2000/11/01 03:05:20 1.1.2.6
+++ StringDatatypeValidator.java 2001/08/16 07:38:30 1.1.2.7
@@ -65,8 +65,8 @@
import java.util.StringTokenizer;
import java.util.NoSuchElementException;
import org.apache.xerces.impl.validation.DatatypeValidator;
-import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
-import org.apache.xerces.impl.validation.datatypes.regex.RegularExpression;
+//import org.apache.xerces.impl.validation.grammars.SchemaSymbols;
+//import org.apache.xerces.impl.validation.datatypes.regex.RegularExpression;
import org.apache.xerces.impl.validation.InvalidDatatypeFacetException;
import org.apache.xerces.impl.validation.InvalidDatatypeValueException;
@@ -84,7 +84,7 @@
* character has a corresponding Universal Code Set
* code point ([ISO 10646],[Unicode] and [Unicode3]),
* which is an integer.</P>
- * @version $Id: StringDatatypeValidator.java,v 1.1.2.6 2000/11/01 03:05:20 jeffreyr Exp $
+ * @version $Id: StringDatatypeValidator.java,v 1.1.2.7 2001/08/16 07:38:30 andyc Exp $
*/
public class StringDatatypeValidator extends AbstractDatatypeValidator {
private Locale fLocale = null;
@@ -110,7 +110,7 @@
private boolean isMaxInclusiveDefined = false;
private boolean isMinExclusiveDefined = false;
private boolean isMinInclusiveDefined = false;
- private RegularExpression fRegex = null;
+ //private RegularExpression fRegex = null;
@@ -133,7 +133,7 @@
for (Enumeration e = facets.keys(); e.hasMoreElements();) {
String key = (String) e.nextElement();
- if ( key.equals(SchemaSymbols.ELT_LENGTH) ) {
+ if ( key.equals("length") ) {
fFacetsDefined += DatatypeValidator.FACET_LENGTH;
String lengthValue = (String)facets.get(key);
try {
@@ -144,7 +144,7 @@
if ( fLength < 0 )
throw new InvalidDatatypeFacetException("Length value '"+lengthValue+"' must be a nonNegativeInteger.");
- } else if (key.equals(SchemaSymbols.ELT_MINLENGTH) ) {
+ } else if (key.equals("minlength") ) {
fFacetsDefined += DatatypeValidator.FACET_MINLENGTH;
String minLengthValue = (String)facets.get(key);
try {
@@ -152,7 +152,7 @@
} catch (NumberFormatException nfe) {
throw new InvalidDatatypeFacetException("minLength value '"+minLengthValue+"' is invalid.");
}
- } else if (key.equals(SchemaSymbols.ELT_MAXLENGTH) ) {
+ } else if (key.equals("maxlength") ) {
fFacetsDefined += DatatypeValidator.FACET_MAXLENGTH;
String maxLengthValue = (String)facets.get(key);
try {
@@ -160,11 +160,15 @@
} catch (NumberFormatException nfe) {
throw new InvalidDatatypeFacetException("maxLength value '"+maxLengthValue+"' is invalid.");
}
- } else if (key.equals(SchemaSymbols.ELT_PATTERN)) {
+ }
+ /***
+ else if (key.equals(SchemaSymbols.ELT_PATTERN)) {
fFacetsDefined += DatatypeValidator.FACET_PATTERN;
fPattern = (String)facets.get(key);
fRegex = new RegularExpression(fPattern, "X");
- } else if (key.equals(SchemaSymbols.ELT_ENUMERATION)) {
+ }
+ /***/
+ else if (key.equals("enumeration")) {
fFacetsDefined += DatatypeValidator.FACET_ENUMERATION;
fEnumeration = (Vector)facets.get(key);
/* Per Schema CR - October 23 spec we don't have this facets in String datatype
@@ -181,7 +185,7 @@
fFacetsDefined += DatatypeValidator.FACET_MINEXCLUSIVE;
fMinExclusive = (String)facets.get(key);
*/
- } else if (key.equals(SchemaSymbols.ELT_WHITESPACE)) {
+ } else if (key.equals("whitespace")) {
String whiteSpaceChoice = (String)facets.get(key);
fFacetsDefined += DatatypeValidator.FACET_WHITESPACE;
if ( whiteSpaceChoice.equals("preserve" ) ) {
@@ -346,12 +350,14 @@
*/
+ /***
if ( (fFacetsDefined & DatatypeValidator.FACET_PATTERN ) != 0 ) {
//RegularExpression regex = new RegularExpression(fPattern );
if ( fRegex == null || fRegex.matches( content) == false )
throw new InvalidDatatypeValueException("Value '"+content+
"' does not match regular expression facet '" + fPattern + "'." );
}
+ /***/
}
public int compare( String content, String facetValue ){
No revision
No revision
1.1.2.1 +111 -0 xml-xerces/java/src/org/apache/xerces/impl/validation/datatypes/Attic/NMTOKENDatatypeValidator.java
No revision
No revision
1.1.2.48 +10 -1 xml-xerces/java/src/org/apache/xerces/impl/validation/grammars/Attic/DTDGrammar.java
Index: DTDGrammar.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/validation/grammars/Attic/DTDGrammar.java,v
retrieving revision 1.1.2.47
retrieving revision 1.1.2.48
diff -u -r1.1.2.47 -r1.1.2.48
--- DTDGrammar.java 2001/08/09 07:08:44 1.1.2.47
+++ DTDGrammar.java 2001/08/16 07:38:32 1.1.2.48
@@ -94,7 +94,7 @@
* @author Jeffrey Rodriguez, IBM
* @author Andy Clark, IBM
*
- * @version $Id: DTDGrammar.java,v 1.1.2.47 2001/08/09 07:08:44 andyc Exp $
+ * @version $Id: DTDGrammar.java,v 1.1.2.48 2001/08/16 07:38:32 andyc Exp $
*/
public class DTDGrammar
extends Grammar
@@ -557,11 +557,20 @@
}
else if (type.startsWith("NOTATION") ) {
fSimpleType.type = XMLSimpleType.TYPE_NOTATION;
+ /***
facets.put(SchemaSymbols.ELT_ENUMERATION, fSimpleType.enumeration);
+ /***/
+ // REVISIT: Is this a bug? -Ac
+ facets.put("enumeration", fSimpleType.enumeration);
+ /***/
}
else if (type.startsWith("ENUMERATION") ) {
fSimpleType.type = XMLSimpleType.TYPE_ENUMERATION;
+ /***
facets.put(SchemaSymbols.ELT_ENUMERATION, fSimpleType.enumeration);
+ /***/
+ facets.put("enumeration", fSimpleType.enumeration);
+ /***/
}
else {
// REVISIT: Report error message. -Ac
No revision
No revision
1.1.2.16 +51 -24 xml-xerces/java/src/org/apache/xerces/parsers/Attic/StandardParserConfiguration.java
Index: StandardParserConfiguration.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/Attic/StandardParserConfiguration.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- StandardParserConfiguration.java 2001/08/15 06:58:48 1.1.2.15
+++ StandardParserConfiguration.java 2001/08/16 07:38:33 1.1.2.16
@@ -65,7 +65,8 @@
import org.apache.xerces.impl.XMLDTDScannerImpl;
import org.apache.xerces.impl.XMLErrorReporter;
import org.apache.xerces.impl.XMLEntityManager;
-import org.apache.xerces.impl.XMLValidator;
+import org.apache.xerces.impl.XMLDTDValidator;
+import org.apache.xerces.impl.XMLNamespaceBinder;
import org.apache.xerces.impl.msg.XMLMessageFormatter;
import org.apache.xerces.impl.validation.DatatypeValidatorFactory;
import org.apache.xerces.impl.validation.GrammarPool;
@@ -112,7 +113,7 @@
* @author Arnaud Le Hors, IBM
* @author Andy Clark, IBM
*
- * @version $Id: StandardParserConfiguration.java,v 1.1.2.15 2001/08/15 06:58:48 andyc Exp $
+ * @version $Id: StandardParserConfiguration.java,v 1.1.2.16 2001/08/16 07:38:33 andyc Exp $
*/
public class StandardParserConfiguration
extends BasicParserConfiguration {
@@ -173,9 +174,13 @@
protected static final String GRAMMAR_POOL =
Constants.XERCES_PROPERTY_PREFIX + Constants.GRAMMAR_POOL_PROPERTY;
- /** Property identifier: validator. */
- protected static final String VALIDATOR =
- Constants.XERCES_PROPERTY_PREFIX + Constants.VALIDATOR_PROPERTY;
+ /** Property identifier: DTD validator. */
+ protected static final String DTD_VALIDATOR =
+ Constants.XERCES_PROPERTY_PREFIX + Constants.DTD_VALIDATOR_PROPERTY;
+
+ /** Property identifier: namespace binder. */
+ protected static final String NAMESPACE_BINDER =
+ Constants.XERCES_PROPERTY_PREFIX + Constants.NAMESPACE_BINDER_PROPERTY;
/** Property identifier: datatype validator factory. */
protected static final String DATATYPE_VALIDATOR_FACTORY =
@@ -212,9 +217,12 @@
/** DTD scanner. */
protected XMLDTDScanner fDTDScanner;
- /** Validator. */
- protected XMLValidator fValidator;
+ /** DTD Validator. */
+ protected XMLDTDValidator fDTDValidator;
+ /** Namespace binder. */
+ protected XMLNamespaceBinder fNamespaceBinder;
+
// state
/** Locator */
@@ -315,11 +323,17 @@
addComponent((XMLComponent)fDTDScanner);
}
}
+
+ fDTDValidator = createDTDValidator();
+ if (fDTDValidator != null) {
+ fProperties.put(DTD_VALIDATOR, fDTDValidator);
+ addComponent(fDTDValidator);
+ }
- fValidator = createValidator();
- if (fValidator != null) {
- fProperties.put(VALIDATOR, fValidator);
- addComponent(fValidator);
+ fNamespaceBinder = createNamespaceBinder();
+ if (fNamespaceBinder != null) {
+ fProperties.put(NAMESPACE_BINDER, fNamespaceBinder);
+ addComponent(fNamespaceBinder);
}
fDatatypeValidatorFactory = createDatatypeValidatorFactory();
@@ -450,21 +464,29 @@
// etc... -Ac
// setup document pipeline
- if (fValidator != null) {
- fScanner.setDocumentHandler(fValidator);
- fValidator.setDocumentHandler(fDocumentHandler);
+ if (fDTDValidator != null) {
+ fScanner.setDocumentHandler(fDTDValidator);
+ fDTDValidator.setDocumentHandler(fNamespaceBinder);
+ fNamespaceBinder.setDocumentHandler(fDocumentHandler);
}
else {
- fScanner.setDocumentHandler(fDocumentHandler);
+ fScanner.setDocumentHandler(fNamespaceBinder);
+ fNamespaceBinder.setDocumentHandler(fDocumentHandler);
}
// setup dtd pipeline
if (fDTDScanner != null) {
- fDTDScanner.setDTDHandler(fValidator);
- fValidator.setDTDHandler(fDTDHandler);
-
- fDTDScanner.setDTDContentModelHandler(fValidator);
- fValidator.setDTDContentModelHandler(fDTDContentModelHandler);
+ if (fDTDValidator != null) {
+ fDTDScanner.setDTDHandler(fDTDValidator);
+ fDTDValidator.setDTDHandler(fDTDHandler);
+
+ fDTDScanner.setDTDContentModelHandler(fDTDValidator);
+ fDTDValidator.setDTDContentModelHandler(fDTDContentModelHandler);
+ }
+ else {
+ fDTDScanner.setDTDHandler(fDTDHandler);
+ fDTDScanner.setDTDContentModelHandler(fDTDContentModelHandler);
+ }
}
} // configurePipeline()
@@ -611,10 +633,15 @@
return new XMLDTDScannerImpl();
} // createDTDScanner():XMLDTDScanner
- /** Create a validator. */
- protected XMLValidator createValidator() {
- return new XMLValidator();
- } // createValidator():XMLValidator
+ /** Create a DTD validator. */
+ protected XMLDTDValidator createDTDValidator() {
+ return new XMLDTDValidator();
+ } // createDTDValidator():XMLDTDValidator
+
+ /** Create a namespace binder. */
+ protected XMLNamespaceBinder createNamespaceBinder() {
+ return new XMLNamespaceBinder();
+ } // createNamespaceBinder():XMLNamespaceBinder
/** Create a datatype validator factory. */
protected DatatypeValidatorFactory createDatatypeValidatorFactory() {
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org