neilg 2003/01/17 11:55:40 Modified: java/src/org/apache/xerces/util SecurityManager.java java/src/org/apache/xerces/impl/msg XMLSchemaMessages.properties Log: improve error message and the description of the new methods added to SecurityManager for the control of schema content model construction Revision Changes Path 1.3 +7 -8 xml-xerces/java/src/org/apache/xerces/util/SecurityManager.java Index: SecurityManager.java =================================================================== RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/util/SecurityManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SecurityManager.java 16 Jan 2003 18:40:29 -0000 1.2 +++ SecurityManager.java 17 Jan 2003 19:55:39 -0000 1.3 @@ -114,18 +114,17 @@ return entityExpansionLimit; } - //sets the limit of the number of nodes that should be allowed to create when building - //content model from maxOccurs attribute value specified in schema document, number of nodes - //created depneds upon the type of content model and value of maxOccurs attribute. + //sets the limit of the number of content model nodes that may be created when building + // a grammar for a schema that contains maxOccurs attributes with values + // other than "unbounded" public void setMaxOccurNodeLimit(int limit){ maxOccurLimit = limit ; } - //get the limit of the number of nodes that should be allowed to create when building - //content model from maxOccurs attribute value specified in schema document, number of nodes - //created depneds upon the type of content model and value of maxOccurs attribute. - + //sets the limit of the number of content model nodes that may be created when building + // a grammar for a schema that contains maxOccurs attributes with values + // other than "unbounded" public int getMaxOccurNodeLimit(){ return maxOccurLimit ; } 1.56 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties Index: XMLSchemaMessages.properties =================================================================== RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- XMLSchemaMessages.properties 16 Jan 2003 18:46:57 -0000 1.55 +++ XMLSchemaMessages.properties 17 Jan 2003 19:55:39 -0000 1.56 @@ -327,7 +327,7 @@ FacetValueFromBase = FacetValueFromBase: Value ''{0}'' of facet ''{1}'' must be from the value space of the base type. FixedFacetValue = FixedFacetValue: ''{0}'' value = ''{1}'' must be equal to that of the base type ''{2}'' when '{'fixed'}' = true. InvalidRegex = InvalidRegex: Pattern value ''{0}'' is not a valid regular expression: ''{1}''. - maxOccurLimit = Current configuration of the parser doesn't allow maxOccur attribute value to bet set greater than ''{0}'' value. + maxOccurLimit = Current configuration of the parser doesn''t allow a maxOccurs attribute value to be set greater than the value {0}. SchemaLocation = SchemaLocation: schemaLocation value = ''{0}'' must have even number of URI's. TargetNamespace.1 = TargetNamespace.1: Expecting namespace ''{0}'', but the target namespace of the schema document is ''{1}''. TargetNamespace.2 = TargetNamespace.2: Expecting no namespace, but the schema document has a target namespace.
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]