svn commit: r387122 - in /webservices/soap/trunk/java/src/org/apache/soap: encoding/soapenc/VectorSerializer.java providers/StatefulEJBProvider.java server/http/MessageRouterServlet.java server/http/RPCRouterServlet.java util/net/HTTPUtils.java

[s***@apache.org]

Author: sanjiva
Date: Sun Mar 19 19:44:22 2006
New Revision: 387122

URL: http://svn.apache.org/viewcvs?rev=387122&view=rev
Log:
renamed variables named "enum" to "enu" to enable JDK5 compilation

Modified:
webservices/soap/trunk/java/src/org/apache/soap/encoding/soapenc/VectorSerializer.java
webservices/soap/trunk/java/src/org/apache/soap/providers/StatefulEJBProvider.java
webservices/soap/trunk/java/src/org/apache/soap/server/http/MessageRouterServlet.java
webservices/soap/trunk/java/src/org/apache/soap/server/http/RPCRouterServlet.java
webservices/soap/trunk/java/src/org/apache/soap/util/net/HTTPUtils.java

Modified: webservices/soap/trunk/java/src/org/apache/soap/encoding/soapenc/VectorSerializer.java
URL: http://svn.apache.org/viewcvs/webservices/soap/trunk/java/src/org/apache/soap/encoding/soapenc/VectorSerializer.java?rev=387122&r1=387121&r2=387122&view=diff
==============================================================================
--- webservices/soap/trunk/java/src/org/apache/soap/encoding/soapenc/VectorSerializer.java (original)
+++ webservices/soap/trunk/java/src/org/apache/soap/encoding/soapenc/VectorSerializer.java Sun Mar 19 19:44:22 2006
@@ -52,7 +52,7 @@
src.getClass().toString() + "' to VectorSerializer");

String lengthStr;
- Enumeration enum;
+ Enumeration enu;

if (src instanceof Enumeration) {
/** TODO: Right now we don't include a length on Enumerations,
@@ -60,11 +60,11 @@
* doing the length calculation (at the cost of traversing the
* Enumeration) for a particular installation/service/call.
*/
- enum = (Enumeration)src;
+ enu = (Enumeration)src;
lengthStr = "";
} else {
Vector v = (Vector)src;
- enum = v.elements();
+ enu = v.elements();

lengthStr = src != null
? v.size() + ""
@@ -94,7 +94,7 @@

sink.write(Envelope.LINE_SEPARATOR);

- for (Enumeration e = enum; e.hasMoreElements(); )
+ for (Enumeration e = enu; e.hasMoreElements(); )
{
nsStack.pushScope();


Modified: webservices/soap/trunk/java/src/org/apache/soap/providers/StatefulEJBProvider.java
URL: http://svn.apache.org/viewcvs/webservices/soap/trunk/java/src/org/apache/soap/providers/StatefulEJBProvider.java?rev=387122&r1=387121&r2=387122&view=diff
==============================================================================
--- webservices/soap/trunk/java/src/org/apache/soap/providers/StatefulEJBProvider.java (original)
+++ webservices/soap/trunk/java/src/org/apache/soap/providers/StatefulEJBProvider.java Sun Mar 19 19:44:22 2006
@@ -206,8 +206,8 @@
remoteObjRef = (Remote) ret.getValue();
} catch (ClassCastException cce) {
// Try to cast to an enumeration:
- Enumeration enum = (Enumeration) ret.getValue();
- remoteObjRef = (Remote) enum.nextElement();
+ Enumeration enu = (Enumeration) ret.getValue();
+ remoteObjRef = (Remote) enu.nextElement();
}
// Set the return value to null, so that the remote object is not
// included in the response destined for the client.

Modified: webservices/soap/trunk/java/src/org/apache/soap/server/http/MessageRouterServlet.java
URL: http://svn.apache.org/viewcvs/webservices/soap/trunk/java/src/org/apache/soap/server/http/MessageRouterServlet.java?rev=387122&r1=387121&r2=387122&view=diff
==============================================================================
--- webservices/soap/trunk/java/src/org/apache/soap/server/http/MessageRouterServlet.java (original)
+++ webservices/soap/trunk/java/src/org/apache/soap/server/http/MessageRouterServlet.java Sun Mar 19 19:44:22 2006
@@ -122,10 +122,10 @@
if (factory != null) {
try {
Properties props = new Properties();
- Enumeration enum = servletConfig.getInitParameterNames();
+ Enumeration enu = servletConfig.getInitParameterNames();

- while (enum.hasMoreElements()) {
- String name = (String)enum.nextElement();
+ while (enu.hasMoreElements()) {
+ String name = (String)enu.nextElement();

if (!Constants.ENVELOPE_EDITOR_FACTORY.equals(name)
&& !Constants.XML_PARSER.equals(name)) {

Modified: webservices/soap/trunk/java/src/org/apache/soap/server/http/RPCRouterServlet.java
URL: http://svn.apache.org/viewcvs/webservices/soap/trunk/java/src/org/apache/soap/server/http/RPCRouterServlet.java?rev=387122&r1=387121&r2=387122&view=diff
==============================================================================
--- webservices/soap/trunk/java/src/org/apache/soap/server/http/RPCRouterServlet.java (original)
+++ webservices/soap/trunk/java/src/org/apache/soap/server/http/RPCRouterServlet.java Sun Mar 19 19:44:22 2006
@@ -140,10 +140,10 @@
/*First we put in the servletContext parameters, and then
overwrite them with the servletConfig parameters if
they are present.*/
- Enumeration enum = servletContext.getInitParameterNames();
+ Enumeration enu = servletContext.getInitParameterNames();

- while (enum.hasMoreElements()) {
- String name = (String)enum.nextElement();
+ while (enu.hasMoreElements()) {
+ String name = (String)enu.nextElement();

if (!Constants.ENVELOPE_EDITOR_FACTORY.equals(name)
&& !Constants.XML_PARSER.equals(name)) {
@@ -151,10 +151,10 @@
}
}

- enum = servletConfig.getInitParameterNames();
+ enu = servletConfig.getInitParameterNames();

- while (enum.hasMoreElements()) {
- String name = (String)enum.nextElement();
+ while (enu.hasMoreElements()) {
+ String name = (String)enu.nextElement();

if (!Constants.ENVELOPE_EDITOR_FACTORY.equals(name)
&& !Constants.XML_PARSER.equals(name)) {

Modified: webservices/soap/trunk/java/src/org/apache/soap/util/net/HTTPUtils.java
URL: http://svn.apache.org/viewcvs/webservices/soap/trunk/java/src/org/apache/soap/util/net/HTTPUtils.java?rev=387122&r1=387121&r2=387122&view=diff
==============================================================================
--- webservices/soap/trunk/java/src/org/apache/soap/util/net/HTTPUtils.java (original)
+++ webservices/soap/trunk/java/src/org/apache/soap/util/net/HTTPUtils.java Sun Mar 19 19:44:22 2006
@@ -215,8 +215,8 @@
*/
public static String getHeaderValue(Hashtable headers,
String headerName) {
- for (Enumeration enum = headers.keys(); enum.hasMoreElements(); ) {
- String key = (String) enum.nextElement();
+ for (Enumeration enu = headers.keys(); enu.hasMoreElements(); ) {
+ String key = (String) enu.nextElement();
if (key.equalsIgnoreCase(headerName)) {
return (String) headers.get(key);
}