tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r887302 [2/5] - in /tomcat/trunk/java/org/apache/tomcat/util/bcel: ./ classfile/ generic/ util/ verifier/ verifier/exc/ verifier/statics/ verifier/structurals/
Date Fri, 04 Dec 2009 18:00:00 GMT
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.classfile;
+package org.apache.tomcat.util.bcel.classfile;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java Fri Dec  4 17:59:52 2009
@@ -14,12 +14,12 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.classfile;
+package org.apache.tomcat.util.bcel.classfile;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import org.apache.bcel.Constants;
+import org.apache.tomcat.util.bcel.Constants;
 
 /**
  * This class represents a stack map attribute used for

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java Fri Dec  4 17:59:52 2009
@@ -14,13 +14,13 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.classfile;
+package org.apache.tomcat.util.bcel.classfile;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.bcel.Constants;
+import org.apache.tomcat.util.bcel.Constants;
 
 /**
  * This class represents a stack map entry recording the types of

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java Fri Dec  4 17:59:52 2009
@@ -14,13 +14,13 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.classfile;
+package org.apache.tomcat.util.bcel.classfile;
 
 import java.io.DataInput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.bcel.Constants;
+import org.apache.tomcat.util.bcel.Constants;
 
 /**
  * This class represents the type of a local variable or item on stack

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Synthetic.java Fri Dec  4 17:59:52 2009
@@ -14,12 +14,12 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.classfile;
+package org.apache.tomcat.util.bcel.classfile;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import org.apache.bcel.Constants;
+import org.apache.tomcat.util.bcel.Constants;
 
 /**
  * This class is derived from <em>Attribute</em> and declares this class as

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.classfile;
+package org.apache.tomcat.util.bcel.classfile;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -22,7 +22,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import org.apache.bcel.Constants;
+import org.apache.tomcat.util.bcel.Constants;
 
 /**
  * This class represents a reference to an unknown (i.e.,
@@ -32,12 +32,12 @@
  * href="./AttributeReader.html">AttributeReader</a> implementation and
  * attach it via <a
  * href="./Attribute.html#addAttributeReader(java.lang.String,
- * org.apache.bcel.classfile.AttributeReader)">Attribute.addAttributeReader</a>.
+ * org.apache.tomcat.util.bcel.classfile.AttributeReader)">Attribute.addAttributeReader</a>.
 
  *
  * @version $Id$
- * @see org.apache.bcel.classfile.Attribute
- * @see org.apache.bcel.classfile.AttributeReader
+ * @see org.apache.tomcat.util.bcel.classfile.Attribute
+ * @see org.apache.tomcat.util.bcel.classfile.AttributeReader
  * @author  <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
  */
 public final class Unknown extends Attribute {

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=887302&r1=886844&r2=887302&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 Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.classfile;
+package org.apache.tomcat.util.bcel.classfile;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -35,10 +35,10 @@
 import java.util.Locale;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.AnnotationEntryGen;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.generic.AnnotationEntryGen;
+import org.apache.tomcat.util.bcel.generic.ConstantPoolGen;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
 
 /**
  * Utility functions that do not really belong to any class in particular.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Visitor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Visitor.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Visitor.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Visitor.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.classfile;
+package org.apache.tomcat.util.bcel.classfile;
 
 /**
  * Interface to make use of the Visitor pattern programming style. I.e. a class

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AALOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AALOAD.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * AALOAD - Load reference from array
@@ -28,7 +28,7 @@
     /** Load reference from array
      */
     public AALOAD() {
-        super(org.apache.bcel.Constants.AALOAD);
+        super(org.apache.tomcat.util.bcel.Constants.AALOAD);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AASTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AASTORE.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * AASTORE -  Store into reference array
@@ -28,7 +28,7 @@
     /** Store into reference array
      */
     public AASTORE() {
-        super(org.apache.bcel.Constants.AASTORE);
+        super(org.apache.tomcat.util.bcel.Constants.AASTORE);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ACONST_NULL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ACONST_NULL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ACONST_NULL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ACONST_NULL.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * ACONST_NULL - Push null reference
@@ -29,7 +29,7 @@
      * Push null reference
      */
     public ACONST_NULL() {
-        super(org.apache.bcel.Constants.ACONST_NULL, (short) 1);
+        super(org.apache.tomcat.util.bcel.Constants.ACONST_NULL, (short) 1);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ALOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ALOAD.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * ALOAD - Load reference from local variable
@@ -30,7 +30,7 @@
      * Instruction.readInstruction(). Not to be used otherwise.
      */
     ALOAD() {
-        super(org.apache.bcel.Constants.ALOAD, org.apache.bcel.Constants.ALOAD_0);
+        super(org.apache.tomcat.util.bcel.Constants.ALOAD, org.apache.tomcat.util.bcel.Constants.ALOAD_0);
     }
 
 
@@ -38,7 +38,7 @@
      * @param n index of local variable
      */
     public ALOAD(int n) {
-        super(org.apache.bcel.Constants.ALOAD, org.apache.bcel.Constants.ALOAD_0, n);
+        super(org.apache.tomcat.util.bcel.Constants.ALOAD, org.apache.tomcat.util.bcel.Constants.ALOAD_0, n);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ANEWARRAY.java Fri Dec  4 17:59:52 2009
@@ -14,9 +14,9 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
-import org.apache.bcel.ExceptionConstants;
+import org.apache.tomcat.util.bcel.ExceptionConstants;
 
 /** 
  * ANEWARRAY -  Create new array of references
@@ -37,7 +37,7 @@
 
 
     public ANEWARRAY(int index) {
-        super(org.apache.bcel.Constants.ANEWARRAY, index);
+        super(org.apache.tomcat.util.bcel.Constants.ANEWARRAY, index);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARETURN.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARETURN.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARETURN.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARETURN.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * ARETURN -  Return reference from method
@@ -29,7 +29,7 @@
      * Return reference from method
      */
     public ARETURN() {
-        super(org.apache.bcel.Constants.ARETURN);
+        super(org.apache.tomcat.util.bcel.Constants.ARETURN);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARRAYLENGTH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARRAYLENGTH.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARRAYLENGTH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ARRAYLENGTH.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * ARRAYLENGTH -  Get length of array
@@ -28,7 +28,7 @@
     /** Get length of array
      */
     public ARRAYLENGTH() {
-        super(org.apache.bcel.Constants.ARRAYLENGTH, (short) 1);
+        super(org.apache.tomcat.util.bcel.Constants.ARRAYLENGTH, (short) 1);
     }
 
 
@@ -36,7 +36,7 @@
      */
     public Class[] getExceptions() {
         return new Class[] {
-            org.apache.bcel.ExceptionConstants.NULL_POINTER_EXCEPTION
+            org.apache.tomcat.util.bcel.ExceptionConstants.NULL_POINTER_EXCEPTION
         };
     }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ASTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ASTORE.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * ASTORE - Store reference into local variable
@@ -30,7 +30,7 @@
      * Instruction.readInstruction(). Not to be used otherwise.
      */
     ASTORE() {
-        super(org.apache.bcel.Constants.ASTORE, org.apache.bcel.Constants.ASTORE_0);
+        super(org.apache.tomcat.util.bcel.Constants.ASTORE, org.apache.tomcat.util.bcel.Constants.ASTORE_0);
     }
 
 
@@ -38,7 +38,7 @@
      * @param n index of local variable
      */
     public ASTORE(int n) {
-        super(org.apache.bcel.Constants.ASTORE, org.apache.bcel.Constants.ASTORE_0, n);
+        super(org.apache.tomcat.util.bcel.Constants.ASTORE, org.apache.tomcat.util.bcel.Constants.ASTORE_0, n);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ATHROW.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ATHROW.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ATHROW.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ATHROW.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * ATHROW -  Throw exception
@@ -29,7 +29,7 @@
      *  Throw exception
      */
     public ATHROW() {
-        super(org.apache.bcel.Constants.ATHROW, (short) 1);
+        super(org.apache.tomcat.util.bcel.Constants.ATHROW, (short) 1);
     }
 
 
@@ -37,7 +37,7 @@
      */
     public Class[] getExceptions() {
         return new Class[] {
-            org.apache.bcel.ExceptionConstants.THROWABLE
+            org.apache.tomcat.util.bcel.ExceptionConstants.THROWABLE
         };
     }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AllocationInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AllocationInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AllocationInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AllocationInstruction.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /**
  * Denote family of instructions that allocates space in the heap.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationElementValueGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationElementValueGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationElementValueGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationElementValueGen.java Fri Dec  4 17:59:52 2009
@@ -1,9 +1,9 @@
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
-import org.apache.bcel.classfile.AnnotationElementValue;
-import org.apache.bcel.classfile.ElementValue;
+import org.apache.tomcat.util.bcel.classfile.AnnotationElementValue;
+import org.apache.tomcat.util.bcel.classfile.ElementValue;
 
 public class AnnotationElementValueGen extends ElementValueGen
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationEntryGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationEntryGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationEntryGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/AnnotationEntryGen.java Fri Dec  4 17:59:52 2009
@@ -1,4 +1,4 @@
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -6,9 +6,9 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.bcel.classfile.AnnotationEntry;
-import org.apache.bcel.classfile.ConstantUtf8;
-import org.apache.bcel.classfile.ElementValuePair;
+import org.apache.tomcat.util.bcel.classfile.AnnotationEntry;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.ElementValuePair;
 
 
 public class AnnotationEntryGen

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArithmeticInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArithmeticInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArithmeticInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArithmeticInstruction.java Fri Dec  4 17:59:52 2009
@@ -14,9 +14,9 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
-import org.apache.bcel.Constants;
+import org.apache.tomcat.util.bcel.Constants;
 
 /**
  * Super class for the family of arithmetic instructions.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayElementValueGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayElementValueGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayElementValueGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayElementValueGen.java Fri Dec  4 17:59:52 2009
@@ -1,12 +1,12 @@
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.bcel.classfile.ArrayElementValue;
-import org.apache.bcel.classfile.ElementValue;
+import org.apache.tomcat.util.bcel.classfile.ArrayElementValue;
+import org.apache.tomcat.util.bcel.classfile.ElementValue;
 
 public class ArrayElementValueGen extends ElementValueGen
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayInstruction.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /**
  * Super class for instructions dealing with array access such as IALOAD.
@@ -42,7 +42,7 @@
 
 
     public Class[] getExceptions() {
-        return org.apache.bcel.ExceptionConstants.EXCS_ARRAY_EXCEPTION;
+        return org.apache.tomcat.util.bcel.ExceptionConstants.EXCS_ARRAY_EXCEPTION;
     }
 
 
@@ -50,29 +50,29 @@
      */
     public Type getType( ConstantPoolGen cp ) {
         switch (opcode) {
-            case org.apache.bcel.Constants.IALOAD:
-            case org.apache.bcel.Constants.IASTORE:
+            case org.apache.tomcat.util.bcel.Constants.IALOAD:
+            case org.apache.tomcat.util.bcel.Constants.IASTORE:
                 return Type.INT;
-            case org.apache.bcel.Constants.CALOAD:
-            case org.apache.bcel.Constants.CASTORE:
+            case org.apache.tomcat.util.bcel.Constants.CALOAD:
+            case org.apache.tomcat.util.bcel.Constants.CASTORE:
                 return Type.CHAR;
-            case org.apache.bcel.Constants.BALOAD:
-            case org.apache.bcel.Constants.BASTORE:
+            case org.apache.tomcat.util.bcel.Constants.BALOAD:
+            case org.apache.tomcat.util.bcel.Constants.BASTORE:
                 return Type.BYTE;
-            case org.apache.bcel.Constants.SALOAD:
-            case org.apache.bcel.Constants.SASTORE:
+            case org.apache.tomcat.util.bcel.Constants.SALOAD:
+            case org.apache.tomcat.util.bcel.Constants.SASTORE:
                 return Type.SHORT;
-            case org.apache.bcel.Constants.LALOAD:
-            case org.apache.bcel.Constants.LASTORE:
+            case org.apache.tomcat.util.bcel.Constants.LALOAD:
+            case org.apache.tomcat.util.bcel.Constants.LASTORE:
                 return Type.LONG;
-            case org.apache.bcel.Constants.DALOAD:
-            case org.apache.bcel.Constants.DASTORE:
+            case org.apache.tomcat.util.bcel.Constants.DALOAD:
+            case org.apache.tomcat.util.bcel.Constants.DASTORE:
                 return Type.DOUBLE;
-            case org.apache.bcel.Constants.FALOAD:
-            case org.apache.bcel.Constants.FASTORE:
+            case org.apache.tomcat.util.bcel.Constants.FALOAD:
+            case org.apache.tomcat.util.bcel.Constants.FASTORE:
                 return Type.FLOAT;
-            case org.apache.bcel.Constants.AALOAD:
-            case org.apache.bcel.Constants.AASTORE:
+            case org.apache.tomcat.util.bcel.Constants.AALOAD:
+            case org.apache.tomcat.util.bcel.Constants.AASTORE:
                 return Type.OBJECT;
             default:
                 throw new ClassGenException("Oops: unknown case in switch" + opcode);

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayType.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ArrayType.java Fri Dec  4 17:59:52 2009
@@ -14,9 +14,9 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
-import org.apache.bcel.Constants;
+import org.apache.tomcat.util.bcel.Constants;
 
 /** 
  * Denotes array type, such as int[][]

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BALOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BALOAD.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * BALOAD - Load byte or boolean from array
@@ -28,7 +28,7 @@
     /** Load byte or boolean from array
      */
     public BALOAD() {
-        super(org.apache.bcel.Constants.BALOAD);
+        super(org.apache.tomcat.util.bcel.Constants.BALOAD);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BASTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BASTORE.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * BASTORE -  Store into byte or boolean array
@@ -28,7 +28,7 @@
     /** Store byte or boolean into array
      */
     public BASTORE() {
-        super(org.apache.bcel.Constants.BASTORE);
+        super(org.apache.tomcat.util.bcel.Constants.BASTORE);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BIPUSH.java Fri Dec  4 17:59:52 2009
@@ -14,11 +14,11 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
 
 /** 
  * BIPUSH - Push byte on stack
@@ -44,7 +44,7 @@
     /** Push byte on stack
      */
     public BIPUSH(byte b) {
-        super(org.apache.bcel.Constants.BIPUSH, (short) 2);
+        super(org.apache.tomcat.util.bcel.Constants.BIPUSH, (short) 2);
         this.b = b;
     }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BREAKPOINT.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BREAKPOINT.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BREAKPOINT.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BREAKPOINT.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /**
  * BREAKPOINT, JVM dependent, ignored by default
@@ -25,7 +25,7 @@
 public class BREAKPOINT extends Instruction {
 
     public BREAKPOINT() {
-        super(org.apache.bcel.Constants.BREAKPOINT, (short) 1);
+        super(org.apache.tomcat.util.bcel.Constants.BREAKPOINT, (short) 1);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BasicType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BasicType.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BasicType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BasicType.java Fri Dec  4 17:59:52 2009
@@ -14,9 +14,9 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
-import org.apache.bcel.Constants;
+import org.apache.tomcat.util.bcel.Constants;
 
 /** 
  * Denotes basic type such as int.
@@ -30,7 +30,7 @@
      * Constructor for basic types such as int, long, `void'
      *
      * @param type one of T_INT, T_BOOLEAN, ..., T_VOID
-     * @see org.apache.bcel.Constants
+     * @see org.apache.tomcat.util.bcel.Constants
      */
     BasicType(byte type) {
         super(type, Constants.SHORT_TYPE_NAMES[type]);

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchHandle.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /**
  * BranchHandle is returned by specialized InstructionList.append() whenever a

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/BranchInstruction.java Fri Dec  4 17:59:52 2009
@@ -14,11 +14,11 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
 
 /** 
  * Abstract super class for branching instructions like GOTO, IFEQ, etc..

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CALOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CALOAD.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * CALOAD - Load char from array
@@ -28,7 +28,7 @@
     /** Load char from array
      */
     public CALOAD() {
-        super(org.apache.bcel.Constants.CALOAD);
+        super(org.apache.tomcat.util.bcel.Constants.CALOAD);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CASTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CASTORE.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * CASTORE -  Store into char array
@@ -28,7 +28,7 @@
     /** Store char into array
      */
     public CASTORE() {
-        super(org.apache.bcel.Constants.CASTORE);
+        super(org.apache.tomcat.util.bcel.Constants.CASTORE);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CHECKCAST.java Fri Dec  4 17:59:52 2009
@@ -14,9 +14,9 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
-import org.apache.bcel.ExceptionConstants;
+import org.apache.tomcat.util.bcel.ExceptionConstants;
 
 /** 
  * CHECKCAST - Check whether object is of given type
@@ -40,7 +40,7 @@
      * @param index index to class in constant pool
      */
     public CHECKCAST(int index) {
-        super(org.apache.bcel.Constants.CHECKCAST, index);
+        super(org.apache.tomcat.util.bcel.Constants.CHECKCAST, index);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CPInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CPInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CPInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CPInstruction.java Fri Dec  4 17:59:52 2009
@@ -14,14 +14,14 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.classfile.Constant;
+import org.apache.tomcat.util.bcel.classfile.ConstantClass;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
 
 /** 
  * Abstract super class for instructions that use an index into the 
@@ -90,7 +90,7 @@
         if (c instanceof ConstantClass) {
             str = str.replace('.', '/');
         }
-        return org.apache.bcel.Constants.OPCODE_NAMES[opcode] + " " + str;
+        return org.apache.tomcat.util.bcel.Constants.OPCODE_NAMES[opcode] + " " + str;
     }
 
 
@@ -129,7 +129,7 @@
      */
     public Type getType( ConstantPoolGen cpg ) {
         ConstantPool cp = cpg.getConstantPool();
-        String name = cp.getConstantString(index, org.apache.bcel.Constants.CONSTANT_Class);
+        String name = cp.getConstantString(index, org.apache.tomcat.util.bcel.Constants.CONSTANT_Class);
         if (!name.startsWith("[")) {
             name = "L" + name + ";";
         }

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassElementValueGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassElementValueGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassElementValueGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassElementValueGen.java Fri Dec  4 17:59:52 2009
@@ -1,13 +1,13 @@
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
-import org.apache.bcel.classfile.ElementValue;
-import org.apache.bcel.classfile.ConstantUtf8;
-import org.apache.bcel.classfile.ClassElementValue;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.ElementValueGen;
+import org.apache.tomcat.util.bcel.classfile.ElementValue;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.ClassElementValue;
+import org.apache.tomcat.util.bcel.generic.ConstantPoolGen;
+import org.apache.tomcat.util.bcel.generic.ObjectType;
+import org.apache.tomcat.util.bcel.generic.ElementValueGen;
 
 public class ClassElementValueGen extends ElementValueGen
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGen.java Fri Dec  4 17:59:52 2009
@@ -14,26 +14,26 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.AccessFlags;
-import org.apache.bcel.classfile.AnnotationEntry;
-import org.apache.bcel.classfile.Annotations;
-import org.apache.bcel.classfile.Attribute;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.RuntimeInvisibleAnnotations;
-import org.apache.bcel.classfile.RuntimeVisibleAnnotations;
-import org.apache.bcel.classfile.SourceFile;
-import org.apache.bcel.classfile.Utility;
-import org.apache.bcel.util.BCELComparator;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.AccessFlags;
+import org.apache.tomcat.util.bcel.classfile.AnnotationEntry;
+import org.apache.tomcat.util.bcel.classfile.Annotations;
+import org.apache.tomcat.util.bcel.classfile.Attribute;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.classfile.Field;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.Method;
+import org.apache.tomcat.util.bcel.classfile.RuntimeInvisibleAnnotations;
+import org.apache.tomcat.util.bcel.classfile.RuntimeVisibleAnnotations;
+import org.apache.tomcat.util.bcel.classfile.SourceFile;
+import org.apache.tomcat.util.bcel.classfile.Utility;
+import org.apache.tomcat.util.bcel.util.BCELComparator;
 
 /** 
  * Template class for building up a java class. May be initialized with an

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGenException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGenException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGenException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassGenException.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * Thrown on internal errors. Extends RuntimeException so it hasn't to be declared

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassObserver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassObserver.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassObserver.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ClassObserver.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /**
  * Implement this interface if you're interested in changes to a ClassGen object

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CodeExceptionGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CodeExceptionGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CodeExceptionGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CodeExceptionGen.java Fri Dec  4 17:59:52 2009
@@ -14,9 +14,9 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
-import org.apache.bcel.classfile.CodeException;
+import org.apache.tomcat.util.bcel.classfile.CodeException;
 
 /** 
  * This class represents an exception handler, i.e., specifies the  region where

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CompoundInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CompoundInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CompoundInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/CompoundInstruction.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /**
  * Wrapper class for `compound' operations, virtual instructions that

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPoolGen.java Fri Dec  4 17:59:52 2009
@@ -14,25 +14,25 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantCP;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantDouble;
-import org.apache.bcel.classfile.ConstantFieldref;
-import org.apache.bcel.classfile.ConstantFloat;
-import org.apache.bcel.classfile.ConstantInteger;
-import org.apache.bcel.classfile.ConstantInterfaceMethodref;
-import org.apache.bcel.classfile.ConstantLong;
-import org.apache.bcel.classfile.ConstantMethodref;
-import org.apache.bcel.classfile.ConstantNameAndType;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.ConstantString;
-import org.apache.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.Constant;
+import org.apache.tomcat.util.bcel.classfile.ConstantCP;
+import org.apache.tomcat.util.bcel.classfile.ConstantClass;
+import org.apache.tomcat.util.bcel.classfile.ConstantDouble;
+import org.apache.tomcat.util.bcel.classfile.ConstantFieldref;
+import org.apache.tomcat.util.bcel.classfile.ConstantFloat;
+import org.apache.tomcat.util.bcel.classfile.ConstantInteger;
+import org.apache.tomcat.util.bcel.classfile.ConstantInterfaceMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantLong;
+import org.apache.tomcat.util.bcel.classfile.ConstantMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantNameAndType;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.classfile.ConstantString;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
 
 /** 
  * This class is used to build up a constant pool. The user adds

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPushInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPushInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPushInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConstantPushInstruction.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /**
  * Denotes a push instruction that produces a literal on the stack

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConversionInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConversionInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConversionInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ConversionInstruction.java Fri Dec  4 17:59:52 2009
@@ -14,9 +14,9 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
-import org.apache.bcel.Constants;
+import org.apache.tomcat.util.bcel.Constants;
 
 /**
  * Super class for the x2y family of instructions.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2F.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2F.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2F.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2F.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * D2F - Convert double to float
@@ -28,7 +28,7 @@
     /** Convert double to float
      */
     public D2F() {
-        super(org.apache.bcel.Constants.D2F);
+        super(org.apache.tomcat.util.bcel.Constants.D2F);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2I.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2I.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2I.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2I.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * D2I - Convert double to int
@@ -28,7 +28,7 @@
     /** Convert double to int
      */
     public D2I() {
-        super(org.apache.bcel.Constants.D2I);
+        super(org.apache.tomcat.util.bcel.Constants.D2I);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2L.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2L.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2L.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/D2L.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * D2L - Convert double to long
@@ -28,7 +28,7 @@
     /** Convert double to long
      */
     public D2L() {
-        super(org.apache.bcel.Constants.D2L);
+        super(org.apache.tomcat.util.bcel.Constants.D2L);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DADD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DADD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DADD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DADD.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DADD - Add doubles
@@ -29,7 +29,7 @@
     /** Add doubles
      */
     public DADD() {
-        super(org.apache.bcel.Constants.DADD);
+        super(org.apache.tomcat.util.bcel.Constants.DADD);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DALOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DALOAD.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DALOAD - Load double from array
@@ -28,7 +28,7 @@
     /** Load double from array
      */
     public DALOAD() {
-        super(org.apache.bcel.Constants.DALOAD);
+        super(org.apache.tomcat.util.bcel.Constants.DALOAD);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DASTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DASTORE.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DASTORE -  Store into double array
@@ -28,7 +28,7 @@
     /** Store double into array
      */
     public DASTORE() {
-        super(org.apache.bcel.Constants.DASTORE);
+        super(org.apache.tomcat.util.bcel.Constants.DASTORE);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPG.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPG.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPG.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPG.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DCMPG - Compare doubles: value1 > value2
@@ -27,7 +27,7 @@
 public class DCMPG extends Instruction implements TypedInstruction, StackProducer, StackConsumer {
 
     public DCMPG() {
-        super(org.apache.bcel.Constants.DCMPG, (short) 1);
+        super(org.apache.tomcat.util.bcel.Constants.DCMPG, (short) 1);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCMPL.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DCMPL - Compare doubles: value1 < value2
@@ -27,7 +27,7 @@
 public class DCMPL extends Instruction implements TypedInstruction, StackProducer, StackConsumer {
 
     public DCMPL() {
-        super(org.apache.bcel.Constants.DCMPL, (short) 1);
+        super(org.apache.tomcat.util.bcel.Constants.DCMPL, (short) 1);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCONST.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCONST.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCONST.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DCONST.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DCONST - Push 0.0 or 1.0, other values cause an exception
@@ -38,11 +38,11 @@
 
 
     public DCONST(double f) {
-        super(org.apache.bcel.Constants.DCONST_0, (short) 1);
+        super(org.apache.tomcat.util.bcel.Constants.DCONST_0, (short) 1);
         if (f == 0.0) {
-            opcode = org.apache.bcel.Constants.DCONST_0;
+            opcode = org.apache.tomcat.util.bcel.Constants.DCONST_0;
         } else if (f == 1.0) {
-            opcode = org.apache.bcel.Constants.DCONST_1;
+            opcode = org.apache.tomcat.util.bcel.Constants.DCONST_1;
         } else {
             throw new ClassGenException("DCONST can be used only for 0.0 and 1.0: " + f);
         }

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DDIV.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DDIV.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DDIV.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DDIV.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DDIV -  Divide doubles
@@ -29,7 +29,7 @@
     /** Divide doubles
      */
     public DDIV() {
-        super(org.apache.bcel.Constants.DDIV);
+        super(org.apache.tomcat.util.bcel.Constants.DDIV);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DLOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DLOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DLOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DLOAD.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DLOAD - Load double from local variable
@@ -30,7 +30,7 @@
      * Instruction.readInstruction(). Not to be used otherwise.
      */
     DLOAD() {
-        super(org.apache.bcel.Constants.DLOAD, org.apache.bcel.Constants.DLOAD_0);
+        super(org.apache.tomcat.util.bcel.Constants.DLOAD, org.apache.tomcat.util.bcel.Constants.DLOAD_0);
     }
 
 
@@ -38,7 +38,7 @@
      * @param n index of local variable
      */
     public DLOAD(int n) {
-        super(org.apache.bcel.Constants.DLOAD, org.apache.bcel.Constants.DLOAD_0, n);
+        super(org.apache.tomcat.util.bcel.Constants.DLOAD, org.apache.tomcat.util.bcel.Constants.DLOAD_0, n);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DMUL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DMUL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DMUL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DMUL.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DMUL - Multiply doubles
@@ -29,7 +29,7 @@
     /** Multiply doubles
      */
     public DMUL() {
-        super(org.apache.bcel.Constants.DMUL);
+        super(org.apache.tomcat.util.bcel.Constants.DMUL);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DNEG.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DNEG.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DNEG.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DNEG.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DNEG - Negate double
@@ -26,7 +26,7 @@
 public class DNEG extends ArithmeticInstruction {
 
     public DNEG() {
-        super(org.apache.bcel.Constants.DNEG);
+        super(org.apache.tomcat.util.bcel.Constants.DNEG);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DREM.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DREM.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DREM.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DREM.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DREM - Remainder of doubles
@@ -29,7 +29,7 @@
     /** Remainder of doubles
      */
     public DREM() {
-        super(org.apache.bcel.Constants.DREM);
+        super(org.apache.tomcat.util.bcel.Constants.DREM);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DRETURN.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DRETURN.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DRETURN.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DRETURN.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DRETURN -  Return double from method
@@ -28,7 +28,7 @@
     /** Return double from method
      */
     public DRETURN() {
-        super(org.apache.bcel.Constants.DRETURN);
+        super(org.apache.tomcat.util.bcel.Constants.DRETURN);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSTORE.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DSTORE - Store double into local variable
@@ -30,7 +30,7 @@
      * Instruction.readInstruction(). Not to be used otherwise.
      */
     DSTORE() {
-        super(org.apache.bcel.Constants.DSTORE, org.apache.bcel.Constants.DSTORE_0);
+        super(org.apache.tomcat.util.bcel.Constants.DSTORE, org.apache.tomcat.util.bcel.Constants.DSTORE_0);
     }
 
 
@@ -38,7 +38,7 @@
      * @param n index of local variable
      */
     public DSTORE(int n) {
-        super(org.apache.bcel.Constants.DSTORE, org.apache.bcel.Constants.DSTORE_0, n);
+        super(org.apache.tomcat.util.bcel.Constants.DSTORE, org.apache.tomcat.util.bcel.Constants.DSTORE_0, n);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSUB.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSUB.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSUB.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DSUB.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DSUB - Substract doubles
@@ -29,7 +29,7 @@
     /** Substract doubles
      */
     public DSUB() {
-        super(org.apache.bcel.Constants.DSUB);
+        super(org.apache.tomcat.util.bcel.Constants.DSUB);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DUP - Duplicate top operand stack word
@@ -26,7 +26,7 @@
 public class DUP extends StackInstruction implements PushInstruction {
 
     public DUP() {
-        super(org.apache.bcel.Constants.DUP);
+        super(org.apache.tomcat.util.bcel.Constants.DUP);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DUP2 - Duplicate two top operand stack words
@@ -26,7 +26,7 @@
 public class DUP2 extends StackInstruction implements PushInstruction {
 
     public DUP2() {
-        super(org.apache.bcel.Constants.DUP2);
+        super(org.apache.tomcat.util.bcel.Constants.DUP2);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X1.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X1.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X1.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X1.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DUP2_X1 - Duplicate two top operand stack words and put three down
@@ -26,7 +26,7 @@
 public class DUP2_X1 extends StackInstruction {
 
     public DUP2_X1() {
-        super(org.apache.bcel.Constants.DUP2_X1);
+        super(org.apache.tomcat.util.bcel.Constants.DUP2_X1);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X2.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X2.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X2.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP2_X2.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DUP2_X2 - Duplicate two top operand stack words and put four down
@@ -26,7 +26,7 @@
 public class DUP2_X2 extends StackInstruction {
 
     public DUP2_X2() {
-        super(org.apache.bcel.Constants.DUP2_X2);
+        super(org.apache.tomcat.util.bcel.Constants.DUP2_X2);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X1.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X1.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X1.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X1.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DUP_X1 - Duplicate top operand stack word and put two down
@@ -26,7 +26,7 @@
 public class DUP_X1 extends StackInstruction {
 
     public DUP_X1() {
-        super(org.apache.bcel.Constants.DUP_X1);
+        super(org.apache.tomcat.util.bcel.Constants.DUP_X1);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X2.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X2.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X2.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/DUP_X2.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * DUP_X2 - Duplicate top operand stack word and put three down
@@ -26,7 +26,7 @@
 public class DUP_X2 extends StackInstruction {
 
     public DUP_X2() {
-        super(org.apache.bcel.Constants.DUP_X2);
+        super(org.apache.tomcat.util.bcel.Constants.DUP_X2);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValueGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValueGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValueGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValueGen.java Fri Dec  4 17:59:52 2009
@@ -1,16 +1,16 @@
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.apache.bcel.classfile.AnnotationElementValue;
-import org.apache.bcel.classfile.AnnotationEntry;
-import org.apache.bcel.classfile.ArrayElementValue;
-import org.apache.bcel.classfile.ClassElementValue;
-import org.apache.bcel.classfile.ElementValue;
-import org.apache.bcel.classfile.EnumElementValue;
-import org.apache.bcel.classfile.SimpleElementValue;
+import org.apache.tomcat.util.bcel.classfile.AnnotationElementValue;
+import org.apache.tomcat.util.bcel.classfile.AnnotationEntry;
+import org.apache.tomcat.util.bcel.classfile.ArrayElementValue;
+import org.apache.tomcat.util.bcel.classfile.ClassElementValue;
+import org.apache.tomcat.util.bcel.classfile.ElementValue;
+import org.apache.tomcat.util.bcel.classfile.EnumElementValue;
+import org.apache.tomcat.util.bcel.classfile.SimpleElementValue;
 
 public abstract class ElementValueGen
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValuePairGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValuePairGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValuePairGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ElementValuePairGen.java Fri Dec  4 17:59:52 2009
@@ -1,10 +1,10 @@
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
-import org.apache.bcel.classfile.ConstantUtf8;
-import org.apache.bcel.classfile.ElementValue;
-import org.apache.bcel.classfile.ElementValuePair;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.ElementValue;
+import org.apache.tomcat.util.bcel.classfile.ElementValuePair;
 
 public class ElementValuePairGen
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EmptyVisitor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EmptyVisitor.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EmptyVisitor.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EmptyVisitor.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /**
  * Supplies empty method bodies to be overridden by subclasses.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EnumElementValueGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EnumElementValueGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EnumElementValueGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/EnumElementValueGen.java Fri Dec  4 17:59:52 2009
@@ -1,10 +1,10 @@
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
-import org.apache.bcel.classfile.ConstantUtf8;
-import org.apache.bcel.classfile.ElementValue;
-import org.apache.bcel.classfile.EnumElementValue;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.ElementValue;
+import org.apache.tomcat.util.bcel.classfile.EnumElementValue;
 
 public class EnumElementValueGen extends ElementValueGen
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ExceptionThrower.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ExceptionThrower.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ExceptionThrower.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ExceptionThrower.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /**
  * Denote an instruction that may throw a run-time or a linking

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2D.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2D.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2D.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2D.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * F2D - Convert float to double
@@ -28,7 +28,7 @@
     /** Convert float to double
      */
     public F2D() {
-        super(org.apache.bcel.Constants.F2D);
+        super(org.apache.tomcat.util.bcel.Constants.F2D);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2I.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2I.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2I.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2I.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * F2I - Convert float to int
@@ -28,7 +28,7 @@
     /** Convert float to int
      */
     public F2I() {
-        super(org.apache.bcel.Constants.F2I);
+        super(org.apache.tomcat.util.bcel.Constants.F2I);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2L.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2L.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2L.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/F2L.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * F2L - Convert float to long
@@ -28,7 +28,7 @@
     /** Convert float to long
      */
     public F2L() {
-        super(org.apache.bcel.Constants.F2L);
+        super(org.apache.tomcat.util.bcel.Constants.F2L);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FADD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FADD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FADD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FADD.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * FADD - Add floats
@@ -28,7 +28,7 @@
     /** Add floats
      */
     public FADD() {
-        super(org.apache.bcel.Constants.FADD);
+        super(org.apache.tomcat.util.bcel.Constants.FADD);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FALOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FALOAD.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * FALOAD - Load float from array
@@ -28,7 +28,7 @@
     /** Load float from array
      */
     public FALOAD() {
-        super(org.apache.bcel.Constants.FALOAD);
+        super(org.apache.tomcat.util.bcel.Constants.FALOAD);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FASTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FASTORE.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * FASTORE -  Store into float array
@@ -28,7 +28,7 @@
     /** Store float into array
      */
     public FASTORE() {
-        super(org.apache.bcel.Constants.FASTORE);
+        super(org.apache.tomcat.util.bcel.Constants.FASTORE);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPG.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPG.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPG.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPG.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * FCMPG - Compare floats: value1 > value2
@@ -26,7 +26,7 @@
 public class FCMPG extends Instruction implements TypedInstruction, StackProducer, StackConsumer {
 
     public FCMPG() {
-        super(org.apache.bcel.Constants.FCMPG, (short) 1);
+        super(org.apache.tomcat.util.bcel.Constants.FCMPG, (short) 1);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCMPL.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * FCMPL - Compare floats: value1 < value2
@@ -26,7 +26,7 @@
 public class FCMPL extends Instruction implements TypedInstruction, StackProducer, StackConsumer {
 
     public FCMPL() {
-        super(org.apache.bcel.Constants.FCMPL, (short) 1);
+        super(org.apache.tomcat.util.bcel.Constants.FCMPL, (short) 1);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCONST.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCONST.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCONST.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FCONST.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * FCONST - Push 0.0, 1.0 or 2.0, other values cause an exception
@@ -38,13 +38,13 @@
 
 
     public FCONST(float f) {
-        super(org.apache.bcel.Constants.FCONST_0, (short) 1);
+        super(org.apache.tomcat.util.bcel.Constants.FCONST_0, (short) 1);
         if (f == 0.0) {
-            opcode = org.apache.bcel.Constants.FCONST_0;
+            opcode = org.apache.tomcat.util.bcel.Constants.FCONST_0;
         } else if (f == 1.0) {
-            opcode = org.apache.bcel.Constants.FCONST_1;
+            opcode = org.apache.tomcat.util.bcel.Constants.FCONST_1;
         } else if (f == 2.0) {
-            opcode = org.apache.bcel.Constants.FCONST_2;
+            opcode = org.apache.tomcat.util.bcel.Constants.FCONST_2;
         } else {
             throw new ClassGenException("FCONST can be used only for 0.0, 1.0 and 2.0: " + f);
         }

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FDIV.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FDIV.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FDIV.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FDIV.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /**
  * FDIV - Divide floats
@@ -28,7 +28,7 @@
     /** Divide floats
      */
     public FDIV() {
-        super(org.apache.bcel.Constants.FDIV);
+        super(org.apache.tomcat.util.bcel.Constants.FDIV);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FLOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FLOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FLOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FLOAD.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * FLOAD - Load float from local variable
@@ -30,7 +30,7 @@
      * Instruction.readInstruction(). Not to be used otherwise.
      */
     FLOAD() {
-        super(org.apache.bcel.Constants.FLOAD, org.apache.bcel.Constants.FLOAD_0);
+        super(org.apache.tomcat.util.bcel.Constants.FLOAD, org.apache.tomcat.util.bcel.Constants.FLOAD_0);
     }
 
 
@@ -38,7 +38,7 @@
      * @param n index of local variable
      */
     public FLOAD(int n) {
-        super(org.apache.bcel.Constants.FLOAD, org.apache.bcel.Constants.FLOAD_0, n);
+        super(org.apache.tomcat.util.bcel.Constants.FLOAD, org.apache.tomcat.util.bcel.Constants.FLOAD_0, n);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FMUL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FMUL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FMUL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FMUL.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /**
  * FMUL - Multiply floats
@@ -28,7 +28,7 @@
     /** Multiply floats
      */
     public FMUL() {
-        super(org.apache.bcel.Constants.FMUL);
+        super(org.apache.tomcat.util.bcel.Constants.FMUL);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FNEG.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FNEG.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FNEG.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FNEG.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * FNEG - Negate float
@@ -26,7 +26,7 @@
 public class FNEG extends ArithmeticInstruction {
 
     public FNEG() {
-        super(org.apache.bcel.Constants.FNEG);
+        super(org.apache.tomcat.util.bcel.Constants.FNEG);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FREM.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FREM.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FREM.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FREM.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /**
  * FREM - Remainder of floats
@@ -28,7 +28,7 @@
     /** Remainder of floats
      */
     public FREM() {
-        super(org.apache.bcel.Constants.FREM);
+        super(org.apache.tomcat.util.bcel.Constants.FREM);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FRETURN.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FRETURN.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FRETURN.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FRETURN.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 /** 
  * FRETURN -  Return float from method
@@ -28,7 +28,7 @@
     /** Return float from method
      */
     public FRETURN() {
-        super(org.apache.bcel.Constants.FRETURN);
+        super(org.apache.tomcat.util.bcel.Constants.FRETURN);
     }
 
 



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


Mime
View raw message