tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1593506 - in /tomcat/trunk: java/org/apache/tomcat/util/bcel/ java/org/apache/tomcat/util/bcel/classfile/ java/org/apache/tomcat/util/bcel/util/ webapps/docs/
Date Fri, 09 May 2014 10:16:52 GMT
Author: markt
Date: Fri May  9 10:16:51 2014
New Revision: 1593506

URL: http://svn.apache.org/r1593506
Log:
Update package renamed Apache Commons BCEL to r1593495 to pick up some additional changes
for Java 7 support and some code clean up.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/bcel/   (props changed)
    tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/package.html
    tomcat/trunk/java/org/apache/tomcat/util/bcel/util/package.html
    tomcat/trunk/webapps/docs/changelog.xml

Propchange: tomcat/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
  Merged /commons/proper/bcel/trunk/src/main/java/org/apache/bcel:r1547758-1593495

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java Fri May  9 10:16:51 2014
@@ -108,15 +108,17 @@ public interface Constants {
   public static final byte ATTR_SIGNATURE                               = 10;
   public static final byte ATTR_STACK_MAP                               = 11;
   public static final byte ATTR_RUNTIME_VISIBLE_ANNOTATIONS             = 12;
-  public static final byte ATTR_RUNTIMEIN_VISIBLE_ANNOTATIONS           = 13;
+  public static final byte ATTR_RUNTIME_INVISIBLE_ANNOTATIONS           = 13;
   public static final byte ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS   = 14;
-  public static final byte ATTR_RUNTIMEIN_VISIBLE_PARAMETER_ANNOTATIONS = 15;
+  public static final byte ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS = 15;
   public static final byte ATTR_ANNOTATION_DEFAULT                      = 16;
   public static final byte ATTR_LOCAL_VARIABLE_TYPE_TABLE               = 17;
   public static final byte ATTR_ENCLOSING_METHOD                        = 18;
   public static final byte ATTR_STACK_MAP_TABLE                         = 19;
+  public static final byte ATTR_BOOTSTRAP_METHODS                       = 20;
+  public static final byte ATTR_METHOD_PARAMETERS                       = 21;
 
-  public static final short KNOWN_ATTRIBUTES = 20;
+  public static final short KNOWN_ATTRIBUTES = 22;
 
   // TOFO: FIXXXXX
   public static final String[] ATTRIBUTE_NAMES = {
@@ -126,7 +128,8 @@ public interface Constants {
     "PMGClass", "Signature", "StackMap",
     "RuntimeVisibleAnnotations", "RuntimeInvisibleAnnotations",
     "RuntimeVisibleParameterAnnotations", "RuntimeInvisibleParameterAnnotations",
-    "AnnotationDefault", "LocalVariableTypeTable", "EnclosingMethod", "StackMapTable"
+    "AnnotationDefault", "LocalVariableTypeTable", "EnclosingMethod", "StackMapTable",
+    "BootstrapMethods", "MethodParameters"
   };
 
   /** Constants used in the StackMap attribute.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java Fri May
 9 10:16:51 2014
@@ -24,7 +24,7 @@ import java.io.IOException;
  * represents the default value of a annotation for a method info
  *
  * @author <A HREF="mailto:dbrosius@qis.net">D. Brosius</A>
- * @since 5.3
+ * @since 6.0
  */
 public class AnnotationDefault extends Attribute
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java Fri
May  9 10:16:51 2014
@@ -26,9 +26,10 @@ public class AnnotationElementValue exte
             ConstantPool cpool)
     {
         super(type, cpool);
-        if (type != ANNOTATION)
+        if (type != ANNOTATION) {
             throw new RuntimeException(
                     "Only element values of type annotation can be built with this ctor -
type specified: " + type);
+        }
         this.annotationEntry = annotationEntry;
     }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java Fri May 
9 10:16:51 2014
@@ -28,7 +28,7 @@ import org.apache.tomcat.util.bcel.Const
  * represents one annotation in the annotation table
  *
  * @author  <A HREF="mailto:dbrosius@mebigfatguy.com">D. Brosius</A>
- * @since 5.3
+ * @since 6.0
  */
 public class AnnotationEntry implements Constants {
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java Fri May  9 10:16:51
2014
@@ -24,7 +24,7 @@ import java.io.IOException;
  * base class for annotations
  *
  * @author  <A HREF="mailto:dbrosius@qis.net">D. Brosius</A>
- * @since 5.3
+ * @since 6.0
  */
 public abstract class Annotations extends Attribute {
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java Fri May
 9 10:16:51 2014
@@ -25,9 +25,10 @@ public class ArrayElementValue extends E
     public ArrayElementValue(int type, ElementValue[] datums, ConstantPool cpool)
     {
         super(type, cpool);
-        if (type != ARRAY)
+        if (type != ARRAY) {
             throw new RuntimeException(
                     "Only element values of type array can be built with this ctor - type
specified: " + type);
+        }
         this.evalues = datums;
     }
 
@@ -39,8 +40,9 @@ public class ArrayElementValue extends E
         for (int i = 0; i < evalues.length; i++)
         {
             sb.append(evalues[i].stringifyValue());
-            if ((i + 1) < evalues.length)
+            if ((i + 1) < evalues.length) {
                 sb.append(",");
+            }
         }
         sb.append("]");
         return sb.toString();

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java Fri May  9 10:16:51
2014
@@ -132,13 +132,13 @@ public abstract class Attribute implemen
         case Constants.ATTR_RUNTIME_VISIBLE_ANNOTATIONS:
             return new RuntimeVisibleAnnotations(name_index, length, file,
                     constant_pool);
-        case Constants.ATTR_RUNTIMEIN_VISIBLE_ANNOTATIONS:
+        case Constants.ATTR_RUNTIME_INVISIBLE_ANNOTATIONS:
             return new RuntimeInvisibleAnnotations(name_index, length, file,
                     constant_pool);
         case Constants.ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS:
             return new RuntimeVisibleParameterAnnotations(name_index, length,
                     file, constant_pool);
-        case Constants.ATTR_RUNTIMEIN_VISIBLE_PARAMETER_ANNOTATIONS:
+        case Constants.ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS:
             return new RuntimeInvisibleParameterAnnotations(name_index, length,
                     file, constant_pool);
         case Constants.ATTR_ANNOTATION_DEFAULT:
@@ -152,6 +152,12 @@ public abstract class Attribute implemen
         case Constants.ATTR_STACK_MAP_TABLE:
             Utility.swallowStackMapTable(file);
             return null;
+        case Constants.ATTR_BOOTSTRAP_METHODS:
+            Utility.swallowBootstrapMethods(file);
+            return null;
+        case Constants.ATTR_METHOD_PARAMETERS:
+            Utility.swallowMethodParameters(file);
+            return null;
         default: // Never reached
             throw new IllegalStateException("Unrecognized attribute type tag parsed: " +
tag);
         }

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java Fri May  9 10:16:51
2014
@@ -127,7 +127,7 @@ public final class ClassParser {
      * @throws  IOException
      * @throws  ClassFormatException
      */
-    private final void readAttributes() throws IOException, ClassFormatException {
+    private void readAttributes() throws IOException, ClassFormatException {
         int attributes_count;
         attributes_count = file.readUnsignedShort();
         attributes = new Attribute[attributes_count];
@@ -142,7 +142,7 @@ public final class ClassParser {
      * @throws  IOException
      * @throws  ClassFormatException
      */
-    private final void readClassInfo() throws IOException, ClassFormatException {
+    private void readClassInfo() throws IOException, ClassFormatException {
         access_flags = file.readUnsignedShort();
         /* Interfaces are implicitely abstract, the flag should be set
          * according to the JVM specification.
@@ -164,7 +164,7 @@ public final class ClassParser {
      * @throws  IOException
      * @throws  ClassFormatException
      */
-    private final void readConstantPool() throws IOException, ClassFormatException {
+    private void readConstantPool() throws IOException, ClassFormatException {
         constant_pool = new ConstantPool(file);
     }
 
@@ -174,7 +174,7 @@ public final class ClassParser {
      * @throws  IOException
      * @throws  ClassFormatException
      */
-    private final void readFields() throws IOException, ClassFormatException {
+    private void readFields() throws IOException, ClassFormatException {
         int fields_count;
         fields_count = file.readUnsignedShort();
         fields = new FieldOrMethod[fields_count];
@@ -191,7 +191,7 @@ public final class ClassParser {
      * @throws  IOException
      * @throws  ClassFormatException
      */
-    private final void readID() throws IOException, ClassFormatException {
+    private void readID() throws IOException, ClassFormatException {
         if (file.readInt() != MAGIC) {
             throw new ClassFormatException(file_name + " is not a Java .class file");
         }
@@ -203,7 +203,7 @@ public final class ClassParser {
      * @throws  IOException
      * @throws  ClassFormatException
      */
-    private final void readInterfaces() throws IOException, ClassFormatException {
+    private void readInterfaces() throws IOException, ClassFormatException {
         int interfaces_count;
         interfaces_count = file.readUnsignedShort();
         interfaces = new int[interfaces_count];
@@ -218,7 +218,7 @@ public final class ClassParser {
      * @throws  IOException
      * @throws  ClassFormatException
      */
-    private final void readMethods() throws IOException, ClassFormatException {
+    private void readMethods() throws IOException, ClassFormatException {
         int methods_count;
         methods_count = file.readUnsignedShort();
         methods = new FieldOrMethod[methods_count];
@@ -233,7 +233,7 @@ public final class ClassParser {
      * @throws  IOException
      * @throws  ClassFormatException
      */
-    private final void readVersion() throws IOException, ClassFormatException {
+    private void readVersion() throws IOException, ClassFormatException {
         file.readUnsignedShort();   // Unused minor
         file.readUnsignedShort();   // Unused major
     }

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Code.java Fri May  9 10:16:51
2014
@@ -105,7 +105,7 @@ public final class Code extends Attribut
      * @return the internal length of this code attribute (minus the first 6 bytes)
      * and excluding all its attributes
      */
-    private final int getInternalLength() {
+    private int getInternalLength() {
         return 2 /*max_stack*/+ 2 /*max_locals*/+ 4 /*code length*/
                 + code_length /*byte-code*/
                 + 2 /*exception-table length*/
@@ -118,7 +118,7 @@ public final class Code extends Attribut
      * @return the full size of this code attribute, minus its first 6 bytes,
      * including the size of all its contained attributes
      */
-    private final int calculateLength() {
+    private int calculateLength() {
         int len = 0;
         for (int i = 0; i < attributes_count; i++) {
             len += attributes[i].length + 6 /*attribute header size*/;

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java Fri May  9 10:16:51
2014
@@ -76,9 +76,9 @@ public abstract class Constant implement
 
 
     @Override
-    public Constant clone() {
+    public Object clone() {
         try {
-            return (Constant) super.clone();
+            return super.clone();
         } catch (CloneNotSupportedException e) {
             throw new Error("Clone Not Supported"); // never happens
         }
@@ -91,7 +91,7 @@ public abstract class Constant implement
      * @param file Input stream
      * @return Constant object
      */
-    static final Constant readConstant( DataInputStream file ) throws IOException,
+    static Constant readConstant( DataInputStream file ) throws IOException,
             ClassFormatException {
         byte b = file.readByte(); // Read tag byte
         switch (b) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java Fri May  9 10:16:51
2014
@@ -128,7 +128,7 @@ public class ConstantPool implements Clo
     }
 
 
-    private static final String escape( String str ) {
+    private static String escape( String str ) {
         int len = str.length();
         StringBuilder buf = new StringBuilder(len + 5);
         char[] ch = str.toCharArray();

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java Fri May  9 10:16:51
2014
@@ -22,7 +22,7 @@ import java.io.IOException;
 
 /**
  * @author <A HREF="mailto:dbrosius@qis.net">D. Brosius</A>
- * @since 5.3
+ * @since 6.0
  */
 public abstract class ElementValue
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java Fri May
 9 10:16:51 2014
@@ -23,7 +23,7 @@ import org.apache.tomcat.util.bcel.Const
  * an annotation's element value pair
  *
  * @author <A HREF="mailto:dbrosius@qis.net">D. Brosius</A>
- * @since 5.3
+ * @since 6.0
  */
 public class ElementValuePair
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java Fri May  9 10:16:51
2014
@@ -116,8 +116,7 @@ public class JavaClass extends AccessFla
         if (annotationsOutOfDate) {
             // Find attributes that contain annotation data
             List<AnnotationEntry> accumulatedAnnotations = new ArrayList<>();
-            for (int i = 0; i < attributes.length; i++) {
-                Attribute attribute = attributes[i];
+            for (Attribute attribute : attributes) {
                 if (attribute instanceof Annotations) {
                     Annotations runtimeAnnotations = (Annotations)attribute;
                     for(int j = 0; j < runtimeAnnotations.getAnnotationEntries().length;
j++)

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java Fri
May  9 10:16:51 2014
@@ -56,7 +56,8 @@ public class LocalVariableTypeTable exte
 
         int local_variable_type_table_length = (dis.readUnsignedShort());
 
-        for(int i=0; i < local_variable_type_table_length; i++)
+        for(int i=0; i < local_variable_type_table_length; i++) {
             Utility.swallowLocalVariable(dis);
+        }
     }
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
Fri May  9 10:16:51 2014
@@ -26,7 +26,7 @@ import org.apache.tomcat.util.bcel.Const
  * represents one parameter annotation in the parameter annotation table
  *
  * @author  <A HREF="mailto:dbrosius@qis.net">D. Brosius</A>
- * @since 5.3
+ * @since 6.0
  */
 public class ParameterAnnotationEntry implements Constants {
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java Fri
May  9 10:16:51 2014
@@ -24,7 +24,7 @@ import java.io.IOException;
  * base class for parameter annotations
  *
  * @author  <A HREF="mailto:dbrosius@qis.net">D. Brosius</A>
- * @since 5.3
+ * @since 6.0
  */
 public abstract class ParameterAnnotations extends Attribute {
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
Fri May  9 10:16:51 2014
@@ -25,7 +25,7 @@ import java.io.IOException;
  * provided to the JVM.
  *
  * @author <A HREF="mailto:dbrosius@qis.net">D. Brosius</A>
- * @since 5.3
+ * @since 6.0
  */
 public class RuntimeInvisibleAnnotations extends Annotations
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
Fri May  9 10:16:51 2014
@@ -25,7 +25,7 @@ import java.io.IOException;
  * but is not provided to the JVM.
  *
  * @author  <A HREF="mailto:dbrosius@qis.net">D. Brosius</A>
- * @since 5.3
+ * @since 6.0
  */
 public class RuntimeInvisibleParameterAnnotations extends ParameterAnnotations {
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
Fri May  9 10:16:51 2014
@@ -25,7 +25,7 @@ import java.io.IOException;
  * provided to the JVM.
  *
  * @author <A HREF="mailto:dbrosius@qis.net">D. Brosius</A>
- * @since 5.3
+ * @since 6.0
  */
 public class RuntimeVisibleAnnotations extends Annotations
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleParameterAnnotations.java
Fri May  9 10:16:51 2014
@@ -25,7 +25,7 @@ import java.io.IOException;
  * and is provided to the JVM.
  *
  * @author  <A HREF="mailto:dbrosius@qis.net">D. Brosius</A>
- * @since 5.3
+ * @since 6.0
  */
 public class RuntimeVisibleParameterAnnotations extends ParameterAnnotations {
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java Fri May  9 10:16:51
2014
@@ -169,4 +169,23 @@ final class Utility {
             throw new ClassFormatException("Synthetic attribute with length > 0");
         }
     }
+
+    static void swallowBootstrapMethods(DataInput file) throws IOException {
+        int num_bootstrap_methods = file.readUnsignedShort();
+        for (int i = 0; i < num_bootstrap_methods; i++) {
+            file.readUnsignedShort();   // Unused bootstrap_method_ref
+            int num_bootstrap_args = file.readUnsignedShort();
+            for (int j = 0; j < num_bootstrap_args; j++) {
+                file.readUnsignedShort(); // Unused bootstrap method argument
+            }
+        }
+    }
+
+    static void swallowMethodParameters(DataInput file) throws IOException {
+        int parameters_count = file.readUnsignedShort();
+        for (int i = 0; i < parameters_count; i++) {
+            file.readUnsignedShort();   // Unused name_index
+            file.readUnsignedShort();   // Unused access_flags
+        }
+    }
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/package.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/package.html?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/package.html (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/package.html Fri May  9 10:16:51 2014
@@ -21,7 +21,7 @@
 <body bgcolor="white">
 <p>
 This package contains basic classes for the
-<a href="http://commons.apache.org/bcel">Byte Code Engineering Library</a>
+<a href="http://commons.apache.org/bcel/">Byte Code Engineering Library</a>
  and constants defined by the
 <a href="http://java.sun.com/docs/books/vmspec/html/VMSpecTOC.doc.html">
  JVM specification</a>.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/package.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/package.html?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/package.html (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/package.html Fri May  9 10:16:51 2014
@@ -21,7 +21,7 @@
 <body bgcolor="white">
 <p>
 This package contains utility classes for the
-<a href="http://jakarta.apache.org/bcel/">Byte Code Engineering
+<a href="http://commons.apache.org/bcel/">Byte Code Engineering
 Library</a>, namely:
 </p>
 <p>

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1593506&r1=1593505&r2=1593506&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri May  9 10:16:51 2014
@@ -355,6 +355,10 @@
         <bug>56363</bug>: Update to version 1.1.30 of Tomcat Native library.
         (schultz)
       </update>
+      <update>
+        Update package renamed Apache Commons BCEL to r1593495 to pick up some
+        additional changes for Java 7 support and some code clean up. (markt)
+      </update>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message