Author: markt
Date: Wed Nov 24 22:08:38 2010
New Revision: 1038846
URL: http://svn.apache.org/viewvc?rev=1038846&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49142
Add missing serialVersionUIDs using Eclipse's auto correct and a little manual
formatting
Modified:
tomcat/trunk/java/javax/servlet/GenericServlet.java
tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java
tomcat/trunk/java/javax/servlet/ServletContextEvent.java
tomcat/trunk/java/javax/servlet/ServletException.java
tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java
tomcat/trunk/java/javax/servlet/ServletRequestEvent.java
tomcat/trunk/java/javax/servlet/UnavailableException.java
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java
tomcat/trunk/java/javax/servlet/http/HttpSessionEvent.java
tomcat/trunk/java/javax/servlet/jsp/JspException.java
tomcat/trunk/java/javax/servlet/jsp/JspTagException.java
tomcat/trunk/java/javax/servlet/jsp/SkipPageException.java
tomcat/trunk/java/javax/servlet/jsp/el/ELException.java
tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/UndeployMessage.java
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java
tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java
tomcat/trunk/java/org/apache/catalina/tribes/RemoteProcessException.java
tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java
tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java
tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java
tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java
tomcat/trunk/java/org/apache/jasper/JasperException.java
tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java
tomcat/trunk/java/org/apache/juli/logging/LogConfigurationException.java
tomcat/trunk/java/org/apache/naming/EjbRef.java
tomcat/trunk/java/org/apache/naming/HandlerRef.java
tomcat/trunk/java/org/apache/naming/JndiPermission.java
tomcat/trunk/java/org/apache/naming/ResourceEnvRef.java
tomcat/trunk/java/org/apache/naming/ResourceLinkRef.java
tomcat/trunk/java/org/apache/naming/ServiceRef.java
tomcat/trunk/java/org/apache/naming/TransactionRef.java
tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java
Modified: tomcat/trunk/java/javax/servlet/GenericServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/GenericServlet.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/GenericServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/GenericServlet.java Wed Nov 24 22:08:38 2010
@@ -42,6 +42,8 @@ import java.util.Enumeration;
public abstract class GenericServlet implements Servlet, ServletConfig,
java.io.Serializable {
+ private static final long serialVersionUID = 1L;
+
private transient ServletConfig config;
/**
Modified: tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java Wed Nov
24 22:08:38 2010
@@ -24,6 +24,8 @@ package javax.servlet;
* @since v 2.3
*/
public class ServletContextAttributeEvent extends ServletContextEvent {
+ private static final long serialVersionUID = 1L;
+
private final String name;
private final Object value;
Modified: tomcat/trunk/java/javax/servlet/ServletContextEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContextEvent.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContextEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContextEvent.java Wed Nov 24
22:08:38 2010
@@ -25,6 +25,8 @@ package javax.servlet;
*/
public class ServletContextEvent extends java.util.EventObject {
+ private static final long serialVersionUID = 1L;
+
/**
* Construct a ServletContextEvent from the given context.
*
Modified: tomcat/trunk/java/javax/servlet/ServletException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletException.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletException.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletException.java Wed Nov 24 22:08:38
2010
@@ -25,6 +25,8 @@ package javax.servlet;
*/
public class ServletException extends Exception {
+ private static final long serialVersionUID = 1L;
+
/**
* Constructs a new servlet exception.
*/
Modified: tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java Wed Nov
24 22:08:38 2010
@@ -24,6 +24,8 @@ package javax.servlet;
* @since Servlet 2.4
*/
public class ServletRequestAttributeEvent extends ServletRequestEvent {
+ private static final long serialVersionUID = 1L;
+
private final String name;
private final Object value;
Modified: tomcat/trunk/java/javax/servlet/ServletRequestEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestEvent.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequestEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestEvent.java Wed Nov 24
22:08:38 2010
@@ -24,6 +24,8 @@ package javax.servlet;
* @since Servlet 2.4
*/
public class ServletRequestEvent extends java.util.EventObject {
+ private static final long serialVersionUID = 1L;
+
private final ServletRequest request;
/**
Modified: tomcat/trunk/java/javax/servlet/UnavailableException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/UnavailableException.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/UnavailableException.java (original)
+++ tomcat/trunk/java/javax/servlet/UnavailableException.java Wed Nov 24
22:08:38 2010
@@ -44,6 +44,8 @@ package javax.servlet;
*/
public class UnavailableException extends ServletException {
+ private static final long serialVersionUID = 1L;
+
private final Servlet servlet; // what's unavailable
private final boolean permanent; // needs admin action?
private final int seconds; // unavailability estimate
Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Wed Nov 24 22:08:38
2010
@@ -75,6 +75,8 @@ import javax.servlet.ServletResponse;
*/
public abstract class HttpServlet extends GenericServlet {
+ private static final long serialVersionUID = 1L;
+
private static final String METHOD_DELETE = "DELETE";
private static final String METHOD_HEAD = "HEAD";
private static final String METHOD_GET = "GET";
Modified: tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java Wed Nov
24 22:08:38 2010
@@ -36,12 +36,12 @@ package javax.servlet.http;
*/
public class HttpSessionBindingEvent extends HttpSessionEvent {
- /* The name to which the object is being bound or unbound */
+ private static final long serialVersionUID = 1L;
+ /* The name to which the object is being bound or unbound */
private final String name;
/* The object is being bound or unbound */
-
private final Object value;
/**
Modified: tomcat/trunk/java/javax/servlet/http/HttpSessionEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpSessionEvent.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpSessionEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpSessionEvent.java Wed Nov 24
22:08:38 2010
@@ -23,6 +23,8 @@ package javax.servlet.http;
* @since v 2.3
*/
public class HttpSessionEvent extends java.util.EventObject {
+ private static final long serialVersionUID = 1L;
+
/** Construct a session event from the given source. */
public HttpSessionEvent(HttpSession source) {
super(source);
Modified: tomcat/trunk/java/javax/servlet/jsp/JspException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspException.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/JspException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspException.java Wed Nov 24 22:08:38
2010
@@ -23,6 +23,9 @@ package javax.servlet.jsp;
*/
public class JspException extends Exception {
+ private static final long serialVersionUID = 1L;
+
+
/**
* Construct a JspException.
*/
Modified: tomcat/trunk/java/javax/servlet/jsp/JspTagException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspTagException.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/JspTagException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspTagException.java Wed Nov 24
22:08:38 2010
@@ -23,6 +23,8 @@ package javax.servlet.jsp;
*/
public class JspTagException extends JspException {
+ private static final long serialVersionUID = 1L;
+
/**
* Constructs a new JspTagException with the specified message. The message
* can be written to the server log and/or displayed for the user.
Modified: tomcat/trunk/java/javax/servlet/jsp/SkipPageException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/SkipPageException.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/SkipPageException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/SkipPageException.java Wed Nov 24
22:08:38 2010
@@ -34,6 +34,8 @@ package javax.servlet.jsp;
*/
public class SkipPageException extends JspException {
+ private static final long serialVersionUID = 1L;
+
/**
* Creates a SkipPageException with no message.
*/
Modified: tomcat/trunk/java/javax/servlet/jsp/el/ELException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ELException.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ELException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ELException.java Wed Nov 24 22:08:38
2010
@@ -27,6 +27,8 @@ package javax.servlet.jsp.el;
@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
public class ELException extends Exception {
+ private static final long serialVersionUID = 1L;
+
/**
* Creates an ELException with no detail message.
**/
Modified: tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java Wed Nov 24
22:08:38 2010
@@ -27,7 +27,9 @@ package javax.servlet.jsp.el;
@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
public class ELParseException extends ELException {
- //-------------------------------------
+ private static final long serialVersionUID = 1L;
+
+//-------------------------------------
/**
* Creates an ELParseException with no detail message.
*/
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java Wed Nov 24
22:08:38 2010
@@ -38,6 +38,8 @@ import javax.servlet.jsp.PageContext;
*/
public class TagSupport implements IterationTag, Serializable {
+ private static final long serialVersionUID = 1L;
+
/**
* Find the instance of a given class type that is closest to a given
* instance.
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java Wed Nov 24
22:08:38 2010
@@ -28,6 +28,8 @@ import org.apache.catalina.tribes.Member
*/
public class FileMessage extends ClusterMessageBase {
+ private static final long serialVersionUID = 1L;
+
private int messageNumber;
private byte[] data;
private int dataLength;
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/UndeployMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/UndeployMessage.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/UndeployMessage.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/UndeployMessage.java Wed
Nov 24 22:08:38 2010
@@ -22,6 +22,8 @@ import java.io.Serializable;
import org.apache.catalina.ha.ClusterMessage;
import org.apache.catalina.tribes.Member;
public class UndeployMessage implements ClusterMessage,Serializable {
+ private static final long serialVersionUID = 1L;
+
private Member address;
private long timestamp;
private String uniqueId;
Modified:
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java Wed
Nov 24 22:08:38 2010
@@ -51,10 +51,9 @@ import org.apache.tomcat.util.res.String
public class StatusManagerServlet
extends HttpServlet implements NotificationListener {
+ private static final long serialVersionUID = 1L;
// ----------------------------------------------------- Instance Variables
-
-
/**
* MBean server.
*/
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Wed Nov
24 22:08:38 2010
@@ -81,8 +81,9 @@ import org.apache.tomcat.util.res.String
* @version $Id$
*/
-public class StandardSession
- implements HttpSession, Session, Serializable {
+public class StandardSession implements HttpSession, Session, Serializable {
+
+ private static final long serialVersionUID = 1L;
protected static final boolean STRICT_SERVLET_COMPLIANCE;
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java Wed Nov 24
22:08:38 2010
@@ -45,6 +45,8 @@ import org.apache.catalina.Globals;
* @version $Id$
*/
public class SSIServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+
/** Debug level for this servlet. */
protected int debug = 0;
/** Should the output be buffered. */
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java
Wed Nov 24 22:08:38 2010
@@ -27,5 +27,7 @@ package org.apache.catalina.ssi;
* @version $Id$
*/
public class SSIStopProcessingException extends Exception {
+
+ private static final long serialVersionUID = 1L;
// No specific functionality for this class
}
\ No newline at end of file
Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java Wed Nov
24 22:08:38 2010
@@ -31,6 +31,7 @@ import java.util.ArrayList;
*/
public class ChannelException extends Exception {
+ private static final long serialVersionUID = 1L;
/**
* Empty list to avoid reinstatiating lists
*/
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/RemoteProcessException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/RemoteProcessException.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/RemoteProcessException.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/RemoteProcessException.java
Wed Nov 24 22:08:38 2010
@@ -28,6 +28,8 @@ package org.apache.catalina.tribes;
* @version 1.0
*/
public class RemoteProcessException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+
public RemoteProcessException() {
super();
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java Wed Nov 24
22:08:38 2010
@@ -29,6 +29,8 @@ import org.apache.catalina.tribes.util.A
* @version 1.0
*/
public final class UniqueId implements Serializable{
+ private static final long serialVersionUID = 1L;
+
protected byte[] id;
public UniqueId() {
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java Wed Nov 24
22:08:38 2010
@@ -36,6 +36,8 @@ import org.apache.catalina.tribes.util.U
*
*/
public class ChannelData implements ChannelMessage {
+ private static final long serialVersionUID = 1L;
+
public static final ChannelData[] EMPTY_DATA_ARRAY = new ChannelData[0];
public static volatile boolean USE_SECURE_RANDOM_FOR_UUID = false;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Nov 24 22:08:38 2010
@@ -54,6 +54,8 @@ import org.apache.juli.logging.LogFactor
* @version 1.0
*/
public abstract class AbstractReplicatedMap extends ConcurrentHashMap
implements RpcCallback, ChannelListener, MembershipListener, Heartbeat {
+ private static final long serialVersionUID = 1L;
+
private static final Log log =
LogFactory.getLog(AbstractReplicatedMap.class);
/**
@@ -1259,6 +1261,7 @@ public abstract class AbstractReplicated
//------------------------------------------------------------------------------
public static class MapMessage implements Serializable {
+ private static final long serialVersionUID = 1L;
public static final int MSG_BACKUP = 1;
public static final int MSG_RETRIEVE_BACKUP = 2;
public static final int MSG_PROXY = 3;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
Wed Nov 24 22:08:38 2010
@@ -64,6 +64,7 @@ import org.apache.juli.logging.LogFactor
* @version 1.0
*/
public class LazyReplicatedMap extends AbstractReplicatedMap {
+ private static final long serialVersionUID = 1L;
private static final Log log = LogFactory.getLog(LazyReplicatedMap.class);
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Wed
Nov 24 22:08:38 2010
@@ -48,9 +48,11 @@ import org.apache.catalina.tribes.Member
*/
public class ReplicatedMap extends AbstractReplicatedMap {
-//------------------------------------------------------------------------------
-// CONSTRUCTORS / DESTRUCTORS
-//------------------------------------------------------------------------------
+ private static final long serialVersionUID = 1L;
+
+
//--------------------------------------------------------------------------
+ // CONSTRUCTORS / DESTRUCTORS
+
//--------------------------------------------------------------------------
/**
* Creates a new map
* @param channel The channel to use for communication
Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java Wed
Nov 24 22:08:38 2010
@@ -43,6 +43,8 @@ public class ExecutorFactory {
// ---------------------------------------------- TaskQueue Inner Class
private static class TaskQueue extends LinkedBlockingQueue<Runnable> {
+ private static final long serialVersionUID = 1L;
+
ThreadPoolExecutor parent = null;
public TaskQueue() {
Modified: tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java Wed Nov 24
22:08:38 2010
@@ -38,10 +38,10 @@ import org.apache.tomcat.util.res.String
public final class ParameterMap<K,V> extends HashMap<K,V> {
-
- // ----------------------------------------------------------- Constructors
+ private static final long serialVersionUID = 1L;
+ // ----------------------------------------------------------- Constructors
/**
* Construct a new, empty map with the default initial capacity and
* load factor.
Modified: tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java Wed Nov 24
22:08:38 2010
@@ -38,10 +38,9 @@ import org.apache.tomcat.util.res.String
public final class ResourceSet<T> extends HashSet<T> {
+ private static final long serialVersionUID = 1L;
// ----------------------------------------------------------- Constructors
-
-
/**
* Construct a new, empty set with the default initial capacity and
* load factor.
Modified: tomcat/trunk/java/org/apache/jasper/JasperException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JasperException.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JasperException.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JasperException.java Wed Nov 24
22:08:38 2010
@@ -25,6 +25,8 @@ package org.apache.jasper;
*/
public class JasperException extends javax.servlet.ServletException {
+ private static final long serialVersionUID = 1L;
+
public JasperException(String reason) {
super(reason);
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java Wed Nov
24 22:08:38 2010
@@ -1445,7 +1445,9 @@ class JspDocumentParser
* validation is turned off.
*/
private static class EnableDTDValidationException
- extends SAXParseException {
+ extends SAXParseException {
+
+ private static final long serialVersionUID = 1L;
EnableDTDValidationException(String message, Locator loc) {
super(message, loc);
Modified: tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/HttpJspBase.java Wed Nov 24
22:08:38 2010
@@ -35,6 +35,8 @@ import org.apache.jasper.compiler.Locali
*/
public abstract class HttpJspBase extends HttpServlet implements HttpJspPage {
+ private static final long serialVersionUID = 1L;
+
protected HttpJspBase() {
}
Modified:
tomcat/trunk/java/org/apache/juli/logging/LogConfigurationException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/LogConfigurationException.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/logging/LogConfigurationException.java
(original)
+++ tomcat/trunk/java/org/apache/juli/logging/LogConfigurationException.java
Wed Nov 24 22:08:38 2010
@@ -30,6 +30,9 @@ package org.apache.juli.logging;
public class LogConfigurationException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+
+
/**
* Construct a new exception with <code>null</code> as its detail message.
*/
Modified: tomcat/trunk/java/org/apache/naming/EjbRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/EjbRef.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/EjbRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/EjbRef.java Wed Nov 24 22:08:38 2010
@@ -29,13 +29,12 @@ import javax.naming.StringRefAddr;
* @version $Id$
*/
-public class EjbRef
- extends Reference {
+public class EjbRef extends Reference {
+ private static final long serialVersionUID = 1L;
+
// -------------------------------------------------------------- Constants
-
-
/**
* Default factory for this reference.
*/
Modified: tomcat/trunk/java/org/apache/naming/HandlerRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/HandlerRef.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/HandlerRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/HandlerRef.java Wed Nov 24 22:08:38 2010
@@ -31,13 +31,12 @@ import javax.naming.StringRefAddr;
* @author Fabien Carrion
*/
-public class HandlerRef
- extends Reference {
+public class HandlerRef extends Reference {
+ private static final long serialVersionUID = 1L;
+
// -------------------------------------------------------------- Constants
-
-
/**
* Default factory for this reference.
*/
Modified: tomcat/trunk/java/org/apache/naming/JndiPermission.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/JndiPermission.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/JndiPermission.java (original)
+++ tomcat/trunk/java/org/apache/naming/JndiPermission.java Wed Nov 24 22:08:38
2010
@@ -38,6 +38,8 @@ import java.security.BasicPermission;
public final class JndiPermission extends BasicPermission {
+ private static final long serialVersionUID = 1L;
+
// ----------------------------------------------------------- Constructors
/**
Modified: tomcat/trunk/java/org/apache/naming/ResourceEnvRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ResourceEnvRef.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ResourceEnvRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/ResourceEnvRef.java Wed Nov 24 22:08:38
2010
@@ -28,13 +28,12 @@ import javax.naming.Reference;
* @version $Id$
*/
-public class ResourceEnvRef
- extends Reference {
+public class ResourceEnvRef extends Reference {
+ private static final long serialVersionUID = 1L;
// -------------------------------------------------------------- Constants
-
/**
* Default factory for this reference.
*/
Modified: tomcat/trunk/java/org/apache/naming/ResourceLinkRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ResourceLinkRef.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ResourceLinkRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/ResourceLinkRef.java Wed Nov 24
22:08:38 2010
@@ -29,13 +29,12 @@ import javax.naming.StringRefAddr;
* @version $Id$
*/
-public class ResourceLinkRef
- extends Reference {
+public class ResourceLinkRef extends Reference {
+ private static final long serialVersionUID = 1L;
// -------------------------------------------------------------- Constants
-
/**
* Default factory for this reference.
*/
Modified: tomcat/trunk/java/org/apache/naming/ServiceRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ServiceRef.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ServiceRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/ServiceRef.java Wed Nov 24 22:08:38 2010
@@ -32,13 +32,12 @@ import javax.naming.StringRefAddr;
* @author Fabien Carrion
*/
-public class ServiceRef
- extends Reference {
+public class ServiceRef extends Reference {
+ private static final long serialVersionUID = 1L;
// -------------------------------------------------------------- Constants
-
/**
* Default factory for this reference.
*/
Modified: tomcat/trunk/java/org/apache/naming/TransactionRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/TransactionRef.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/TransactionRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/TransactionRef.java Wed Nov 24 22:08:38
2010
@@ -28,13 +28,12 @@ import javax.naming.Reference;
* @version $Id$
*/
-public class TransactionRef
- extends Reference {
+public class TransactionRef extends Reference {
+ private static final long serialVersionUID = 1L;
// -------------------------------------------------------------- Constants
-
/**
* Default factory for this reference.
*/
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Wed Nov 24
22:08:38 2010
@@ -33,6 +33,8 @@ import java.io.Serializable;
*/
public final class CharChunk implements Cloneable, Serializable, CharSequence {
+ private static final long serialVersionUID = 1L;
+
// Input interface, used when the buffer is emptied.
public static interface CharInputChannel {
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java Wed Nov 24
22:08:38 2010
@@ -34,6 +34,8 @@ import java.util.Locale;
* @author Costin Manolache
*/
public final class MessageBytes implements Cloneable, Serializable {
+ private static final long serialVersionUID = 1L;
+
// primary type ( whatever is set as original value )
private int type = T_NULL;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
Wed Nov 24 22:08:38 2010
@@ -38,10 +38,10 @@ import javax.management.NotificationFilt
public class BaseAttributeFilter implements NotificationFilter {
+ private static final long serialVersionUID = 1L;
// ----------------------------------------------------------- Constructors
-
/**
* Construct a new filter that accepts only the specified attribute
* name.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java
Wed Nov 24 22:08:38 2010
@@ -40,6 +40,7 @@ import javax.management.NotificationFilt
*/
public class FixedNotificationFilter implements NotificationFilter {
+ private static final long serialVersionUID = 1L;
/**
* The set of attribute names that are accepted by this filter. If this
* list is empty, all attribute names are accepted.
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java Wed Nov
24 22:08:38 2010
@@ -45,8 +45,10 @@ import javax.management.ServiceNotFoundE
* @version $Id$
*/
-public class ManagedBean implements java.io.Serializable
-{
+public class ManagedBean implements java.io.Serializable {
+
+ private static final long serialVersionUID = 1L;
+
private static final String BASE_MBEAN =
"org.apache.tomcat.util.modeler.BaseModelMBean";
// ----------------------------------------------------- Instance Variables
static final Object[] NO_ARGS_PARAM = new Object[0];
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/URL.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/URL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/URL.java Wed Nov 24 22:08:38
2010
@@ -47,10 +47,11 @@ import java.util.Locale;
public final class URL implements Serializable {
+ private static final long serialVersionUID = 1L;
+
// ----------------------------------------------------------- Constructors
-
/**
* Create a URL object from the specified String representation.
*
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java Wed Nov 24
22:08:38 2010
@@ -204,8 +204,11 @@ public class MapDemo implements ChannelL
}
}
- public static class SimpleTableDemo
- extends JPanel implements ActionListener{
+ public static class SimpleTableDemo extends JPanel
+ implements ActionListener {
+
+ private static final long serialVersionUID = 1L;
+
private static int WIDTH = 550;
private LazyReplicatedMap map;
@@ -213,6 +216,7 @@ public class MapDemo implements ChannelL
AbstractTableModel dataModel = new AbstractTableModel() {
+ private static final long serialVersionUID = 1L;
String[] columnNames = {
"Rownum",
"Key",
@@ -518,6 +522,8 @@ public class MapDemo implements ChannelL
static class ColorRenderer extends DefaultTableCellRenderer {
+ private static final long serialVersionUID = 1L;
+
public ColorRenderer() {
super();
}
Modified: tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java?rev=1038846&r1=1038845&r2=1038846&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/jsp/applet/Clock2.java Wed Nov 24
22:08:38 2010
@@ -31,6 +31,7 @@ import java.util.Locale;
*/
public class Clock2 extends Applet implements Runnable {
+ private static final long serialVersionUID = 1L;
Thread timer; // The thread that displays clock
int lastxs, lastys, lastxm,
lastym, lastxh, lastyh; // Dimensions used to draw hands
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
