--- src/org/apache/xerces/impl/XMLDTDScannerImpl.java.orig	2003-01-27 20:18:06.000000000 +0100
+++ src/org/apache/xerces/impl/XMLDTDScannerImpl.java	2005-08-20 13:37:07.000000000 +0200
@@ -1198,21 +1198,21 @@
 
             // call handler
             if (fDTDHandler != null) {
-                String[] enum = null;
+                String[] enum1 = null;
                 if (fEnumerationCount != 0) {
-                    enum = new String[fEnumerationCount];
-                    System.arraycopy(fEnumeration, 0, enum,
+                    enum1 = new String[fEnumerationCount];
+                    System.arraycopy(fEnumeration, 0, enum1,
                                      0, fEnumerationCount);
                 }
                 // Determine whether the default value to be passed should be null. 
                 // REVISIT: should probably check whether fLiteral.ch is null instead. LM.
                 if (defaultType!=null && (defaultType.equals("#REQUIRED") || 
                                           defaultType.equals("#IMPLIED"))) {
-                    fDTDHandler.attributeDecl(elName, name, type, enum,
+                    fDTDHandler.attributeDecl(elName, name, type, enum1,
                                               defaultType, null, null, null);
                 }
                 else {
-                    fDTDHandler.attributeDecl(elName, name, type, enum,
+                    fDTDHandler.attributeDecl(elName, name, type, enum1,
                                               defaultType, fLiteral, fLiteral2, null);
                 }
             }
--- src/org/apache/xerces/impl/xs/XSGrammarBucket.java.orig	2003-01-27 20:18:08.000000000 +0100
+++ src/org/apache/xerces/impl/xs/XSGrammarBucket.java	2005-08-20 13:38:10.000000000 +0200
@@ -180,10 +180,10 @@
         int count = fGrammarRegistry.size() + (fNoNSGrammar==null ? 0 : 1);
         SchemaGrammar[] grammars = new SchemaGrammar[count];
         // get grammars with target namespace
-        Enumeration enum = fGrammarRegistry.elements();
+        Enumeration enum1 = fGrammarRegistry.elements();
         int i = 0;
-        while (enum.hasMoreElements())
-            grammars[i++] = (SchemaGrammar)enum.nextElement();
+        while (enum1.hasMoreElements())
+            grammars[i++] = (SchemaGrammar)enum1.nextElement();
         // add the grammar without target namespace, if any
         if (fNoNSGrammar != null)
             grammars[count-1] = fNoNSGrammar;
--- src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java.orig	2003-01-27 20:18:02.000000000 +0100
+++ src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java	2005-08-20 13:39:17.000000000 +0200
@@ -1537,11 +1537,11 @@
     // REVISIT: pass the proper element node to reportSchemaError
     public void checkNonSchemaAttributes(XSGrammarBucket grammarBucket) {
         // for all attributes
-        Enumeration enum = fNonSchemaAttrs.keys();
+        Enumeration enum1 = fNonSchemaAttrs.keys();
         XSAttributeDecl attrDecl;
-        while (enum.hasMoreElements()) {
+        while (enum1.hasMoreElements()) {
             // get name, uri, localpart
-            String attrRName = (String)enum.nextElement();
+            String attrRName = (String)enum1.nextElement();
             String attrURI = attrRName.substring(0,attrRName.indexOf(','));
             String attrLocal = attrRName.substring(attrRName.indexOf(',')+1);
             // find associated grammar
--- src/org/apache/xerces/util/AugmentationsImpl.java.orig	2003-01-27 20:18:09.000000000 +0100
+++ src/org/apache/xerces/util/AugmentationsImpl.java	2005-08-20 13:41:47.000000000 +0200
@@ -311,10 +311,10 @@
         public String toString() {
             StringBuffer buff = new StringBuffer();
             buff.append("LargeContainer");
-            Enumeration enum = fAugmentations.keys();
+            Enumeration enum1 = fAugmentations.keys();
 
-            while (enum.hasMoreElements()) {
-                Object key = enum.nextElement();
+            while (enum1.hasMoreElements()) {
+                Object key = enum1.nextElement();
                 buff.append("\nkey == ");
                 buff.append(key);
                 buff.append("; value == ");
--- src/org/apache/xerces/util/NamespaceSupport.java.orig	2003-01-27 20:18:06.000000000 +0100
+++ src/org/apache/xerces/util/NamespaceSupport.java	2005-08-20 13:42:58.000000000 +0200
@@ -125,9 +125,9 @@
     public NamespaceSupport(NamespaceContext context) {
         pushContext();
         // copy declaration in the context
-        Enumeration enum = context.getAllPrefixes();
-        while (enum.hasMoreElements()){
-            String prefix = (String)enum.nextElement();
+        Enumeration enum1 = context.getAllPrefixes();
+        while (enum1.hasMoreElements()){
+            String prefix = (String)enum1.nextElement();
             String uri = context.getURI(prefix);
             declarePrefix(prefix, uri);
         }
--- src/org/apache/xml/serialize/HTMLSerializer.java.orig	2003-01-27 20:18:09.000000000 +0100
+++ src/org/apache/xml/serialize/HTMLSerializer.java	2005-08-20 13:46:19.000000000 +0200
@@ -346,12 +346,12 @@
                 preserveSpace = true;
 
             if ( addNSAttr ) {
-                Enumeration enum;
+                Enumeration enum1;
 
-                enum = _prefixes.keys();
-                while ( enum.hasMoreElements() ) {
+                enum1 = _prefixes.keys();
+                while ( enum1.hasMoreElements() ) {
                     _printer.printSpace();
-                    value = (String) enum.nextElement();
+                    value = (String) enum1.nextElement();
                     name = (String) _prefixes.get( value );
                     if ( name.length() == 0 ) {
                         _printer.printText( "xmlns=\"" );
--- src/org/apache/xml/serialize/XMLSerializer.java.orig	2003-01-27 20:18:02.000000000 +0100
+++ src/org/apache/xml/serialize/XMLSerializer.java	2005-08-20 13:50:16.000000000 +0200
@@ -374,12 +374,12 @@
             }
 
             if (_prefixes != null) {
-                Enumeration enum;
+                Enumeration enum1;
 
-                enum = _prefixes.keys();
-                while (enum.hasMoreElements()) {
+                enum1 = _prefixes.keys();
+                while (enum1.hasMoreElements()) {
                     _printer.printSpace();
-                    value = (String) enum.nextElement();
+                    value = (String) enum1.nextElement();
                     name = (String) _prefixes.get( value );
                     if (name.length() == 0) {
                         _printer.printText( "xmlns=\"" );
--- samples/xni/PSVIWriter.java.orig	2003-01-27 20:18:10.000000000 +0100
+++ samples/xni/PSVIWriter.java	2005-08-20 13:59:48.000000000 +0200
@@ -1147,11 +1147,11 @@
 		printElement("prefix", "xml");
 		printElement("namespaceName", NamespaceContext.XML_URI);
         printUnIndentTag("</namespace>");
-		Enumeration enum = fNamespaceContext.getAllPrefixes();
-		while (enum.hasMoreElements()) {
+		Enumeration enum1 = fNamespaceContext.getAllPrefixes();
+		while (enum1.hasMoreElements()) {
             printIndentTag("<namespace>");
 
-			String prefix = (String) enum.nextElement();
+			String prefix = (String) enum1.nextElement();
 			String uri = fNamespaceContext.getURI(prefix);
 			printElement("prefix", prefix);
 			printElement("namespaceName", uri);