diff -r -u jakarta-slide-server-src-2.1.orig/src/share/org/apache/slide/search/basic/ComparableResourceImpl.java jakarta-slide-server-src-2.1/src/share/org/apache/slide/search/basic/ComparableResourceImpl.java --- jakarta-slide-server-src-2.1.orig/src/share/org/apache/slide/search/basic/ComparableResourceImpl.java 2004-12-23 22:08:00.000000000 +0100 +++ jakarta-slide-server-src-2.1/src/share/org/apache/slide/search/basic/ComparableResourceImpl.java 2006-09-29 11:56:06.000000000 +0200 @@ -354,11 +354,11 @@ public Iterator getAllPropertiesNames() throws SlideException { Set propertyNamesSet = new HashSet(); - Enumeration enum = revisionDescriptor.enumerateProperties(); + Enumeration _enum = revisionDescriptor.enumerateProperties(); NodeProperty property = null; - if (enum != null) { - while (enum.hasMoreElements()) { - property = (NodeProperty)enum.nextElement(); + if (_enum != null) { + while (_enum.hasMoreElements()) { + property = (NodeProperty)_enum.nextElement(); propertyNamesSet.add(new PropertyName(property.getName(), property.getNamespace())); } @@ -382,10 +382,10 @@ public Iterator getAllProperties() throws SlideException { Set propertySet = new HashSet(); - Enumeration enum = revisionDescriptor.enumerateProperties(); - if (enum != null) { - while (enum.hasMoreElements()) { - propertySet.add(enum.nextElement()); + Enumeration _enum = revisionDescriptor.enumerateProperties(); + if (_enum != null) { + while (_enum.hasMoreElements()) { + propertySet.add(_enum.nextElement()); } } diff -r -u jakarta-slide-server-src-2.1.orig/src/share/org/apache/slide/security/SecurityImpl.java jakarta-slide-server-src-2.1/src/share/org/apache/slide/security/SecurityImpl.java --- jakarta-slide-server-src-2.1.orig/src/share/org/apache/slide/security/SecurityImpl.java 2004-12-23 22:07:59.000000000 +0100 +++ jakarta-slide-server-src-2.1/src/share/org/apache/slide/security/SecurityImpl.java 2006-09-29 11:56:06.000000000 +0200 @@ -826,9 +826,9 @@ break; case NamespaceConfig.ACL_INHERIT_TYPE_PATH: uri = namespace.getUri(token, object.getUri()); - Enumeration enum = uri.getScopes(); - while (enum.hasMoreElements()) { - Uri element = namespace.getUri(token, (String)enum.nextElement()); + Enumeration _enum = uri.getScopes(); + while (_enum.hasMoreElements()) { + Uri element = namespace.getUri(token, (String)_enum.nextElement()); ObjectNode objectNode = element.getStore().retrieveObject(element); result.add(objectNode); } diff -r -u jakarta-slide-server-src-2.1.orig/src/share/org/apache/slide/store/BindingStore.java jakarta-slide-server-src-2.1/src/share/org/apache/slide/store/BindingStore.java --- jakarta-slide-server-src-2.1.orig/src/share/org/apache/slide/store/BindingStore.java 2004-12-23 22:08:00.000000000 +0100 +++ jakarta-slide-server-src-2.1/src/share/org/apache/slide/store/BindingStore.java 2006-09-29 11:56:07.000000000 +0200 @@ -450,11 +450,11 @@ String result = ""; while (!resourceId.isStoreRoot()) { ObjectNode objectNode = resourceId.getStore().retrieveObject(resourceId); - Enumeration enum = objectNode.enumerateParentBindings(); - if (!enum.hasMoreElements()) { + Enumeration _enum = objectNode.enumerateParentBindings(); + if (!_enum.hasMoreElements()) { throw new IllegalStateException(); } - ObjectNode.Binding parentBinding = (ObjectNode.Binding) enum.nextElement(); + ObjectNode.Binding parentBinding = (ObjectNode.Binding) _enum.nextElement(); String parentSegment = parentBinding.getName(); result = "/" + parentSegment + result; resourceId = ResourceId.create(resourceId, parentBinding.getUuri()); diff -r -u jakarta-slide-server-src-2.1.orig/src/share/org/apache/slide/structure/StructureImpl.java jakarta-slide-server-src-2.1/src/share/org/apache/slide/structure/StructureImpl.java --- jakarta-slide-server-src-2.1.orig/src/share/org/apache/slide/structure/StructureImpl.java 2004-12-23 22:07:59.000000000 +0100 +++ jakarta-slide-server-src-2.1/src/share/org/apache/slide/structure/StructureImpl.java 2006-09-29 11:56:07.000000000 +0200 @@ -561,8 +561,8 @@ store(token, nodeToDelete); } else { - Enumeration enum = nodeToDelete.enumerateChildren(); - if (enum.hasMoreElements()) { + Enumeration _enum = nodeToDelete.enumerateChildren(); + if (_enum.hasMoreElements()) { throw new ObjectHasChildrenException(uri); } uri.getStore().removeObject(uri, nodeToDelete); diff -r -u jakarta-slide-server-src-2.1.orig/src/share/org/apache/slide/transaction/SlideTransaction.java jakarta-slide-server-src-2.1/src/share/org/apache/slide/transaction/SlideTransaction.java --- jakarta-slide-server-src-2.1.orig/src/share/org/apache/slide/transaction/SlideTransaction.java 2004-12-23 22:08:00.000000000 +0100 +++ jakarta-slide-server-src-2.1/src/share/org/apache/slide/transaction/SlideTransaction.java 2006-09-29 11:56:07.000000000 +0200 @@ -205,14 +205,14 @@ Vector exceptions = new Vector(); boolean fail = false; - Enumeration enum = branches.keys(); + Enumeration _enum = branches.keys(); if (enlistedResources.size() == 1) { // One phase commit status = Status.STATUS_COMMITTING; - while (enum.hasMoreElements()) { - Object key = enum.nextElement(); + while (_enum.hasMoreElements()) { + Object key = _enum.nextElement(); XAResource resourceManager = (XAResource) branches.get(key); try { @@ -242,8 +242,8 @@ // Prepare each enlisted resource status = Status.STATUS_PREPARING; - while ((!fail) && (enum.hasMoreElements())) { - Object key = enum.nextElement(); + while ((!fail) && (_enum.hasMoreElements())) { + Object key = _enum.nextElement(); XAResource resourceManager = (XAResource) branches.get(key); try { @@ -270,9 +270,9 @@ status = Status.STATUS_ROLLING_BACK; fail = false; // Rolling back all the prepared (and unprepared) branches - enum = branches.keys(); - while (enum.hasMoreElements()) { - Object key = enum.nextElement(); + _enum = branches.keys(); + while (_enum.hasMoreElements()) { + Object key = _enum.nextElement(); XAResource resourceManager = (XAResource) branches.get(key); try { @@ -291,9 +291,9 @@ } else { status = Status.STATUS_COMMITTING; // Commit each enlisted resource - enum = branches.keys(); - while (enum.hasMoreElements()) { - Object key = enum.nextElement(); + _enum = branches.keys(); + while (_enum.hasMoreElements()) { + Object key = _enum.nextElement(); XAResource resourceManager = (XAResource) branches.get(key); try { @@ -322,8 +322,8 @@ } // Parsing exception and throwing an appropriate exception - enum = exceptions.elements(); - if (enum.hasMoreElements()) { + _enum = exceptions.elements(); + if (_enum.hasMoreElements()) { if ((status == Status.STATUS_ROLLEDBACK) && (!fail)) throw new RollbackException(); if (status == Status.STATUS_ROLLEDBACK) @@ -435,9 +435,9 @@ Xid branchXid = (Xid) suspendedResources.get(xaRes); if (branchXid == null) { - Enumeration enum = enlistedResources.elements(); - while ((!alreadyEnlisted) && (enum.hasMoreElements())) { - XAResource resourceManager = (XAResource) enum.nextElement(); + Enumeration _enum = enlistedResources.elements(); + while ((!alreadyEnlisted) && (_enum.hasMoreElements())) { + XAResource resourceManager = (XAResource) _enum.nextElement(); try { if (resourceManager.isSameRM(xaRes)) { flag = XAResource.TMJOIN; @@ -513,11 +513,11 @@ Vector exceptions = new Vector(); - Enumeration enum = branches.keys(); + Enumeration _enum = branches.keys(); status = Status.STATUS_ROLLING_BACK; - while (enum.hasMoreElements()) { - Xid xid = (Xid) enum.nextElement(); + while (_enum.hasMoreElements()) { + Xid xid = (Xid) _enum.nextElement(); XAResource resourceManager = (XAResource) branches.get(xid); try { resourceManager.rollback(xid); diff -r -u jakarta-slide-server-src-2.1.orig/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java jakarta-slide-server-src-2.1/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java --- jakarta-slide-server-src-2.1.orig/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java 2004-12-23 22:08:00.000000000 +0100 +++ jakarta-slide-server-src-2.1/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java 2006-09-29 11:56:07.000000000 +0200 @@ -342,20 +342,20 @@ if (depth > 0) { - Enumeration enum = null; + Enumeration _enum = null; try { - enum = structure.getChildren(slideToken, cur); + _enum = structure.getChildren(slideToken, cur); } catch (Exception e) { int statusCode = getErrorCode( e ); sendError( statusCode, e ); throw new WebdavException( statusCode ); } - while (enum.hasMoreElements()) { + while (_enum.hasMoreElements()) { // PROPFIND must not list Lock-Null resources that // are timed out - ObjectNode node = (ObjectNode)enum.nextElement(); + ObjectNode node = (ObjectNode)_enum.nextElement(); UnlockListenerImpl listener = new UnlockListenerImpl( slideToken, token, config, req, resp); try { diff -r -u jakarta-slide-server-src-2.1.orig/src/webdav/server/org/apache/slide/webdav/util/ResourceWithProvidedProperties.java jakarta-slide-server-src-2.1/src/webdav/server/org/apache/slide/webdav/util/ResourceWithProvidedProperties.java --- jakarta-slide-server-src-2.1.orig/src/webdav/server/org/apache/slide/webdav/util/ResourceWithProvidedProperties.java 2004-12-23 22:08:00.000000000 +0100 +++ jakarta-slide-server-src-2.1/src/webdav/server/org/apache/slide/webdav/util/ResourceWithProvidedProperties.java 2006-09-29 11:56:07.000000000 +0200 @@ -136,11 +136,11 @@ public Iterator getAllPropertiesNames() throws SlideException { Set propertyNamesList = new HashSet(); - Enumeration enum = revisionDescriptor.enumerateProperties(); + Enumeration _enum = revisionDescriptor.enumerateProperties(); NodeProperty property = null; - if (enum != null) { - while (enum.hasMoreElements()) { - property = (NodeProperty)enum.nextElement(); + if (_enum != null) { + while (_enum.hasMoreElements()) { + property = (NodeProperty)_enum.nextElement(); propertyNamesList.add(new PropertyName(property.getName(), property.getNamespace())); } @@ -166,10 +166,10 @@ public Iterator getAllProperties() throws SlideException { Set propertyList = new HashSet(); - Enumeration enum = revisionDescriptor.enumerateProperties(); - if (enum != null) { - while (enum.hasMoreElements()) { - propertyList.add(enum.nextElement()); + Enumeration _enum = revisionDescriptor.enumerateProperties(); + if (_enum != null) { + while (_enum.hasMoreElements()) { + propertyList.add(_enum.nextElement()); } }