Added generated serial version identifiers. (cherry picking from commit abbe243d4af0636541defcc75f74400dffefc00a)

This commit is contained in:
Daniel Ruthardt 2010-12-07 21:27:55 +01:00 committed by Tobi Schäfer
parent 1acd176aa5
commit 7f3bb3a85b
46 changed files with 112 additions and 0 deletions

View file

@ -20,6 +20,8 @@ package helma.extensions;
* *
*/ */
public class ConfigurationException extends RuntimeException { public class ConfigurationException extends RuntimeException {
private static final long serialVersionUID = 6428439427909728917L;
/** /**
* Creates a new ConfigurationException object. * Creates a new ConfigurationException object.
* *

View file

@ -24,4 +24,6 @@ package helma.framework;
*/ */
public class AbortException extends Error { public class AbortException extends Error {
private static final long serialVersionUID = -7536693051844908815L;
} }

View file

@ -22,6 +22,8 @@ package helma.framework;
* application * application
*/ */
public class ApplicationStoppedException extends RuntimeException { public class ApplicationStoppedException extends RuntimeException {
private static final long serialVersionUID = 7125229844095452333L;
/** /**
* Creates a new ApplicationStoppedException object. * Creates a new ApplicationStoppedException object.
*/ */

View file

@ -24,6 +24,8 @@ import javax.servlet.http.Cookie;
* of an HTTP cookie. * of an HTTP cookie.
*/ */
public final class CookieTrans implements Serializable { public final class CookieTrans implements Serializable {
private static final long serialVersionUID = 1811202114296536258L;
String name; String name;
String value; String value;
String path; String path;

View file

@ -22,6 +22,8 @@ package helma.framework;
* wrong in evaluation of requests. * wrong in evaluation of requests.
*/ */
public class FrameworkException extends RuntimeException { public class FrameworkException extends RuntimeException {
private static final long serialVersionUID = -8477797850472128617L;
/** /**
* Creates a new FrameworkException object. * Creates a new FrameworkException object.
* *

View file

@ -22,6 +22,8 @@ package helma.framework;
* wrong in evaluation of requests. * wrong in evaluation of requests.
*/ */
public class NotFoundException extends RuntimeException { public class NotFoundException extends RuntimeException {
private static final long serialVersionUID = -715022974097617658L;
/** /**
* Creates a new NotFoundException object. * Creates a new NotFoundException object.
* *

View file

@ -24,6 +24,8 @@ package helma.framework;
* java.lang.ThreadDeath). * java.lang.ThreadDeath).
*/ */
public class RedirectException extends Error { public class RedirectException extends Error {
private static final long serialVersionUID = 2362170037476457592L;
String url; String url;
/** /**

View file

@ -24,6 +24,8 @@ import java.util.Map;
* *
*/ */
public class RequestBean implements Serializable { public class RequestBean implements Serializable {
private static final long serialVersionUID = -6826881712426326687L;
RequestTrans req; RequestTrans req;
/** /**

View file

@ -634,6 +634,8 @@ public class RequestTrans implements Serializable {
class ParameterMap extends SystemMap { class ParameterMap extends SystemMap {
private static final long serialVersionUID = 7632860503639617076L;
public ParameterMap() { public ParameterMap() {
super(); super();
} }
@ -710,6 +712,8 @@ public class RequestTrans implements Serializable {
class DataComboMap extends SystemMap { class DataComboMap extends SystemMap {
private static final long serialVersionUID = 5737810055554406299L;
public Object get(Object key) { public Object get(Object key) {
Object value = super.get(key); Object value = super.get(key);
if (value != null) if (value != null)
@ -745,6 +749,8 @@ public class RequestTrans implements Serializable {
} }
class ParamComboMap extends SystemMap { class ParamComboMap extends SystemMap {
private static final long serialVersionUID = -9177176570950359431L;
public Object get(Object key) { public Object get(Object key) {
Object value; Object value;
if (postParams != null && (value = postParams.get(key)) != null) if (postParams != null && (value = postParams.get(key)) != null)

View file

@ -30,6 +30,8 @@ import java.util.Map;
* *
*/ */
public class ResponseBean implements Serializable { public class ResponseBean implements Serializable {
private static final long serialVersionUID = -6807623667477109800L;
ResponseTrans res; ResponseTrans res;
/** /**

View file

@ -22,6 +22,8 @@ package helma.framework;
* not be serviced within the timeout period specified for an application. * not be serviced within the timeout period specified for an application.
*/ */
public class TimeoutException extends RuntimeException { public class TimeoutException extends RuntimeException {
private static final long serialVersionUID = 3853135482278393735L;
/** /**
* Creates a new TimeoutException object. * Creates a new TimeoutException object.
*/ */

View file

@ -20,6 +20,8 @@ import java.io.Serializable;
public class UploadStatus implements Serializable { public class UploadStatus implements Serializable {
private static final long serialVersionUID = 8335579045959177198L;
long current = 0; long current = 0;
long total = 0; long total = 0;
int itemsRead = 0; int itemsRead = 0;

View file

@ -38,6 +38,8 @@ import org.apache.commons.logging.LogFactory;
* application specific functionality. * application specific functionality.
*/ */
public class ApplicationBean implements Serializable { public class ApplicationBean implements Serializable {
private static final long serialVersionUID = -5053315391709405106L;
transient Application app; transient Application app;
WrappedMap properties = null; WrappedMap properties = null;

View file

@ -492,6 +492,8 @@ public final class Prototype {
* A Map that dynamically expands to all skins in this prototype. * A Map that dynamically expands to all skins in this prototype.
*/ */
class SkinMap extends HashMap { class SkinMap extends HashMap {
private static final long serialVersionUID = -8855785541204100909L;
volatile long lastSkinmapLoad = -1; volatile long lastSkinmapLoad = -1;
Object[] skinpath; Object[] skinpath;

View file

@ -27,6 +27,8 @@ import java.util.Date;
* exposes it to the scripting framework. * exposes it to the scripting framework.
*/ */
public class SessionBean implements Serializable { public class SessionBean implements Serializable {
private static final long serialVersionUID = 7500231949937123265L;
// the wrapped session object // the wrapped session object
Session session; Session session;

View file

@ -1190,6 +1190,8 @@ public final class Skin {
* Exception type for unhandled, forbidden or failed macros * Exception type for unhandled, forbidden or failed macros
*/ */
class MacroException extends Exception { class MacroException extends Exception {
private static final long serialVersionUID = 396025641010781784L;
MacroException(String message) { MacroException(String message) {
super(message); super(message);
} }

View file

@ -22,6 +22,8 @@ package helma.objectmodel;
* will normally catch this and try again after a period of time. * will normally catch this and try again after a period of time.
*/ */
public class ConcurrencyException extends Error { public class ConcurrencyException extends Error {
private static final long serialVersionUID = 4031542073544406467L;
/** /**
* Creates a new ConcurrencyException object. * Creates a new ConcurrencyException object.
* *

View file

@ -21,6 +21,8 @@ package helma.objectmodel;
* Thrown on any kind of Database-Error * Thrown on any kind of Database-Error
*/ */
public class DatabaseException extends RuntimeException { public class DatabaseException extends RuntimeException {
private static final long serialVersionUID = -5715728591015640819L;
/** /**
* Creates a new DatabaseException object. * Creates a new DatabaseException object.
* *

View file

@ -22,6 +22,8 @@ import java.io.*;
* This is passed to NodeListeners when a node is modified. * This is passed to NodeListeners when a node is modified.
*/ */
public class NodeEvent implements Serializable { public class NodeEvent implements Serializable {
private static final long serialVersionUID = 4322426080131107600L;
public static final int CONTENT_CHANGED = 0; public static final int CONTENT_CHANGED = 0;
public static final int PROPERTIES_CHANGED = 1; public static final int PROPERTIES_CHANGED = 1;
public static final int NODE_REMOVED = 2; public static final int NODE_REMOVED = 2;

View file

@ -22,6 +22,8 @@ package helma.objectmodel;
* it was expected. * it was expected.
*/ */
public class ObjectNotFoundException extends Exception { public class ObjectNotFoundException extends Exception {
private static final long serialVersionUID = -5368941052804232094L;
/** /**
* Creates a new ObjectNotFoundException object. * Creates a new ObjectNotFoundException object.
* *

View file

@ -36,6 +36,8 @@ import java.util.Vector;
* object, class helma.objectmodel.db.Node has to be used. * object, class helma.objectmodel.db.Node has to be used.
*/ */
public class TransientNode implements INode, Serializable { public class TransientNode implements INode, Serializable {
private static final long serialVersionUID = -4599844796152072979L;
private static long idgen = 0; private static long idgen = 0;
protected Hashtable propMap; protected Hashtable propMap;
protected Hashtable nodeMap; protected Hashtable nodeMap;

View file

@ -24,6 +24,8 @@ import java.util.Date;
* A property implementation for Nodes stored inside a database. * A property implementation for Nodes stored inside a database.
*/ */
public final class TransientProperty implements IProperty, Serializable { public final class TransientProperty implements IProperty, Serializable {
private static final long serialVersionUID = 3128899239601365229L;
protected String propname; protected String propname;
protected TransientNode node; protected TransientNode node;
public String svalue; public String svalue;

View file

@ -15,6 +15,8 @@ import java.util.*;
public class SegmentedSubnodeList extends SubnodeList { public class SegmentedSubnodeList extends SubnodeList {
private static final long serialVersionUID = -4947752577517584610L;
transient Segment[] segments = null; transient Segment[] segments = null;
static int SEGLENGTH = 1000; static int SEGLENGTH = 1000;

View file

@ -25,6 +25,8 @@ import java.io.Serializable;
*/ */
public class SubnodeList implements Serializable { public class SubnodeList implements Serializable {
private static final long serialVersionUID = 711208015232333566L;
protected Node node; protected Node node;
protected List list; protected List list;

View file

@ -27,6 +27,8 @@ import java.io.*;
*/ */
public class ScriptingException extends Exception { public class ScriptingException extends Exception {
private static final long serialVersionUID = -7191341724784015678L;
String scriptStack = null; String scriptStack = null;
/** /**

View file

@ -37,6 +37,8 @@ import java.io.*;
* Helma global object defines a number of custom global functions. * Helma global object defines a number of custom global functions.
*/ */
public class GlobalObject extends ImporterTopLevel implements PropertyRecorder { public class GlobalObject extends ImporterTopLevel implements PropertyRecorder {
private static final long serialVersionUID = -5058912338247265290L;
Application app; Application app;
RhinoCore core; RhinoCore core;
boolean isThreadScope = false; boolean isThreadScope = false;
@ -387,6 +389,8 @@ public class GlobalObject extends ImporterTopLevel implements PropertyRecorder {
return; return;
} }
ScriptableObject scope = new NativeObject() { ScriptableObject scope = new NativeObject() {
private static final long serialVersionUID = 9205558066617631601L;
public String getClassName() { public String getClassName() {
return name; return name;
} }

View file

@ -33,6 +33,8 @@ import java.io.IOException;
*/ */
public class HopObject extends ScriptableObject implements Wrapper, PropertyRecorder { public class HopObject extends ScriptableObject implements Wrapper, PropertyRecorder {
private static final long serialVersionUID = 1329862822101428427L;
String className; String className;
final NodeProxy proxy; final NodeProxy proxy;
final RhinoCore core; final RhinoCore core;

View file

@ -29,6 +29,8 @@ import org.mozilla.javascript.*;
public class HopObjectCtor extends FunctionObject { public class HopObjectCtor extends FunctionObject {
private static final long serialVersionUID = 3787907922712636030L;
// init flag to trigger prototype compilation on // init flag to trigger prototype compilation on
// static constructor property access // static constructor property access
boolean initialized; boolean initialized;
@ -144,6 +146,8 @@ public class HopObjectCtor extends FunctionObject {
class GetById extends BaseFunction { class GetById extends BaseFunction {
private static final long serialVersionUID = -8041352998956882647L;
public GetById(Scriptable scope) { public GetById(Scriptable scope) {
ScriptRuntime.setFunctionProtoAndParent(this, scope); ScriptRuntime.setFunctionProtoAndParent(this, scope);
} }
@ -187,6 +191,8 @@ public class HopObjectCtor extends FunctionObject {
class HopCollection extends BaseFunction { class HopCollection extends BaseFunction {
private static final long serialVersionUID = -4046933261468527204L;
public HopCollection(Scriptable scope) { public HopCollection(Scriptable scope) {
ScriptRuntime.setFunctionProtoAndParent(this, scope); ScriptRuntime.setFunctionProtoAndParent(this, scope);
} }

View file

@ -32,6 +32,8 @@ import java.io.IOException;
*/ */
public class JavaObject extends NativeJavaObject { public class JavaObject extends NativeJavaObject {
private static final long serialVersionUID = 6348440950512377606L;
RhinoCore core; RhinoCore core;
String protoName; String protoName;
NativeJavaObject unscriptedJavaObj; NativeJavaObject unscriptedJavaObj;

View file

@ -30,6 +30,8 @@ import java.util.Map;
* and helma.util.WrappedMap. * and helma.util.WrappedMap.
*/ */
public class MapWrapper extends ScriptableObject implements Wrapper { public class MapWrapper extends ScriptableObject implements Wrapper {
private static final long serialVersionUID = -8802538795495729410L;
Map map; Map map;
RhinoCore core; RhinoCore core;

View file

@ -29,6 +29,8 @@ import java.io.UnsupportedEncodingException;
*/ */
public class PathWrapper extends ScriptableObject { public class PathWrapper extends ScriptableObject {
private static final long serialVersionUID = 514381479839863014L;
RequestPath path; RequestPath path;
RhinoCore core; RhinoCore core;

View file

@ -1177,6 +1177,8 @@ public final class RhinoCore implements ScopeProvider {
} }
class StringTrim extends BaseFunction { class StringTrim extends BaseFunction {
private static final long serialVersionUID = -1515630068911501925L;
public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) { public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) {
String str = thisObj.toString(); String str = thisObj.toString();
return str.trim(); return str.trim();
@ -1184,6 +1186,8 @@ public final class RhinoCore implements ScopeProvider {
} }
class DateFormat extends BaseFunction { class DateFormat extends BaseFunction {
private static final long serialVersionUID = 4694440247686532087L;
public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) { public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) {
Date date = new Date((long) ScriptRuntime.toNumber(thisObj)); Date date = new Date((long) ScriptRuntime.toNumber(thisObj));
SimpleDateFormat df; SimpleDateFormat df;
@ -1208,6 +1212,8 @@ public final class RhinoCore implements ScopeProvider {
} }
class NumberFormat extends BaseFunction { class NumberFormat extends BaseFunction {
private static final long serialVersionUID = -6999409297243210875L;
public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) { public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] args) {
DecimalFormat df; DecimalFormat df;
if (args.length > 0 && args[0] != Undefined.instance) { if (args.length > 0 && args[0] != Undefined.instance) {

View file

@ -35,6 +35,8 @@ public interface SerializationProxy extends Serializable {
* Serialization proxy for app, req, res, path objects. * Serialization proxy for app, req, res, path objects.
*/ */
class ScriptBeanProxy implements SerializationProxy { class ScriptBeanProxy implements SerializationProxy {
private static final long serialVersionUID = -1002489933060844917L;
String name; String name;
ScriptBeanProxy(String name) { ScriptBeanProxy(String name) {
@ -56,6 +58,8 @@ class ScriptBeanProxy implements SerializationProxy {
* Serialization proxy for global scope * Serialization proxy for global scope
*/ */
class GlobalProxy implements SerializationProxy { class GlobalProxy implements SerializationProxy {
private static final long serialVersionUID = -3200125667487274257L;
boolean shared; boolean shared;
GlobalProxy(GlobalObject scope) { GlobalProxy(GlobalObject scope) {
@ -76,6 +80,8 @@ class GlobalProxy implements SerializationProxy {
* Serialization proxy for various flavors of HopObjects/Nodes * Serialization proxy for various flavors of HopObjects/Nodes
*/ */
class HopObjectProxy implements SerializationProxy { class HopObjectProxy implements SerializationProxy {
private static final long serialVersionUID = -4808579296683836009L;
Object ref; Object ref;
boolean wrapped = false; boolean wrapped = false;

View file

@ -123,6 +123,8 @@ public class HelmaDebugger extends Dim implements TreeSelectionListener {
class DebuggerTreeNode extends DefaultMutableTreeNode { class DebuggerTreeNode extends DefaultMutableTreeNode {
private static final long serialVersionUID = -5881442554351749706L;
public DebuggerTreeNode(Object obj) { public DebuggerTreeNode(Object obj) {
super(obj); super(obj);
} }
@ -156,6 +158,8 @@ public class HelmaDebugger extends Dim implements TreeSelectionListener {
class DebugGui extends SwingGui { class DebugGui extends SwingGui {
private static final long serialVersionUID = 8930558796272502640L;
String currentSourceUrl; String currentSourceUrl;
public DebugGui(Dim dim, String title) { public DebugGui(Dim dim, String title) {

View file

@ -40,6 +40,8 @@ import java.lang.reflect.Method;
* An EcmaScript FileIO 'File' object * An EcmaScript FileIO 'File' object
*/ */
public class FileObject extends ScriptableObject { public class FileObject extends ScriptableObject {
private static final long serialVersionUID = -9098307162306984764L;
File file = null; File file = null;
Object readerWriter = null; Object readerWriter = null;
boolean atEOF = false; boolean atEOF = false;

View file

@ -35,6 +35,8 @@ import java.lang.reflect.Method;
* This uses the NetComponent classes from savarese.org (ex oroinc.com). * This uses the NetComponent classes from savarese.org (ex oroinc.com).
*/ */
public class FtpObject extends ScriptableObject { public class FtpObject extends ScriptableObject {
private static final long serialVersionUID = 3470670009973887555L;
private FTPClient ftpclient; private FTPClient ftpclient;
private String server; private String server;
private Exception lastError = null; private Exception lastError = null;

View file

@ -150,6 +150,8 @@ public class ImageObject {
} }
static class GetInfo extends BaseFunction { static class GetInfo extends BaseFunction {
private static final long serialVersionUID = 109556119036857349L;
public Object call(Context cx, Scriptable scope, public Object call(Context cx, Scriptable scope,
Scriptable thisObj, Object[] args) { Scriptable thisObj, Object[] args) {
if (args.length != 1) { if (args.length != 1) {

View file

@ -41,6 +41,8 @@ import javax.mail.internet.MimeUtility;
*/ */
public class MailObject extends ScriptableObject implements Serializable { public class MailObject extends ScriptableObject implements Serializable {
private static final long serialVersionUID = -4834981850233741039L;
public static final int OK = 0; public static final int OK = 0;
public static final int SUBJECT = 10; public static final int SUBJECT = 10;
public static final int TEXT = 11; public static final int TEXT = 11;

View file

@ -43,6 +43,8 @@ import java.util.Vector;
*/ */
public class XmlRpcObject extends BaseFunction { public class XmlRpcObject extends BaseFunction {
private static final long serialVersionUID = 1479373761583135438L;
String url = null; String url = null;
String method = null; String method = null;

View file

@ -41,6 +41,8 @@ import org.apache.commons.fileupload.servlet.ServletRequestContext;
*/ */
public abstract class AbstractServletClient extends HttpServlet { public abstract class AbstractServletClient extends HttpServlet {
private static final long serialVersionUID = -6096445259839663680L;
// limit to HTTP uploads per file in kB // limit to HTTP uploads per file in kB
int uploadLimit = 1024; int uploadLimit = 1024;

View file

@ -26,6 +26,8 @@ import javax.servlet.*;
* web server * web server
*/ */
public final class EmbeddedServletClient extends AbstractServletClient { public final class EmbeddedServletClient extends AbstractServletClient {
private static final long serialVersionUID = -1716809853688477356L;
private Application app = null; private Application app = null;
private String appName; private String appName;

View file

@ -39,6 +39,8 @@ import java.util.*;
* </ul> * </ul>
*/ */
public final class StandaloneServletClient extends AbstractServletClient { public final class StandaloneServletClient extends AbstractServletClient {
private static final long serialVersionUID = 6515895361950250466L;
private Application app = null; private Application app = null;
private String appName; private String appName;
private String appDir; private String appDir;

View file

@ -26,6 +26,8 @@ import java.util.StringTokenizer;
* This represents a MIME part of a HTTP file upload * This represents a MIME part of a HTTP file upload
*/ */
public class MimePart implements Serializable { public class MimePart implements Serializable {
private static final long serialVersionUID = 7800159441938112415L;
private final String name; private final String name;
private int contentLength; private int contentLength;
private String contentType; private String contentType;

View file

@ -28,6 +28,8 @@ import helma.framework.repository.Repository;
*/ */
public class ResourceProperties extends Properties { public class ResourceProperties extends Properties {
private static final long serialVersionUID = -2258056784572269727L;
// Delay between checks // Delay between checks
private final long CACHE_TIME = 1500L; private final long CACHE_TIME = 1500L;

View file

@ -27,6 +27,8 @@ import java.util.*;
public class SystemMap extends HashMap { public class SystemMap extends HashMap {
private static final long serialVersionUID = 2926260006469380544L;
/** /**
* Construct an empty SystemMap. * Construct an empty SystemMap.
*/ */

View file

@ -25,6 +25,8 @@ import java.util.*;
*/ */
public final class SystemProperties extends Properties { public final class SystemProperties extends Properties {
private static final long serialVersionUID = -6994562125444162183L;
final static long cacheTime = 1500L; final static long cacheTime = 1500L;
private SystemProperties defaultProps; // the default/fallback properties. private SystemProperties defaultProps; // the default/fallback properties.
private File file; // the underlying properties file from which we read. private File file; // the underlying properties file from which we read.