Author: dkulp Date: Fri Jun 24 14:14:57 2011 New Revision: 1139312 URL: http://svn.apache.org/viewvc?rev=1139312&view=rev Log: Merged revisions 1138949 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1138949 | dkulp | 2011-06-23 11:51:18 -0400 (Thu, 23 Jun 2011) | 9 lines Merged revisions 1138628 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1138628 | dkulp | 2011-06-22 16:45:46 -0400 (Wed, 22 Jun 2011) | 1 line Fix warnings found by the latest Eclipse indigo compiler. ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/BeanWithGregorianDate.java cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java Propchange: cxf/branches/2.3.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/BeanWithGregorianDate.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/BeanWithGregorianDate.java?rev=1139312&r1=1139311&r2=1139312&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/BeanWithGregorianDate.java (original) +++ cxf/branches/2.3.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/BeanWithGregorianDate.java Fri Jun 24 14:14:57 2011 @@ -22,7 +22,6 @@ package org.apache.cxf.aegis.type.java5; import javax.xml.datatype.XMLGregorianCalendar; public class BeanWithGregorianDate { - private static final long serialVersionUID = 1481418882118674796L; private int id; private String name; Modified: cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=1139312&r1=1139311&r2=1139312&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java (original) +++ cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Fri Jun 24 14:14:57 2011 @@ -64,7 +64,6 @@ import org.eclipse.jetty.util.thread.Thr */ public class JettyHTTPServerEngine implements ServerEngine { - private static final long serialVersionUID = 1L; private static final Logger LOG = LogUtils.getL7dLogger(JettyHTTPServerEngine.class); Modified: cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java?rev=1139312&r1=1139311&r2=1139312&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java (original) +++ cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java Fri Jun 24 14:14:57 2011 @@ -28,7 +28,6 @@ import org.eclipse.jetty.server.Abstract * TLS enabled acceptors. */ public final class JettySslConnectorFactory implements JettyConnectorFactory { - private static final long serialVersionUID = 1L; TLSServerParameters tlsServerParameters; Modified: cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=1139312&r1=1139311&r2=1139312&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original) +++ cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Fri Jun 24 14:14:57 2011 @@ -101,8 +101,6 @@ public abstract class AbstractHTTPDestin private static final Logger LOG = LogUtils.getL7dLogger(AbstractHTTPDestination.class); - private static final long serialVersionUID = 1L; - protected final Bus bus; // Configuration values Modified: cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java?rev=1139312&r1=1139311&r2=1139312&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java (original) +++ cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java Fri Jun 24 14:14:57 2011 @@ -56,7 +56,6 @@ public final class HttpsURLConnectionFac */ public static final String HTTPS_URL_PROTOCOL_ID = "https"; - private static final long serialVersionUID = 1L; private static final Logger LOG = LogUtils.getL7dLogger(HttpsURLConnectionFactory.class); Modified: cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java?rev=1139312&r1=1139311&r2=1139312&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java (original) +++ cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java Fri Jun 24 14:14:57 2011 @@ -43,8 +43,6 @@ public class ServletDestination extends static final Logger LOG = LogUtils.getL7dLogger(ServletDestination.class); - private static final long serialVersionUID = 1L; - final ServletTransportFactory factory; final String path; @@ -68,7 +66,6 @@ public class ServletDestination extends path = p; } - protected Logger getLogger() { return LOG; } Modified: cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java?rev=1139312&r1=1139311&r2=1139312&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java (original) +++ cxf/branches/2.3.x-fixes/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLTypes.java Fri Jun 24 14:14:57 2011 @@ -432,7 +432,7 @@ public final class WSDLTypes { anonymous = true; } else { StringTokenizer strtok = new StringTokenizer(typeName, "."); - for (int i = 0; strtok.hasMoreTokens(); ++i) { + while (strtok.hasMoreTokens()) { String token = strtok.nextToken(); if (token.startsWith("_") && Character.isDigit(token.charAt(1))) {
