Author: kkolinko
Date: Fri Sep 12 22:49:16 2014
New Revision: 1624667
URL: http://svn.apache.org/r1624667
Log:
Remove serialization support and serialVersionUID fields from BCEL classes.
It is merge of r1624563 from tomcat/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1624563
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
Merged /tomcat/trunk/java/org/apache/tomcat/util/bcel:r1624563
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
Fri Sep 12 22:49:16 2014
@@ -23,12 +23,10 @@ package org.apache.tomcat.util.bcel.clas
*
* @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
*/
-public abstract class AccessFlags implements java.io.Serializable {
+public abstract class AccessFlags {
- private static final long serialVersionUID = 2548932939969293935L;
protected int access_flags;
-
public AccessFlags() {
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
Fri Sep 12 22:49:16 2014
@@ -26,9 +26,7 @@ import java.io.IOException;
* @author <A HREF="mailto:dbros...@qis.net";>D. Brosius</A>
* @since 6.0
*/
-public class AnnotationDefault extends Attribute
-{
- private static final long serialVersionUID = 6715933396664171543L;
+public class AnnotationDefault extends Attribute {
/**
* @param name_index
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
Fri Sep 12 22:49:16 2014
@@ -28,8 +28,6 @@ import java.io.IOException;
*/
public abstract class Annotations extends Attribute {
- private static final long serialVersionUID = 1L;
-
private final AnnotationEntry[] annotation_table;
/**
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
Fri Sep 12 22:49:16 2014
@@ -19,7 +19,6 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInputStream;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.tomcat.util.bcel.Constants;
@@ -33,9 +32,7 @@ import org.apache.tomcat.util.bcel.Const
*
* @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
*/
-public abstract class Attribute implements Serializable
-{
- private static final long serialVersionUID = 1514136303496688899L;
+public abstract class Attribute {
protected int name_index; // Points to attribute name in constant pool
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
Fri Sep 12 22:49:16 2014
@@ -19,7 +19,6 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInputStream;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.tomcat.util.bcel.Constants;
@@ -30,9 +29,7 @@ import org.apache.tomcat.util.bcel.Const
*
* @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
*/
-public abstract class Constant implements Serializable {
-
- private static final long serialVersionUID = 2827409182154809454L;
+public abstract class Constant {
/* In fact this tag is redundant since we can distinguish different
* `Constant' objects by their type, i.e., via `instanceof'. In some
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantClass.java
Fri Sep 12 22:49:16 2014
@@ -32,7 +32,6 @@ import org.apache.tomcat.util.bcel.Const
*/
public final class ConstantClass extends Constant {
- private static final long serialVersionUID = -6603658849582876642L;
private int name_index; // Identical to ConstantString except for the name
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantDouble.java
Fri Sep 12 22:49:16 2014
@@ -32,7 +32,6 @@ import org.apache.tomcat.util.bcel.Const
*/
public final class ConstantDouble extends Constant {
- private static final long serialVersionUID = 3450743772468544760L;
private double bytes;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantFloat.java
Fri Sep 12 22:49:16 2014
@@ -32,7 +32,6 @@ import org.apache.tomcat.util.bcel.Const
*/
public final class ConstantFloat extends Constant {
- private static final long serialVersionUID = 8301269629885378651L;
private float bytes;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInteger.java
Fri Sep 12 22:49:16 2014
@@ -32,7 +32,6 @@ import org.apache.tomcat.util.bcel.Const
*/
public final class ConstantInteger extends Constant {
- private static final long serialVersionUID = -6415476571232528966L;
private int bytes;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantLong.java
Fri Sep 12 22:49:16 2014
@@ -32,7 +32,6 @@ import org.apache.tomcat.util.bcel.Const
*/
public final class ConstantLong extends Constant {
- private static final long serialVersionUID = -1893131676489003562L;
private long bytes;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
Fri Sep 12 22:49:16 2014
@@ -19,7 +19,6 @@ package org.apache.tomcat.util.bcel.clas
import java.io.DataInputStream;
import java.io.IOException;
-import java.io.Serializable;
import org.apache.tomcat.util.bcel.Constants;
@@ -34,9 +33,8 @@ import org.apache.tomcat.util.bcel.Const
* @see Constant
* @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
*/
-public class ConstantPool implements Serializable {
+public class ConstantPool {
- private static final long serialVersionUID = -6765503791185687014L;
private int constant_pool_count;
private Constant[] constant_pool;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
Fri Sep 12 22:49:16 2014
@@ -31,7 +31,6 @@ import org.apache.tomcat.util.bcel.Const
*/
public final class ConstantUtf8 extends Constant {
- private static final long serialVersionUID = 8119001312020421976L;
private final String bytes;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
Fri Sep 12 22:49:16 2014
@@ -34,7 +34,6 @@ import org.apache.tomcat.util.bcel.Const
*/
public class JavaClass extends AccessFlags {
- private static final long serialVersionUID = 7029227708237523236L;
private String class_name;
private String superclass_name;
private String[] interface_names;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
Fri Sep 12 22:49:16 2014
@@ -28,7 +28,6 @@ import java.io.IOException;
*/
public abstract class ParameterAnnotations extends Attribute {
- private static final long serialVersionUID = -8831779739803248091L;
private int num_parameters;
private ParameterAnnotationEntry[] parameter_annotation_table; // Table of
parameter annotations
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
Fri Sep 12 22:49:16 2014
@@ -27,9 +27,7 @@ import java.io.IOException;
* @author <A HREF="mailto:dbros...@qis.net";>D. Brosius</A>
* @since 6.0
*/
-public class RuntimeVisibleAnnotations extends Annotations
-{
- private static final long serialVersionUID = 2912284875689024413L;
+public class RuntimeVisibleAnnotations extends Annotations {
/**
* @param name_index
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java?rev=1624667&r1=1624666&r2=1624667&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
Fri Sep 12 22:49:16 2014
@@ -29,9 +29,6 @@ import java.io.IOException;
*/
public class RuntimeVisibleParameterAnnotations extends ParameterAnnotations {
- private static final long serialVersionUID = 7633756460868573992L;
-
-
/**
* @param name_index Index pointing to the name <em>Code</em>
* @param length Content length in bytes
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
