svn commit: r449424 - in /xerces/java/trunk/src/org/apache/xerces/impl: xpath/regex/ xs/ xs/models/ xs/traversers/

mrglavas Sun, 24 Sep 2006 09:22:38 -0700

Author: mrglavas
Date: Sun Sep 24 09:22:30 2006
New Revision: 449424

URL: http://svn.apache.org/viewvc?view=rev&rev=449424
Log:
Fixing JIRA Issue #1196:
http://issues.apache.org/jira/browse/XERCESJ-1196




Merging in the patch from Nathan Beyer to get Javadoc generation working on 
Java SE 5.0.

Modified:
    
xerces/java/trunk/src/org/apache/xerces/impl/xpath/regex/ParserForXMLSchema.java
    xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeDecl.java
    xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java
    xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeUseImpl.java
    xerces/java/trunk/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java
    xerces/java/trunk/src/org/apache/xerces/impl/xs/XSElementDecl.java
    xerces/java/trunk/src/org/apache/xerces/impl/xs/XSGroupDecl.java
    xerces/java/trunk/src/org/apache/xerces/impl/xs/XSNotationDecl.java
    xerces/java/trunk/src/org/apache/xerces/impl/xs/XSWildcardDecl.java
    xerces/java/trunk/src/org/apache/xerces/impl/xs/models/XSAllCM.java
    
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java
    
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java
    
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java
    
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDWildcardTraverser.java

Modified: 
xerces/java/trunk/src/org/apache/xerces/impl/xpath/regex/ParserForXMLSchema.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xpath/regex/ParserForXMLSchema.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- 
xerces/java/trunk/src/org/apache/xerces/impl/xpath/regex/ParserForXMLSchema.java
 (original)
+++ 
xerces/java/trunk/src/org/apache/xerces/impl/xpath/regex/ParserForXMLSchema.java
 Sun Sep 24 09:22:30 2006
@@ -159,8 +159,8 @@
      * c-c-subtraction  ::= (positive-c-group | negative-c-group) subtraction
      * subtraction      ::= '-' c-c-expression
      * c-range          ::= single-range | from-to-range
