tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r887302 [4/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/generic/LDIV.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDIV.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDIV.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDIV.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;
 
 /**
  * LDIV - Divide longs
@@ -27,13 +27,13 @@
 public class LDIV extends ArithmeticInstruction implements ExceptionThrower {
 
     public LDIV() {
-        super(org.apache.bcel.Constants.LDIV);
+        super(org.apache.tomcat.util.bcel.Constants.LDIV);
     }
 
 
     public Class[] getExceptions() {
         return new Class[] {
-            org.apache.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
+            org.apache.tomcat.util.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
         };
     }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LLOAD.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;
 
 /** 
  * LLOAD - Load long from local variable
@@ -30,12 +30,12 @@
      * Instruction.readInstruction(). Not to be used otherwise.
      */
     LLOAD() {
-        super(org.apache.bcel.Constants.LLOAD, org.apache.bcel.Constants.LLOAD_0);
+        super(org.apache.tomcat.util.bcel.Constants.LLOAD, org.apache.tomcat.util.bcel.Constants.LLOAD_0);
     }
 
 
     public LLOAD(int n) {
-        super(org.apache.bcel.Constants.LLOAD, org.apache.bcel.Constants.LLOAD_0, n);
+        super(org.apache.tomcat.util.bcel.Constants.LLOAD, org.apache.tomcat.util.bcel.Constants.LLOAD_0, n);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LMUL.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;
 
 /** 
  * LMUL - Multiply longs
@@ -27,7 +27,7 @@
 public class LMUL extends ArithmeticInstruction {
 
     public LMUL() {
-        super(org.apache.bcel.Constants.LMUL);
+        super(org.apache.tomcat.util.bcel.Constants.LMUL);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LNEG.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;
 
 /** 
  * LNEG - Negate long
@@ -26,7 +26,7 @@
 public class LNEG extends ArithmeticInstruction {
 
     public LNEG() {
-        super(org.apache.bcel.Constants.LNEG);
+        super(org.apache.tomcat.util.bcel.Constants.LNEG);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOOKUPSWITCH.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;
 
 /** 
  * LOOKUPSWITCH - Switch with unordered set of values
@@ -38,7 +38,7 @@
 
 
     public LOOKUPSWITCH(int[] match, InstructionHandle[] targets, InstructionHandle defaultTarget) {
-        super(org.apache.bcel.Constants.LOOKUPSWITCH, match, targets, defaultTarget);
+        super(org.apache.tomcat.util.bcel.Constants.LOOKUPSWITCH, match, targets, defaultTarget);
         length = (short) (9 + match_length * 8); /* alignment remainder assumed
          * 0 here, until dump time. */
         fixed_length = length;

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LOR.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;
 
 /** 
  * LOR - Bitwise OR long
@@ -26,7 +26,7 @@
 public class LOR extends ArithmeticInstruction {
 
     public LOR() {
-        super(org.apache.bcel.Constants.LOR);
+        super(org.apache.tomcat.util.bcel.Constants.LOR);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LREM.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;
 
 /**
  * LREM - Remainder of long
@@ -26,13 +26,13 @@
 public class LREM extends ArithmeticInstruction implements ExceptionThrower {
 
     public LREM() {
-        super(org.apache.bcel.Constants.LREM);
+        super(org.apache.tomcat.util.bcel.Constants.LREM);
     }
 
 
     public Class[] getExceptions() {
         return new Class[] {
-            org.apache.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
+            org.apache.tomcat.util.bcel.ExceptionConstants.ARITHMETIC_EXCEPTION
         };
     }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LRETURN.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;
 
 /** 
  * LRETURN -  Return long from method
@@ -26,7 +26,7 @@
 public class LRETURN extends ReturnInstruction {
 
     public LRETURN() {
-        super(org.apache.bcel.Constants.LRETURN);
+        super(org.apache.tomcat.util.bcel.Constants.LRETURN);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHL.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;
 
 /** 
  * LSHL - Arithmetic shift left long
@@ -26,7 +26,7 @@
 public class LSHL extends ArithmeticInstruction {
 
     public LSHL() {
-        super(org.apache.bcel.Constants.LSHL);
+        super(org.apache.tomcat.util.bcel.Constants.LSHL);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSHR.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;
 
 /** 
  * LSHR - Arithmetic shift right long
@@ -26,7 +26,7 @@
 public class LSHR extends ArithmeticInstruction {
 
     public LSHR() {
-        super(org.apache.bcel.Constants.LSHR);
+        super(org.apache.tomcat.util.bcel.Constants.LSHR);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSTORE.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;
 
 /** 
  * LSTORE - Store long into local variable
@@ -30,12 +30,12 @@
      * Instruction.readInstruction(). Not to be used otherwise.
      */
     LSTORE() {
-        super(org.apache.bcel.Constants.LSTORE, org.apache.bcel.Constants.LSTORE_0);
+        super(org.apache.tomcat.util.bcel.Constants.LSTORE, org.apache.tomcat.util.bcel.Constants.LSTORE_0);
     }
 
 
     public LSTORE(int n) {
-        super(org.apache.bcel.Constants.LSTORE, org.apache.bcel.Constants.LSTORE_0, n);
+        super(org.apache.tomcat.util.bcel.Constants.LSTORE, org.apache.tomcat.util.bcel.Constants.LSTORE_0, n);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LSUB.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;
 
 /** 
  * LSUB - Substract longs
@@ -27,7 +27,7 @@
 public class LSUB extends ArithmeticInstruction {
 
     public LSUB() {
-        super(org.apache.bcel.Constants.LSUB);
+        super(org.apache.tomcat.util.bcel.Constants.LSUB);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LUSHR.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;
 
 /** 
  * LUSHR - Logical shift right long
@@ -26,7 +26,7 @@
 public class LUSHR extends ArithmeticInstruction {
 
     public LUSHR() {
-        super(org.apache.bcel.Constants.LUSHR);
+        super(org.apache.tomcat.util.bcel.Constants.LUSHR);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LXOR.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;
 
 /** 
  * LXOR - Bitwise XOR long
@@ -26,7 +26,7 @@
 public class LXOR extends ArithmeticInstruction {
 
     public LXOR() {
-        super(org.apache.bcel.Constants.LXOR);
+        super(org.apache.tomcat.util.bcel.Constants.LXOR);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LineNumberGen.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.LineNumber;
+import org.apache.tomcat.util.bcel.classfile.LineNumber;
 
 /** 
  * This class represents a line number within a method, i.e., give an instruction

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadClass.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 that an instruction may start the process of loading and resolving 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LoadInstruction.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 an unparameterized instruction to load a value from a local

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableGen.java Fri Dec  4 17:59:52 2009
@@ -14,10 +14,10 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.LocalVariable;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.LocalVariable;
 
 /** 
  * This class represents a local variable within a method. It contains its

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LocalVariableInstruction.java Fri Dec  4 17:59:52 2009
@@ -14,12 +14,12 @@
  *  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.Constants;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
 
 /**
  * Abstract super class for instructions dealing with local variables.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITORENTER.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;
 
 /** 
  * MONITORENTER - Enter monitor for object
@@ -26,13 +26,13 @@
 public class MONITORENTER extends Instruction implements ExceptionThrower, StackConsumer {
 
     public MONITORENTER() {
-        super(org.apache.bcel.Constants.MONITORENTER, (short) 1);
+        super(org.apache.tomcat.util.bcel.Constants.MONITORENTER, (short) 1);
     }
 
 
     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/MONITOREXIT.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITOREXIT.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITOREXIT.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MONITOREXIT.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;
 
 /** 
  * MONITOREXIT - Exit monitor for object
@@ -26,13 +26,13 @@
 public class MONITOREXIT extends Instruction implements ExceptionThrower, StackConsumer {
 
     public MONITOREXIT() {
-        super(org.apache.bcel.Constants.MONITOREXIT, (short) 1);
+        super(org.apache.tomcat.util.bcel.Constants.MONITOREXIT, (short) 1);
     }
 
 
     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/MULTIANEWARRAY.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MULTIANEWARRAY.java Fri Dec  4 17:59:52 2009
@@ -14,13 +14,13 @@
  *  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.ExceptionConstants;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.util.ByteSequence;
+import org.apache.tomcat.util.bcel.ExceptionConstants;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.util.ByteSequence;
 
 /** 
  * MULTIANEWARRAY - Create new mutidimensional array of references
@@ -44,7 +44,7 @@
 
 
     public MULTIANEWARRAY(int index, short dimensions) {
-        super(org.apache.bcel.Constants.MULTIANEWARRAY, index);
+        super(org.apache.tomcat.util.bcel.Constants.MULTIANEWARRAY, index);
         if (dimensions < 1) {
             throw new ClassGenException("Invalid dimensions value: " + dimensions);
         }

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodGen.java Fri Dec  4 17:59:52 2009
@@ -14,31 +14,31 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Stack;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.AnnotationEntry;
-import org.apache.bcel.classfile.Annotations;
-import org.apache.bcel.classfile.Attribute;
-import org.apache.bcel.classfile.Code;
-import org.apache.bcel.classfile.CodeException;
-import org.apache.bcel.classfile.ExceptionTable;
-import org.apache.bcel.classfile.LineNumber;
-import org.apache.bcel.classfile.LineNumberTable;
-import org.apache.bcel.classfile.LocalVariable;
-import org.apache.bcel.classfile.LocalVariableTable;
-import org.apache.bcel.classfile.LocalVariableTypeTable;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.ParameterAnnotationEntry;
-import org.apache.bcel.classfile.ParameterAnnotations;
-import org.apache.bcel.classfile.RuntimeVisibleParameterAnnotations;
-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.AnnotationEntry;
+import org.apache.tomcat.util.bcel.classfile.Annotations;
+import org.apache.tomcat.util.bcel.classfile.Attribute;
+import org.apache.tomcat.util.bcel.classfile.Code;
+import org.apache.tomcat.util.bcel.classfile.CodeException;
+import org.apache.tomcat.util.bcel.classfile.ExceptionTable;
+import org.apache.tomcat.util.bcel.classfile.LineNumber;
+import org.apache.tomcat.util.bcel.classfile.LineNumberTable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariableTable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariableTypeTable;
+import org.apache.tomcat.util.bcel.classfile.Method;
+import org.apache.tomcat.util.bcel.classfile.ParameterAnnotationEntry;
+import org.apache.tomcat.util.bcel.classfile.ParameterAnnotations;
+import org.apache.tomcat.util.bcel.classfile.RuntimeVisibleParameterAnnotations;
+import org.apache.tomcat.util.bcel.classfile.Utility;
+import org.apache.tomcat.util.bcel.util.BCELComparator;
 
 /** 
  * Template class for building up a method. This is done by defining exception

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodObserver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodObserver.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodObserver.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/MethodObserver.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 MethodGen object

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEW.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;
 
 /** 
  * NEW - Create new object
@@ -37,7 +37,7 @@
 
 
     public NEW(int index) {
-        super(org.apache.bcel.Constants.NEW, index);
+        super(org.apache.tomcat.util.bcel.Constants.NEW, index);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NEWARRAY.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;
 
 /** 
  * NEWARRAY -  Create new array of basic type (int, short, ...)
@@ -43,7 +43,7 @@
 
 
     public NEWARRAY(byte type) {
-        super(org.apache.bcel.Constants.NEWARRAY, (short) 2);
+        super(org.apache.tomcat.util.bcel.Constants.NEWARRAY, (short) 2);
         this.type = type;
     }
 
@@ -83,7 +83,7 @@
      * @return mnemonic for instruction
      */
     public String toString( boolean verbose ) {
-        return super.toString(verbose) + " " + org.apache.bcel.Constants.TYPE_NAMES[type];
+        return super.toString(verbose) + " " + org.apache.tomcat.util.bcel.Constants.TYPE_NAMES[type];
     }
 
 
@@ -98,7 +98,7 @@
 
     public Class[] getExceptions() {
         return new Class[] {
-            org.apache.bcel.ExceptionConstants.NEGATIVE_ARRAY_SIZE_EXCEPTION
+            org.apache.tomcat.util.bcel.ExceptionConstants.NEGATIVE_ARRAY_SIZE_EXCEPTION
         };
     }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NOP.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NOP.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NOP.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NOP.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;
 
 /**
  * NOP - Do nothing
@@ -25,7 +25,7 @@
 public class NOP extends Instruction {
 
     public NOP() {
-        super(org.apache.bcel.Constants.NOP, (short) 1);
+        super(org.apache.tomcat.util.bcel.Constants.NOP, (short) 1);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/NamedAndTyped.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 entity that has both name and type. This is true for local variables,

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ObjectType.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 org.apache.bcel.Constants;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
 
 /** 
  * Denotes reference such as java.lang.String.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP.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;
 
 /**
  * POP - Pop top operand stack word
@@ -27,7 +27,7 @@
 public class POP extends StackInstruction implements PopInstruction {
 
     public POP() {
-        super(org.apache.bcel.Constants.POP);
+        super(org.apache.tomcat.util.bcel.Constants.POP);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP2.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP2.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP2.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/POP2.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;
 
 /**
  * POP2 - Pop two top operand stack words
@@ -27,7 +27,7 @@
 public class POP2 extends StackInstruction implements PopInstruction {
 
     public POP2() {
-        super(org.apache.bcel.Constants.POP2);
+        super(org.apache.tomcat.util.bcel.Constants.POP2);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUSH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUSH.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUSH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUSH.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;
 
 /** 
  * Wrapper class for push operations, which are implemented either as BIPUSH,

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTFIELD.java Fri Dec  4 17:59:52 2009
@@ -14,10 +14,10 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.ExceptionConstants;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.ExceptionConstants;
 
 /** 
  * PUTFIELD - Put field in object

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PUTSTATIC.java Fri Dec  4 17:59:52 2009
@@ -14,10 +14,10 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.ExceptionConstants;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.ExceptionConstants;
 
 /** 
  * PUTSTATIC - Put static field in class

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PopInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PopInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PopInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PopInstruction.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 an unparameterized instruction to pop a value on top from the stack,

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PushInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PushInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PushInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/PushInstruction.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 an unparameterized instruction to produce a value on top of the stack,

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RET.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;
 
 /** 
  * RET - Return from subroutine
@@ -43,7 +43,7 @@
 
 
     public RET(int index) {
-        super(org.apache.bcel.Constants.RET, (short) 2);
+        super(org.apache.tomcat.util.bcel.Constants.RET, (short) 2);
         setIndex(index); // May set wide as side effect
     }
 
@@ -54,7 +54,7 @@
      */
     public void dump( DataOutputStream out ) throws IOException {
         if (wide) {
-            out.writeByte(org.apache.bcel.Constants.WIDE);
+            out.writeByte(org.apache.tomcat.util.bcel.Constants.WIDE);
         }
         out.writeByte(opcode);
         if (wide) {
@@ -66,7 +66,7 @@
 
 
     private final void setWide() {
-        wide = index > org.apache.bcel.Constants.MAX_BYTE;
+        wide = index > org.apache.tomcat.util.bcel.Constants.MAX_BYTE;
         if (wide) {
             length = 4; // Including the wide byte  
         } else {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RETURN.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RETURN.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RETURN.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/RETURN.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;
 
 /** 
  * RETURN -  Return from void method
@@ -26,7 +26,7 @@
 public class RETURN extends ReturnInstruction {
 
     public RETURN() {
-        super(org.apache.bcel.Constants.RETURN);
+        super(org.apache.tomcat.util.bcel.Constants.RETURN);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReferenceType.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 org.apache.bcel.Constants;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
 
 /**
  * Super class for object and array types.

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReturnaddressType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReturnaddressType.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReturnaddressType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ReturnaddressType.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;
 
 /** 
  * Returnaddress, the type JSR or JSR_W instructions push upon the stack.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SALOAD.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SALOAD.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SALOAD.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SALOAD.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;
 
 /** 
  * SALOAD - Load short from array
@@ -26,7 +26,7 @@
 public class SALOAD extends ArrayInstruction implements StackProducer {
 
     public SALOAD() {
-        super(org.apache.bcel.Constants.SALOAD);
+        super(org.apache.tomcat.util.bcel.Constants.SALOAD);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SASTORE.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SASTORE.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SASTORE.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SASTORE.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;
 
 /**
  * SASTORE - Store into short array
@@ -26,7 +26,7 @@
 public class SASTORE extends ArrayInstruction implements StackConsumer {
 
     public SASTORE() {
-        super(org.apache.bcel.Constants.SASTORE);
+        super(org.apache.tomcat.util.bcel.Constants.SASTORE);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SIPUSH.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;
 
 /**
  * SIPUSH - Push short
@@ -42,7 +42,7 @@
 
 
     public SIPUSH(short b) {
-        super(org.apache.bcel.Constants.SIPUSH, (short) 3);
+        super(org.apache.tomcat.util.bcel.Constants.SIPUSH, (short) 3);
         this.b = b;
     }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWAP.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWAP.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWAP.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWAP.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;
 
 /** 
  * SWAP - Swa top operand stack word
@@ -26,7 +26,7 @@
 public class SWAP extends StackInstruction implements StackConsumer, StackProducer {
 
     public SWAP() {
-        super(org.apache.bcel.Constants.SWAP);
+        super(org.apache.tomcat.util.bcel.Constants.SWAP);
     }
 
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWITCH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWITCH.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWITCH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SWITCH.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;
 
 /** 
  * SWITCH - Branch depending on int value, generates either LOOKUPSWITCH or

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Select.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;
 
 /** 
  * Select - Abstract super class for LOOKUPSWITCH and TABLESWITCH instructions.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SimpleElementValueGen.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SimpleElementValueGen.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SimpleElementValueGen.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/SimpleElementValueGen.java Fri Dec  4 17:59:52 2009
@@ -1,14 +1,14 @@
-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.ConstantDouble;
-import org.apache.bcel.classfile.ConstantFloat;
-import org.apache.bcel.classfile.ConstantInteger;
-import org.apache.bcel.classfile.ConstantLong;
-import org.apache.bcel.classfile.ConstantUtf8;
-import org.apache.bcel.classfile.ElementValue;
-import org.apache.bcel.classfile.SimpleElementValue;
+import org.apache.tomcat.util.bcel.classfile.ConstantDouble;
+import org.apache.tomcat.util.bcel.classfile.ConstantFloat;
+import org.apache.tomcat.util.bcel.classfile.ConstantInteger;
+import org.apache.tomcat.util.bcel.classfile.ConstantLong;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.ElementValue;
+import org.apache.tomcat.util.bcel.classfile.SimpleElementValue;
 
 public class SimpleElementValueGen extends ElementValueGen
 {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackConsumer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackConsumer.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackConsumer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackConsumer.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 consume a value from the stack.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackInstruction.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 stack operations like DUP and POP.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackProducer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackProducer.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackProducer.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StackProducer.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 produce a value on top of the stack

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StoreInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StoreInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StoreInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/StoreInstruction.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 an unparameterized instruction to store a value into a local variable,

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TABLESWITCH.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;
 
 /** 
  * TABLESWITCH - Switch within given range of values, i.e., low..high
@@ -44,7 +44,7 @@
      * @param defaultTarget default branch
      */
     public TABLESWITCH(int[] match, InstructionHandle[] targets, InstructionHandle defaultTarget) {
-        super(org.apache.bcel.Constants.TABLESWITCH, match, targets, defaultTarget);
+        super(org.apache.tomcat.util.bcel.Constants.TABLESWITCH, match, targets, defaultTarget);
         length = (short) (13 + match_length * 4); /* Alignment remainder assumed
          * 0 here, until dump time */
         fixed_length = length;

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TargetLostException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TargetLostException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TargetLostException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TargetLostException.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 by InstructionList.remove() when one or multiple disposed instruction

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Type.java Fri Dec  4 17:59:52 2009
@@ -14,13 +14,13 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.generic;
+package org.apache.tomcat.util.bcel.generic;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.ClassFormatException;
-import org.apache.bcel.classfile.Utility;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.ClassFormatException;
+import org.apache.tomcat.util.bcel.classfile.Utility;
 
 /** 
  * Abstract super class for all possible java types, namely basic types

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TypedInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TypedInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TypedInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/TypedInstruction.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;
 
 /**
  * Get the type associated with an instruction, int for ILOAD, or the type

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/UnconditionalBranch.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/UnconditionalBranch.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/UnconditionalBranch.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/UnconditionalBranch.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 an instruction to perform an unconditional branch, i.e., GOTO, JSR.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/VariableLengthInstruction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/VariableLengthInstruction.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/VariableLengthInstruction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/VariableLengthInstruction.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 an instruction to be a variable length instruction, such as

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Visitor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Visitor.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Visitor.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Visitor.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;
 
 /**
  * Interface implementing the Visitor pattern programming style.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/AttributeHTML.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/AttributeHTML.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/AttributeHTML.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/AttributeHTML.java Fri Dec  4 17:59:52 2009
@@ -14,26 +14,26 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
-import org.apache.bcel.classfile.Attribute;
-import org.apache.bcel.classfile.Code;
-import org.apache.bcel.classfile.CodeException;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.ConstantUtf8;
-import org.apache.bcel.classfile.ConstantValue;
-import org.apache.bcel.classfile.ExceptionTable;
-import org.apache.bcel.classfile.InnerClass;
-import org.apache.bcel.classfile.InnerClasses;
-import org.apache.bcel.classfile.LineNumber;
-import org.apache.bcel.classfile.LineNumberTable;
-import org.apache.bcel.classfile.LocalVariable;
-import org.apache.bcel.classfile.LocalVariableTable;
-import org.apache.bcel.classfile.SourceFile;
-import org.apache.bcel.classfile.Utility;
+import org.apache.tomcat.util.bcel.classfile.Attribute;
+import org.apache.tomcat.util.bcel.classfile.Code;
+import org.apache.tomcat.util.bcel.classfile.CodeException;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.ConstantValue;
+import org.apache.tomcat.util.bcel.classfile.ExceptionTable;
+import org.apache.tomcat.util.bcel.classfile.InnerClass;
+import org.apache.tomcat.util.bcel.classfile.InnerClasses;
+import org.apache.tomcat.util.bcel.classfile.LineNumber;
+import org.apache.tomcat.util.bcel.classfile.LineNumberTable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariableTable;
+import org.apache.tomcat.util.bcel.classfile.SourceFile;
+import org.apache.tomcat.util.bcel.classfile.Utility;
 
 /**
  * Convert found attributes into HTML file.
@@ -42,7 +42,7 @@
  * @author  <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
  * 
  */
-final class AttributeHTML implements org.apache.bcel.Constants {
+final class AttributeHTML implements org.apache.tomcat.util.bcel.Constants {
 
     private String class_name; // name of current class
     private PrintWriter file; // file to write to

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELComparator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELComparator.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELComparator.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELComparator.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 /**
  * Used for BCEL comparison strategy

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELFactory.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELFactory.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -24,37 +24,37 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.Utility;
-import org.apache.bcel.generic.AllocationInstruction;
-import org.apache.bcel.generic.ArrayInstruction;
-import org.apache.bcel.generic.ArrayType;
-import org.apache.bcel.generic.BranchHandle;
-import org.apache.bcel.generic.BranchInstruction;
-import org.apache.bcel.generic.CHECKCAST;
-import org.apache.bcel.generic.CPInstruction;
-import org.apache.bcel.generic.CodeExceptionGen;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.ConstantPushInstruction;
-import org.apache.bcel.generic.EmptyVisitor;
-import org.apache.bcel.generic.FieldInstruction;
-import org.apache.bcel.generic.IINC;
-import org.apache.bcel.generic.INSTANCEOF;
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.InstructionConstants;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.InvokeInstruction;
-import org.apache.bcel.generic.LDC;
-import org.apache.bcel.generic.LDC2_W;
-import org.apache.bcel.generic.LocalVariableInstruction;
-import org.apache.bcel.generic.MULTIANEWARRAY;
-import org.apache.bcel.generic.MethodGen;
-import org.apache.bcel.generic.NEWARRAY;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.RET;
-import org.apache.bcel.generic.ReturnInstruction;
-import org.apache.bcel.generic.Select;
-import org.apache.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.Utility;
+import org.apache.tomcat.util.bcel.generic.AllocationInstruction;
+import org.apache.tomcat.util.bcel.generic.ArrayInstruction;
+import org.apache.tomcat.util.bcel.generic.ArrayType;
+import org.apache.tomcat.util.bcel.generic.BranchHandle;
+import org.apache.tomcat.util.bcel.generic.BranchInstruction;
+import org.apache.tomcat.util.bcel.generic.CHECKCAST;
+import org.apache.tomcat.util.bcel.generic.CPInstruction;
+import org.apache.tomcat.util.bcel.generic.CodeExceptionGen;
+import org.apache.tomcat.util.bcel.generic.ConstantPoolGen;
+import org.apache.tomcat.util.bcel.generic.ConstantPushInstruction;
+import org.apache.tomcat.util.bcel.generic.EmptyVisitor;
+import org.apache.tomcat.util.bcel.generic.FieldInstruction;
+import org.apache.tomcat.util.bcel.generic.IINC;
+import org.apache.tomcat.util.bcel.generic.INSTANCEOF;
+import org.apache.tomcat.util.bcel.generic.Instruction;
+import org.apache.tomcat.util.bcel.generic.InstructionConstants;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.InvokeInstruction;
+import org.apache.tomcat.util.bcel.generic.LDC;
+import org.apache.tomcat.util.bcel.generic.LDC2_W;
+import org.apache.tomcat.util.bcel.generic.LocalVariableInstruction;
+import org.apache.tomcat.util.bcel.generic.MULTIANEWARRAY;
+import org.apache.tomcat.util.bcel.generic.MethodGen;
+import org.apache.tomcat.util.bcel.generic.NEWARRAY;
+import org.apache.tomcat.util.bcel.generic.ObjectType;
+import org.apache.tomcat.util.bcel.generic.RET;
+import org.apache.tomcat.util.bcel.generic.ReturnInstruction;
+import org.apache.tomcat.util.bcel.generic.Select;
+import org.apache.tomcat.util.bcel.generic.Type;
 
 /**
  * Factory creates il.append() statements, and sets instruction targets.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/BCELifier.java Fri Dec  4 17:59:52 2009
@@ -14,23 +14,23 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.Locale;
-import org.apache.bcel.Constants;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.ClassParser;
-import org.apache.bcel.classfile.ConstantValue;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.Utility;
-import org.apache.bcel.generic.ArrayType;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.MethodGen;
-import org.apache.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.ClassParser;
+import org.apache.tomcat.util.bcel.classfile.ConstantValue;
+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.Utility;
+import org.apache.tomcat.util.bcel.generic.ArrayType;
+import org.apache.tomcat.util.bcel.generic.ConstantPoolGen;
+import org.apache.tomcat.util.bcel.generic.MethodGen;
+import org.apache.tomcat.util.bcel.generic.Type;
 
 /** 
  * This class takes a given JavaClass object and converts it to a
@@ -42,7 +42,7 @@
  * @version $Id$
  * @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A> 
  */
-public class BCELifier extends org.apache.bcel.classfile.EmptyVisitor {
+public class BCELifier extends org.apache.tomcat.util.bcel.classfile.EmptyVisitor {
 
     private static final int FLAG_FOR_UNKNOWN = -1;
     private static final int FLAG_FOR_CLASS = 0;
@@ -80,9 +80,9 @@
             _out.println("package " + package_name + ";");
             _out.println();
         }
-        _out.println("import org.apache.bcel.generic.*;");
-        _out.println("import org.apache.bcel.classfile.*;");
-        _out.println("import org.apache.bcel.*;");
+        _out.println("import org.apache.tomcat.util.bcel.generic.*;");
+        _out.println("import org.apache.tomcat.util.bcel.classfile.*;");
+        _out.println("import org.apache.tomcat.util.bcel.*;");
         _out.println("import java.io.*;");
         _out.println();
         _out.println("public class " + class_name + "Creator implements Constants {");

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ByteSequence.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ByteSequence.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ByteSequence.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ByteSequence.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Class2HTML.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Class2HTML.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Class2HTML.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Class2HTML.java Fri Dec  4 17:59:52 2009
@@ -14,19 +14,19 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.Attribute;
-import org.apache.bcel.classfile.ClassParser;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.Utility;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.Attribute;
+import org.apache.tomcat.util.bcel.classfile.ClassParser;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.Method;
+import org.apache.tomcat.util.bcel.classfile.Utility;
 
 /**
  * Read class file(s) and convert them into HTML files.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassLoader.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassLoader.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassLoader.java Fri Dec  4 17:59:52 2009
@@ -14,17 +14,17 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.io.ByteArrayInputStream;
 import java.util.Hashtable;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.ClassParser;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.ConstantUtf8;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.Utility;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.ClassParser;
+import org.apache.tomcat.util.bcel.classfile.ConstantClass;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.Utility;
 
 /**
  * <p>Drop in replacement for the standard class loader of the JVM. You can use it

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassLoaderRepository.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassLoaderRepository.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassLoaderRepository.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassLoaderRepository.java Fri Dec  4 17:59:52 2009
@@ -14,14 +14,14 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.bcel.classfile.ClassParser;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.ClassParser;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
 
 /**
  * The repository maintains information about which classes have
@@ -30,7 +30,7 @@
  * It loads its data from the ClassLoader implementation
  * passed into its constructor.
  *
- * @see org.apache.bcel.Repository
+ * @see org.apache.tomcat.util.bcel.Repository
  *
  * @version $Id$
  * @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassPath.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassPath.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassPath.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassPath.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.io.DataInputStream;
 import java.io.File;

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassQueue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassQueue.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassQueue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassQueue.java Fri Dec  4 17:59:52 2009
@@ -14,10 +14,10 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.util.LinkedList;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
 
 /** 
  * Utility class implementing a (typesafe) queue of JavaClass

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassSet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassSet.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassSet.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassSet.java Fri Dec  4 17:59:52 2009
@@ -14,12 +14,12 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
 
 /** 
  * Utility class implementing a (typesafe) set of JavaClass objects.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassStack.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassStack.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassStack.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassStack.java Fri Dec  4 17:59:52 2009
@@ -14,10 +14,10 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.util.Stack;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
 
 /** 
  * Utility class implementing a (typesafe) stack of JavaClass objects.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassVector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassVector.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassVector.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ClassVector.java Fri Dec  4 17:59:52 2009
@@ -14,11 +14,11 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
 
 /** 
  * Utility class implementing a (typesafe) collection of JavaClass

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/CodeHTML.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/CodeHTML.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/CodeHTML.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/CodeHTML.java Fri Dec  4 17:59:52 2009
@@ -14,24 +14,24 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.BitSet;
-import org.apache.bcel.classfile.Attribute;
-import org.apache.bcel.classfile.Code;
-import org.apache.bcel.classfile.CodeException;
-import org.apache.bcel.classfile.ConstantFieldref;
-import org.apache.bcel.classfile.ConstantInterfaceMethodref;
-import org.apache.bcel.classfile.ConstantMethodref;
-import org.apache.bcel.classfile.ConstantNameAndType;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.LocalVariable;
-import org.apache.bcel.classfile.LocalVariableTable;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.Utility;
+import org.apache.tomcat.util.bcel.classfile.Attribute;
+import org.apache.tomcat.util.bcel.classfile.Code;
+import org.apache.tomcat.util.bcel.classfile.CodeException;
+import org.apache.tomcat.util.bcel.classfile.ConstantFieldref;
+import org.apache.tomcat.util.bcel.classfile.ConstantInterfaceMethodref;
+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.LocalVariable;
+import org.apache.tomcat.util.bcel.classfile.LocalVariableTable;
+import org.apache.tomcat.util.bcel.classfile.Method;
+import org.apache.tomcat.util.bcel.classfile.Utility;
 
 /**
  * Convert code into HTML file.
@@ -40,7 +40,7 @@
  * @author  <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
  * 
  */
-final class CodeHTML implements org.apache.bcel.Constants {
+final class CodeHTML implements org.apache.tomcat.util.bcel.Constants {
 
     private String class_name; // name of current class
 //    private Method[] methods; // Methods to print

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ConstantHTML.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ConstantHTML.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ConstantHTML.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/ConstantHTML.java Fri Dec  4 17:59:52 2009
@@ -14,21 +14,21 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantFieldref;
-import org.apache.bcel.classfile.ConstantInterfaceMethodref;
-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.Method;
-import org.apache.bcel.classfile.Utility;
+import org.apache.tomcat.util.bcel.classfile.Constant;
+import org.apache.tomcat.util.bcel.classfile.ConstantClass;
+import org.apache.tomcat.util.bcel.classfile.ConstantFieldref;
+import org.apache.tomcat.util.bcel.classfile.ConstantInterfaceMethodref;
+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.Method;
+import org.apache.tomcat.util.bcel.classfile.Utility;
 
 /**
  * Convert constant pool into HTML file.
@@ -37,7 +37,7 @@
  * @author  <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
  * 
  */
-final class ConstantHTML implements org.apache.bcel.Constants {
+final class ConstantHTML implements org.apache.tomcat.util.bcel.Constants {
 
     private String class_name; // name of current class
     private String class_package; // name of package

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/InstructionFinder.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/InstructionFinder.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/InstructionFinder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/InstructionFinder.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,11 +25,11 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.ClassGenException;
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.InstructionList;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.generic.ClassGenException;
+import org.apache.tomcat.util.bcel.generic.Instruction;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.InstructionList;
 
 /**
  * InstructionFinder is a tool to search for given instructions patterns, i.e.,

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/JavaWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/JavaWrapper.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/JavaWrapper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/JavaWrapper.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -24,11 +24,11 @@
  * to modify/generate classes as they're requested. You can take this as a template
  * for your own applications.<br>
  * Call this wrapper with
- * <pre>java org.apache.bcel.util.JavaWrapper &lt;real.class.name&gt; [arguments]</pre>
+ * <pre>java org.apache.tomcat.util.bcel.util.JavaWrapper &lt;real.class.name&gt; [arguments]</pre>
  * <p>
  * To use your own class loader you can set the "bcel.classloader" system property
- * which defaults to "org.apache.bcel.util.ClassLoader", e.g., with
- * <pre>java org.apache.bcel.util.JavaWrapper -Dbcel.classloader=foo.MyLoader &lt;real.class.name&gt; [arguments]</pre>
+ * which defaults to "org.apache.tomcat.util.bcel.util.ClassLoader", e.g., with
+ * <pre>java org.apache.tomcat.util.bcel.util.JavaWrapper -Dbcel.classloader=foo.MyLoader &lt;real.class.name&gt; [arguments]</pre>
  * </p>
  *
  * @version $Id$
@@ -43,7 +43,7 @@
     private static java.lang.ClassLoader getClassLoader() {
         String s = System.getProperty("bcel.classloader");
         if ((s == null) || "".equals(s)) {
-            s = "org.apache.bcel.util.ClassLoader";
+            s = "org.apache.tomcat.util.bcel.util.ClassLoader";
         }
         try {
             return (java.lang.ClassLoader) Class.forName(s).newInstance();

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/MethodHTML.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/MethodHTML.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/MethodHTML.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/MethodHTML.java Fri Dec  4 17:59:52 2009
@@ -14,18 +14,18 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
-import org.apache.bcel.classfile.Attribute;
-import org.apache.bcel.classfile.Code;
-import org.apache.bcel.classfile.ConstantValue;
-import org.apache.bcel.classfile.ExceptionTable;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.Utility;
+import org.apache.tomcat.util.bcel.classfile.Attribute;
+import org.apache.tomcat.util.bcel.classfile.Code;
+import org.apache.tomcat.util.bcel.classfile.ConstantValue;
+import org.apache.tomcat.util.bcel.classfile.ExceptionTable;
+import org.apache.tomcat.util.bcel.classfile.Field;
+import org.apache.tomcat.util.bcel.classfile.Method;
+import org.apache.tomcat.util.bcel.classfile.Utility;
 
 /**
  * Convert methods and fields into HTML file.
@@ -34,7 +34,7 @@
  * @author  <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
  * 
  */
-final class MethodHTML implements org.apache.bcel.Constants {
+final class MethodHTML implements org.apache.tomcat.util.bcel.Constants {
 
     private String class_name; // name of current class
     private PrintWriter file; // file to write to

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Repository.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Repository.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Repository.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/Repository.java Fri Dec  4 17:59:52 2009
@@ -14,16 +14,16 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
 
 /**
  * Abstract definition of a class repository. Instances may be used
  * to load classes from different sources and may be used in the
  * Repository.setRepository method.
  *
- * @see org.apache.bcel.Repository
+ * @see org.apache.tomcat.util.bcel.Repository
  * @version $Id$
  * @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
  * @author David Dixon-Peugh

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/util/SyntheticRepository.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/util/SyntheticRepository.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/util/SyntheticRepository.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/util/SyntheticRepository.java Fri Dec  4 17:59:52 2009
@@ -14,15 +14,15 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.util;
+package org.apache.tomcat.util.bcel.util;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.ref.SoftReference;
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.bcel.classfile.ClassParser;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.ClassParser;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
 
 /**
  * This repository is used in situations where a Class is created
@@ -39,7 +39,7 @@
  * to load classes from different sources and may be used in the
  * Repository.setRepository method.
  *
- * @see org.apache.bcel.Repository
+ * @see org.apache.tomcat.util.bcel.Repository
  *
  * @version $Id$
  * @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>



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


Mime
View raw message