-     * single-range     ::= multi-c-escape | category-c-escape | 
block-c-escape | <any XML char>
-     * cc-normal-c      ::= <any character except [, ], \>
+     * single-range     ::= multi-c-escape | category-c-escape | 
block-c-escape | &lt;any XML char&gt;
+     * cc-normal-c      ::= &lt;any character except [, ], \&gt;
      * from-to-range    ::= cc-normal-c '-' cc-normal-c
      *
      * @param useNrage Ignored.

Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeDecl.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeDecl.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeDecl.java 
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeDecl.java Sun 
Sep 24 09:22:30 2006
@@ -24,7 +24,7 @@
 
 /**
  * The XML representation for an attribute declaration
- * schema component is an <attribute> element information item
+ * schema component is an &lt;attribute&gt; element information item
  * 
  * @xerces.internal 
  *

Modified: 
xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java 
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeGroupDecl.java 
Sun Sep 24 09:22:30 2006
@@ -29,7 +29,7 @@
 
 /**
  * The XML representation for an attribute group declaration
- * schema component is a global <attributeGroup> element information item
+ * schema component is a global &lt;attributeGroup&gt; element information item
  * 
  * @xerces.internal 
  *

Modified: 
xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeUseImpl.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeUseImpl.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeUseImpl.java 
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/XSAttributeUseImpl.java Sun 
Sep 24 09:22:30 2006
@@ -28,7 +28,7 @@
 
 /**
  * The XML representation for an attribute use
- * schema component is a local <attribute> element information item
+ * schema component is a local &lt;attribute&gt; element information item
  *
  * @xerces.internal 
  *

Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java 
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/XSComplexTypeDecl.java Sun 
Sep 24 09:22:30 2006
@@ -27,7 +27,7 @@
 
 /**
  * The XML representation for a complexType
- * schema component is a <complexType> element information item
+ * schema component is a &lt;complexType&gt; element information item
  *
  * @xerces.internal 
  *

Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/XSElementDecl.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XSElementDecl.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/XSElementDecl.java 
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/XSElementDecl.java Sun Sep 
24 09:22:30 2006
@@ -33,7 +33,7 @@
 
 /**
  * The XML representation for an element declaration
- * schema component is an <element> element information item
+ * schema component is an &lt;element&gt; element information item
  *
  * @xerces.internal 
  *

Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/XSGroupDecl.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XSGroupDecl.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/XSGroupDecl.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/XSGroupDecl.java Sun Sep 24 
09:22:30 2006
@@ -22,7 +22,7 @@
 
 /**
  * The XML representation for a group declaration
- * schema component is a global <group> element information item
+ * schema component is a global &lt;group&gt; element information item
  *
  * @xerces.internal 
  *

Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/XSNotationDecl.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XSNotationDecl.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/XSNotationDecl.java 
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/XSNotationDecl.java Sun Sep 
24 09:22:30 2006
@@ -26,7 +26,7 @@
 
 /**
  * The XML representation for a NOTATION declaration
- * schema component is a global <notation> element information item
+ * schema component is a global &lt;notation&gt; element information item
  *
  * @xerces.internal 
  *

Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/XSWildcardDecl.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XSWildcardDecl.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/XSWildcardDecl.java 
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/XSWildcardDecl.java Sun Sep 
24 09:22:30 2006
@@ -28,7 +28,7 @@
 
 /**
  * The XML representation for a wildcard declaration
- * schema component is an <any> or <anyAttribute> element information item
+ * schema component is an &lt;any&gt; or &lt;anyAttribute&gt; element 
information item
  *
  * @xerces.internal 
  *

Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/models/XSAllCM.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/models/XSAllCM.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/models/XSAllCM.java 
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/models/XSAllCM.java Sun Sep 
24 09:22:30 2006
@@ -26,7 +26,7 @@
 import java.util.Vector;
 
 /**
- * XSAllCM implements XSCMValidator and handles <all>
+ * XSAllCM implements XSCMValidator and handles &lt;all&gt;.
  *
  * @xerces.internal 
  *

Modified: 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java
 (original)
+++ 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAbstractParticleTraverser.java
 Sun Sep 24 09:22:30 2006
@@ -47,12 +47,12 @@
      *
      * Traverse the "All" declaration
      *
-     * <all
+     * &lt;all
      *   id = ID
      *   maxOccurs = 1 : 1
-     *   minOccurs = (0 | 1) : 1>
+     *   minOccurs = (0 | 1) : 1&gt;
      *   Content: (annotation? , element*)
-     * </all>
+     * &lt;/all&gt;
      **/
     XSParticleDecl traverseAll(Element allDecl,
             XSDocumentInfo schemaDoc,

Modified: 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java
 (original)
+++ 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java
 Sun Sep 24 09:22:30 2006
@@ -30,13 +30,13 @@
 /**
  * The attribute group definition schema component traverser.
  *
- * <attributeGroup
+ * &lt;attributeGroup
  *   id = ID
  *   name = NCName
  *   ref = QName
- *   {any attributes with non-schema namespace . . .}>
+ *   {any attributes with non-schema namespace . . .}&gt;
  *   Content: (annotation?, ((attribute | attributeGroup)*, anyAttribute?))
- * </attributeGroup>
+ * &lt;/attributeGroup&gt;
  *
  * @xerces.internal 
  *

Modified: 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java
 (original)
+++ 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAttributeTraverser.java
 Sun Sep 24 09:22:30 2006
@@ -39,7 +39,7 @@
 /**
  * The attribute declaration schema component traverser.
  *
- * <attribute
+ * &lt;attribute
  *   default = string
  *   fixed = string
  *   form = (qualified | unqualified)
@@ -48,9 +48,9 @@
  *   ref = QName
  *   type = QName
  *   use = (optional | prohibited | required) : optional
- *   {any attributes with non-schema namespace . . .}>
+ *   {any attributes with non-schema namespace . . .}&gt;
  *   Content: (annotation?, (simpleType?))
- * </attribute>
+ * &lt;/attribute&gt;
  *
  * @xerces.internal 
  *

Modified: 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDWildcardTraverser.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDWildcardTraverser.java?view=diff&rev=449424&r1=449423&r2=449424
==============================================================================
--- 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDWildcardTraverser.java
 (original)
+++ 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDWildcardTraverser.java
 Sun Sep 24 09:22:30 2006
@@ -31,23 +31,23 @@
 /**
  * The wildcard schema component traverser.
  *
- * <any
+ * &lt;any
  *   id = ID
  *   maxOccurs = (nonNegativeInteger | unbounded)  : 1
  *   minOccurs = nonNegativeInteger : 1
  *   namespace = ((##any | ##other) | List of (anyURI | (##targetNamespace | 
##local)) )  : ##any
  *   processContents = (lax | skip | strict) : strict
- *   {any attributes with non-schema namespace . . .}>
+ *   {any attributes with non-schema namespace . . .}&gt;
  *   Content: (annotation?)
- * </any>
+ * &lt;/any&gt;
  *
- * <anyAttribute
+ * &lt;anyAttribute
  *   id = ID
  *   namespace = ((##any | ##other) | List of (anyURI | (##targetNamespace | 
##local)) )  : ##any
  *   processContents = (lax | skip | strict) : strict
- *   {any attributes with non-schema namespace . . .}>
+ *   {any attributes with non-schema namespace . . .}&gt;
  *   Content: (annotation?)
- * </anyAttribute>
+ * &lt;/anyAttribute&gt;
  *
  * @xerces.internal 
  *
@@ -72,7 +72,7 @@
     
     
     /**
-     * Traverse <any>
+     * Traverse &lt;any&gt;
      *
      * @param  elmNode
      * @param  schemaDoc
@@ -113,7 +113,7 @@
     
     
     /**
-     * Traverse <anyAttribute>
+     * Traverse &lt;anyAttribute&gt;
      *
      * @param  elmNode
      * @param  schemaDoc



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r449424 - in /xerces/java/trunk/src/org/apache/xerces/impl: xpath/regex/ xs/ xs/models/ xs/traversers/

Reply via email to