Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 69059 invoked from network); 4 Dec 2009 17:51:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Dec 2009 17:51:03 -0000 Received: (qmail 2700 invoked by uid 500); 4 Dec 2009 17:50:45 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 2587 invoked by uid 500); 4 Dec 2009 17:50:43 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 2546 invoked by uid 99); 4 Dec 2009 17:50:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Dec 2009 17:50:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Dec 2009 17:50:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A99FC2388978; Fri, 4 Dec 2009 17:50:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r887296 [3/4] - in /tomcat/trunk/java/org/apache/tomcat/util/bcel: ./ classfile/ generic/ util/ verifier/ verifier/exc/ verifier/statics/ verifier/structurals/ Date: Fri, 04 Dec 2009 17:50:00 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091204175011.A99FC2388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldGenOrMethodGen.java Fri Dec 4 17:49:49 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.AccessFlags; -import org.apache.bcel.classfile.Attribute; +import org.apache.tomcat.util.bcel.Constants; +import org.apache.tomcat.util.bcel.classfile.AccessFlags; +import org.apache.tomcat.util.bcel.classfile.Attribute; /** * Super class for FieldGen and MethodGen objects, since they have Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldInstruction.java Fri Dec 4 17:49:49 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.ConstantPool; +import org.apache.tomcat.util.bcel.classfile.ConstantPool; /** * Super class for the GET/PUTxxx family of instructions. @@ -46,8 +46,8 @@ * @return mnemonic for instruction with symbolic references resolved */ public String toString( ConstantPool cp ) { - return org.apache.bcel.Constants.OPCODE_NAMES[opcode] + " " - + cp.constantToString(index, org.apache.bcel.Constants.CONSTANT_Fieldref); + return org.apache.tomcat.util.bcel.Constants.OPCODE_NAMES[opcode] + " " + + cp.constantToString(index, org.apache.tomcat.util.bcel.Constants.CONSTANT_Fieldref); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldObserver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldObserver.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldObserver.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldObserver.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * Imnplement this interface if you're interested in changes to a FieldGen object Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/FieldOrMethod.java Fri Dec 4 17:49:49 2009 @@ -14,12 +14,12 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; -import org.apache.bcel.classfile.ConstantCP; -import org.apache.bcel.classfile.ConstantNameAndType; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.ConstantUtf8; +import org.apache.tomcat.util.bcel.classfile.ConstantCP; +import org.apache.tomcat.util.bcel.classfile.ConstantNameAndType; +import org.apache.tomcat.util.bcel.classfile.ConstantPool; +import org.apache.tomcat.util.bcel.classfile.ConstantUtf8; /** * Super class for InvokeInstruction and FieldInstruction, since they have @@ -79,7 +79,7 @@ ConstantPool cp = cpg.getConstantPool(); ConstantCP cmr = (ConstantCP) cp.getConstant(index); String className = cp.getConstantString(cmr.getClassIndex(), - org.apache.bcel.Constants.CONSTANT_Class); + org.apache.tomcat.util.bcel.Constants.CONSTANT_Class); if (className.startsWith("[")) { // Turn array classes into java.lang.Object. return "java.lang.Object"; @@ -110,7 +110,7 @@ ConstantPool cp = cpg.getConstantPool(); ConstantCP cmr = (ConstantCP) cp.getConstant(index); String className = cp.getConstantString(cmr.getClassIndex(), - org.apache.bcel.Constants.CONSTANT_Class); + org.apache.tomcat.util.bcel.Constants.CONSTANT_Class); if (className.startsWith("[")) { return (ArrayType) Type.getType(className); } else { Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETFIELD.java Fri Dec 4 17:49:49 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; /** * GETFIELD - Fetch field from object Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GETSTATIC.java Fri Dec 4 17:49:49 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; /** * GETSTATIC - Fetch static field from class Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; import java.io.DataOutputStream; import java.io.IOException; @@ -36,7 +36,7 @@ public GOTO(InstructionHandle target) { - super(org.apache.bcel.Constants.GOTO, target); + super(org.apache.tomcat.util.bcel.Constants.GOTO, target); } @@ -46,7 +46,7 @@ */ public void dump( DataOutputStream out ) throws IOException { index = getTargetOffset(); - if (opcode == org.apache.bcel.Constants.GOTO) { + if (opcode == org.apache.tomcat.util.bcel.Constants.GOTO) { super.dump(out); } else { // GOTO_W index = getTargetOffset(); @@ -63,7 +63,7 @@ int i = getTargetOffset(); // Depending on old position value position += offset; // Position may be shifted by preceding expansions if (Math.abs(i) >= (32767 - max_offset)) { // to large for short (estimate) - opcode = org.apache.bcel.Constants.GOTO_W; + opcode = org.apache.tomcat.util.bcel.Constants.GOTO_W; length = 5; return 2; // 5 - 3 } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GOTO_W.java Fri Dec 4 17:49:49 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; /** * GOTO_W - Branch always (to relative offset, not absolute address) @@ -37,7 +37,7 @@ public GOTO_W(InstructionHandle target) { - super(org.apache.bcel.Constants.GOTO_W, target); + super(org.apache.tomcat.util.bcel.Constants.GOTO_W, target); length = 5; } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/GotoInstruction.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * Super class for GOTO Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2B.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * I2B - Convert int to byte @@ -28,7 +28,7 @@ /** Convert int to byte */ public I2B() { - super(org.apache.bcel.Constants.I2B); + super(org.apache.tomcat.util.bcel.Constants.I2B); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2C.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * I2C - Convert int to char @@ -28,7 +28,7 @@ /** Convert int to char */ public I2C() { - super(org.apache.bcel.Constants.I2C); + super(org.apache.tomcat.util.bcel.Constants.I2C); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2D.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * I2D - Convert int to double @@ -28,7 +28,7 @@ /** Convert int to double */ public I2D() { - super(org.apache.bcel.Constants.I2D); + super(org.apache.tomcat.util.bcel.Constants.I2D); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2F.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * I2F - Convert int to float @@ -28,7 +28,7 @@ /** Convert int to float */ public I2F() { - super(org.apache.bcel.Constants.I2F); + super(org.apache.tomcat.util.bcel.Constants.I2F); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2L.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * I2L - Convert int to long @@ -28,7 +28,7 @@ /** Convert int to long */ public I2L() { - super(org.apache.bcel.Constants.I2L); + super(org.apache.tomcat.util.bcel.Constants.I2L); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/I2S.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * I2S - Convert int to short @@ -26,7 +26,7 @@ public class I2S extends ConversionInstruction { public I2S() { - super(org.apache.bcel.Constants.I2S); + super(org.apache.tomcat.util.bcel.Constants.I2S); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IADD.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IADD - Add ints @@ -28,7 +28,7 @@ /** Add ints */ public IADD() { - super(org.apache.bcel.Constants.IADD); + super(org.apache.tomcat.util.bcel.Constants.IADD); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IALOAD.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IALOAD - Load int from array @@ -29,7 +29,7 @@ * Load int from array */ public IALOAD() { - super(org.apache.bcel.Constants.IALOAD); + super(org.apache.tomcat.util.bcel.Constants.IALOAD); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IAND.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IAND - Bitwise AND int @@ -26,7 +26,7 @@ public class IAND extends ArithmeticInstruction { public IAND() { - super(org.apache.bcel.Constants.IAND); + super(org.apache.tomcat.util.bcel.Constants.IAND); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IASTORE.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IASTORE - Store into int array @@ -29,7 +29,7 @@ * Store into int array */ public IASTORE() { - super(org.apache.bcel.Constants.IASTORE); + super(org.apache.tomcat.util.bcel.Constants.IASTORE); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ICONST.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * ICONST - Push value between -1, ..., 5, other values cause an exception @@ -38,9 +38,9 @@ public ICONST(int i) { - super(org.apache.bcel.Constants.ICONST_0, (short) 1); + super(org.apache.tomcat.util.bcel.Constants.ICONST_0, (short) 1); if ((i >= -1) && (i <= 5)) { - opcode = (short) (org.apache.bcel.Constants.ICONST_0 + i); // Even works for i == -1 + opcode = (short) (org.apache.tomcat.util.bcel.Constants.ICONST_0 + i); // Even works for i == -1 } else { throw new ClassGenException("ICONST can be used only for value between -1 and 5: " + i); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IDIV.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IDIV - Divide ints @@ -28,7 +28,7 @@ /** Divide ints */ public IDIV() { - super(org.apache.bcel.Constants.IDIV); + super(org.apache.tomcat.util.bcel.Constants.IDIV); } @@ -36,7 +36,7 @@ */ 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/IFEQ.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFEQ.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFEQ.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFEQ.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IFEQ - Branch if int comparison with zero succeeds @@ -35,7 +35,7 @@ public IFEQ(InstructionHandle target) { - super(org.apache.bcel.Constants.IFEQ, target); + super(org.apache.tomcat.util.bcel.Constants.IFEQ, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGE.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGE.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGE.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGE.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IFGE - Branch if int comparison with zero succeeds @@ -35,7 +35,7 @@ public IFGE(InstructionHandle target) { - super(org.apache.bcel.Constants.IFGE, target); + super(org.apache.tomcat.util.bcel.Constants.IFGE, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGT.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGT.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGT.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFGT.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IFGT - Branch if int comparison with zero succeeds @@ -35,7 +35,7 @@ public IFGT(InstructionHandle target) { - super(org.apache.bcel.Constants.IFGT, target); + super(org.apache.tomcat.util.bcel.Constants.IFGT, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLE.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLE.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLE.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLE.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IFLE - Branch if int comparison with zero succeeds @@ -35,7 +35,7 @@ public IFLE(InstructionHandle target) { - super(org.apache.bcel.Constants.IFLE, target); + super(org.apache.tomcat.util.bcel.Constants.IFLE, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLT.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLT.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLT.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFLT.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IFLT - Branch if int comparison with zero succeeds @@ -35,7 +35,7 @@ public IFLT(InstructionHandle target) { - super(org.apache.bcel.Constants.IFLT, target); + super(org.apache.tomcat.util.bcel.Constants.IFLT, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNE.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNE.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNE.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNE.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IFNE - Branch if int comparison with zero succeeds @@ -35,7 +35,7 @@ public IFNE(InstructionHandle target) { - super(org.apache.bcel.Constants.IFNE, target); + super(org.apache.tomcat.util.bcel.Constants.IFNE, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNONNULL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNONNULL.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNONNULL.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNONNULL.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IFNONNULL - Branch if reference is not null @@ -35,7 +35,7 @@ public IFNONNULL(InstructionHandle target) { - super(org.apache.bcel.Constants.IFNONNULL, target); + super(org.apache.tomcat.util.bcel.Constants.IFNONNULL, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNULL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNULL.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNULL.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IFNULL.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IFNULL - Branch if reference is not null @@ -35,7 +35,7 @@ public IFNULL(InstructionHandle target) { - super(org.apache.bcel.Constants.IFNULL, target); + super(org.apache.tomcat.util.bcel.Constants.IFNULL, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPEQ.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPEQ.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPEQ.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPEQ.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IF_ACMPEQ - Branch if reference comparison succeeds @@ -35,7 +35,7 @@ public IF_ACMPEQ(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ACMPEQ, target); + super(org.apache.tomcat.util.bcel.Constants.IF_ACMPEQ, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPNE.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPNE.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPNE.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ACMPNE.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IF_ACMPNE - Branch if reference comparison doesn't succeed @@ -35,7 +35,7 @@ public IF_ACMPNE(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ACMPNE, target); + super(org.apache.tomcat.util.bcel.Constants.IF_ACMPNE, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPEQ.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPEQ.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPEQ.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPEQ.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IF_ICMPEQ - Branch if int comparison succeeds @@ -35,7 +35,7 @@ public IF_ICMPEQ(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ICMPEQ, target); + super(org.apache.tomcat.util.bcel.Constants.IF_ICMPEQ, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGE.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGE.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGE.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGE.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IF_ICMPGE - Branch if int comparison succeeds @@ -35,7 +35,7 @@ public IF_ICMPGE(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ICMPGE, target); + super(org.apache.tomcat.util.bcel.Constants.IF_ICMPGE, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGT.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGT.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGT.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPGT.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IF_ICMPGT - Branch if int comparison succeeds @@ -35,7 +35,7 @@ public IF_ICMPGT(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ICMPGT, target); + super(org.apache.tomcat.util.bcel.Constants.IF_ICMPGT, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLE.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLE.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLE.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLE.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IF_ICMPLE - Branch if int comparison succeeds @@ -35,7 +35,7 @@ public IF_ICMPLE(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ICMPLE, target); + super(org.apache.tomcat.util.bcel.Constants.IF_ICMPLE, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLT.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLT.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLT.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPLT.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IF_ICMPLT - Branch if int comparison succeeds @@ -35,7 +35,7 @@ public IF_ICMPLT(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ICMPLT, target); + super(org.apache.tomcat.util.bcel.Constants.IF_ICMPLT, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPNE.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPNE.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPNE.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IF_ICMPNE.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IF_ICMPNE - Branch if int comparison doesn't succeed @@ -35,7 +35,7 @@ public IF_ICMPNE(InstructionHandle target) { - super(org.apache.bcel.Constants.IF_ICMPNE, target); + super(org.apache.tomcat.util.bcel.Constants.IF_ICMPNE, target); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IINC.java Fri Dec 4 17:49:49 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; /** * IINC - Increment local variable by constant @@ -46,7 +46,7 @@ */ public IINC(int n, int c) { super(); // Default behaviour of LocalVariableInstruction causes error - this.opcode = org.apache.bcel.Constants.IINC; + this.opcode = org.apache.tomcat.util.bcel.Constants.IINC; this.length = (short) 3; setIndex(n); // May set wide as side effect setIncrement(c); @@ -59,7 +59,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) { @@ -73,7 +73,7 @@ private final void setWide() { - wide = (n > org.apache.bcel.Constants.MAX_BYTE) || (Math.abs(c) > Byte.MAX_VALUE); + wide = (n > org.apache.tomcat.util.bcel.Constants.MAX_BYTE) || (Math.abs(c) > Byte.MAX_VALUE); if (wide) { length = 6; // wide byte included } else { Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ILOAD.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * ILOAD - Load int from local variable onto stack @@ -30,7 +30,7 @@ * Instruction.readInstruction(). Not to be used otherwise. */ ILOAD() { - super(org.apache.bcel.Constants.ILOAD, org.apache.bcel.Constants.ILOAD_0); + super(org.apache.tomcat.util.bcel.Constants.ILOAD, org.apache.tomcat.util.bcel.Constants.ILOAD_0); } @@ -38,7 +38,7 @@ * @param n index of local variable */ public ILOAD(int n) { - super(org.apache.bcel.Constants.ILOAD, org.apache.bcel.Constants.ILOAD_0, n); + super(org.apache.tomcat.util.bcel.Constants.ILOAD, org.apache.tomcat.util.bcel.Constants.ILOAD_0, n); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP1.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IMPDEP1 - Implementation dependent @@ -25,7 +25,7 @@ public class IMPDEP1 extends Instruction { public IMPDEP1() { - super(org.apache.bcel.Constants.IMPDEP1, (short) 1); + super(org.apache.tomcat.util.bcel.Constants.IMPDEP1, (short) 1); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMPDEP2.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IMPDEP2 - Implementation dependent @@ -25,7 +25,7 @@ public class IMPDEP2 extends Instruction { public IMPDEP2() { - super(org.apache.bcel.Constants.IMPDEP2, (short) 1); + super(org.apache.tomcat.util.bcel.Constants.IMPDEP2, (short) 1); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IMUL.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IMUL - Multiply ints @@ -28,7 +28,7 @@ /** Multiply ints */ public IMUL() { - super(org.apache.bcel.Constants.IMUL); + super(org.apache.tomcat.util.bcel.Constants.IMUL); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INEG.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * INEG - Negate int @@ -26,7 +26,7 @@ public class INEG extends ArithmeticInstruction { public INEG() { - super(org.apache.bcel.Constants.INEG); + super(org.apache.tomcat.util.bcel.Constants.INEG); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INSTANCEOF.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * INSTANCEOF - Determine if object is of given type @@ -35,12 +35,12 @@ public INSTANCEOF(int index) { - super(org.apache.bcel.Constants.INSTANCEOF, index); + super(org.apache.tomcat.util.bcel.Constants.INSTANCEOF, index); } public Class[] getExceptions() { - return org.apache.bcel.ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION; + return org.apache.tomcat.util.bcel.ExceptionConstants.EXCS_CLASS_AND_INTERFACE_RESOLUTION; } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEINTERFACE.java Fri Dec 4 17:49:49 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.Constants; -import org.apache.bcel.ExceptionConstants; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.util.ByteSequence; +import org.apache.tomcat.util.bcel.Constants; +import org.apache.tomcat.util.bcel.ExceptionConstants; +import org.apache.tomcat.util.bcel.classfile.ConstantPool; +import org.apache.tomcat.util.bcel.util.ByteSequence; /** * INVOKEINTERFACE - Invoke interface method Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESPECIAL.java Fri Dec 4 17:49:49 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; /** * INVOKESPECIAL - Invoke instance method; special handling for superclass, private Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKESTATIC.java Fri Dec 4 17:49:49 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; /** * INVOKESTATIC - Invoke a class (static) method Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/INVOKEVIRTUAL.java Fri Dec 4 17:49:49 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; /** * INVOKEVIRTUAL - Invoke instance method; dispatch based on class Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IOR.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IOR - Bitwise OR int @@ -26,7 +26,7 @@ public class IOR extends ArithmeticInstruction { public IOR() { - super(org.apache.bcel.Constants.IOR); + super(org.apache.tomcat.util.bcel.Constants.IOR); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IREM.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IREM - Remainder of int @@ -28,7 +28,7 @@ /** Remainder of ints */ public IREM() { - super(org.apache.bcel.Constants.IREM); + super(org.apache.tomcat.util.bcel.Constants.IREM); } @@ -36,7 +36,7 @@ */ 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/IRETURN.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IRETURN.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IRETURN.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IRETURN.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IRETURN - Return int from method @@ -28,7 +28,7 @@ /** Return int from method */ public IRETURN() { - super(org.apache.bcel.Constants.IRETURN); + super(org.apache.tomcat.util.bcel.Constants.IRETURN); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHL.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * ISHL - Arithmetic shift left int @@ -26,7 +26,7 @@ public class ISHL extends ArithmeticInstruction { public ISHL() { - super(org.apache.bcel.Constants.ISHL); + super(org.apache.tomcat.util.bcel.Constants.ISHL); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISHR.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * ISHR - Arithmetic shift right int @@ -26,7 +26,7 @@ public class ISHR extends ArithmeticInstruction { public ISHR() { - super(org.apache.bcel.Constants.ISHR); + super(org.apache.tomcat.util.bcel.Constants.ISHR); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISTORE.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * ISTORE - Store int from stack into local variable @@ -30,7 +30,7 @@ * Instruction.readInstruction(). Not to be used otherwise. */ ISTORE() { - super(org.apache.bcel.Constants.ISTORE, org.apache.bcel.Constants.ISTORE_0); + super(org.apache.tomcat.util.bcel.Constants.ISTORE, org.apache.tomcat.util.bcel.Constants.ISTORE_0); } @@ -38,7 +38,7 @@ * @param n index of local variable */ public ISTORE(int n) { - super(org.apache.bcel.Constants.ISTORE, org.apache.bcel.Constants.ISTORE_0, n); + super(org.apache.tomcat.util.bcel.Constants.ISTORE, org.apache.tomcat.util.bcel.Constants.ISTORE_0, n); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/ISUB.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * ISUB - Substract ints @@ -28,7 +28,7 @@ /** Substract ints */ public ISUB() { - super(org.apache.bcel.Constants.ISUB); + super(org.apache.tomcat.util.bcel.Constants.ISUB); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IUSHR.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IUSHR - Logical shift right int @@ -26,7 +26,7 @@ public class IUSHR extends ArithmeticInstruction { public IUSHR() { - super(org.apache.bcel.Constants.IUSHR); + super(org.apache.tomcat.util.bcel.Constants.IUSHR); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IXOR.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * IXOR - Bitwise XOR int @@ -26,7 +26,7 @@ public class IXOR extends ArithmeticInstruction { public IXOR() { - super(org.apache.bcel.Constants.IXOR); + super(org.apache.tomcat.util.bcel.Constants.IXOR); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IfInstruction.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IfInstruction.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IfInstruction.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IfInstruction.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * Super class for the IFxxx family of instructions. Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IndexedInstruction.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IndexedInstruction.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IndexedInstruction.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/IndexedInstruction.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * Denote entity that refers to an index, e.g. local variable instructions, Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/Instruction.java Fri Dec 4 17:49:49 2009 @@ -14,15 +14,15 @@ * 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 java.io.Serializable; import java.util.Locale; -import org.apache.bcel.Constants; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.util.ByteSequence; +import org.apache.tomcat.util.bcel.Constants; +import org.apache.tomcat.util.bcel.classfile.ConstantPool; +import org.apache.tomcat.util.bcel.util.ByteSequence; /** * Abstract super class for all Java byte codes. Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionComparator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionComparator.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionComparator.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionComparator.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * Equality of instructions isn't clearly to be defined. You might Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionConstants.java Fri Dec 4 17:49:49 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; /** * This interface contains shareable instruction objects. Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionFactory.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionFactory.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionFactory.java Fri Dec 4 17:49:49 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; /** * Instances of this class may be used, e.g., to generate typed @@ -556,7 +556,7 @@ && (src == Constants.T_CHAR || src == Constants.T_BYTE || src == Constants.T_SHORT)) { src = Constants.T_INT; } - String name = "org.apache.bcel.generic." + short_names[src - Constants.T_CHAR] + "2" + String name = "org.apache.tomcat.util.bcel.generic." + short_names[src - Constants.T_CHAR] + "2" + short_names[dest - Constants.T_CHAR]; Instruction i = null; try { Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionHandle.java Fri Dec 4 17:49:49 2009 @@ -14,14 +14,14 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.bcel.classfile.Utility; +import org.apache.tomcat.util.bcel.classfile.Utility; /** * Instances of this class give users a handle to the instructions contained in Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/InstructionList.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; @@ -27,9 +27,9 @@ import java.util.Map; import java.util.NoSuchElementException; -import org.apache.bcel.Constants; -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.util.ByteSequence; +import org.apache.tomcat.util.bcel.Constants; +import org.apache.tomcat.util.bcel.classfile.Constant; +import org.apache.tomcat.util.bcel.util.ByteSequence; /** * This class is a container for a list of = (32767 - max_offset)) { // to large for short (estimate) - opcode = org.apache.bcel.Constants.JSR_W; + opcode = org.apache.tomcat.util.bcel.Constants.JSR_W; length = 5; return 2; // 5 - 3 } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JSR_W.java Fri Dec 4 17:49:49 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; /** * JSR_W - Jump to subroutine @@ -37,7 +37,7 @@ public JSR_W(InstructionHandle target) { - super(org.apache.bcel.Constants.JSR_W, target); + super(org.apache.tomcat.util.bcel.Constants.JSR_W, target); length = 5; } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/JsrInstruction.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * Super class for JSR - Jump to subroutine Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2D.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * L2D - Convert long to double @@ -26,7 +26,7 @@ public class L2D extends ConversionInstruction { public L2D() { - super(org.apache.bcel.Constants.L2D); + super(org.apache.tomcat.util.bcel.Constants.L2D); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2F.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * L2F - Convert long to float @@ -26,7 +26,7 @@ public class L2F extends ConversionInstruction { public L2F() { - super(org.apache.bcel.Constants.L2F); + super(org.apache.tomcat.util.bcel.Constants.L2F); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/L2I.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * L2I - Convert long to int @@ -26,7 +26,7 @@ public class L2I extends ConversionInstruction { public L2I() { - super(org.apache.bcel.Constants.L2I); + super(org.apache.tomcat.util.bcel.Constants.L2I); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LADD.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * LADD - Add longs @@ -27,7 +27,7 @@ public class LADD extends ArithmeticInstruction { public LADD() { - super(org.apache.bcel.Constants.LADD); + super(org.apache.tomcat.util.bcel.Constants.LADD); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LALOAD.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * LALOAD - Load long from array @@ -28,7 +28,7 @@ /** Load long from array */ public LALOAD() { - super(org.apache.bcel.Constants.LALOAD); + super(org.apache.tomcat.util.bcel.Constants.LALOAD); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LAND.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * LAND - Bitwise AND longs @@ -27,7 +27,7 @@ public class LAND extends ArithmeticInstruction { public LAND() { - super(org.apache.bcel.Constants.LAND); + super(org.apache.tomcat.util.bcel.Constants.LAND); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LASTORE.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * LASTORE - Store into long array @@ -28,7 +28,7 @@ /** Store long into array */ public LASTORE() { - super(org.apache.bcel.Constants.LASTORE); + super(org.apache.tomcat.util.bcel.Constants.LASTORE); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCMP.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * LCMP - Compare longs: @@ -27,7 +27,7 @@ public class LCMP extends Instruction implements TypedInstruction, StackProducer, StackConsumer { public LCMP() { - super(org.apache.bcel.Constants.LCMP, (short) 1); + super(org.apache.tomcat.util.bcel.Constants.LCMP, (short) 1); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LCONST.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * LCONST - Push 0 or 1, other values cause an exception @@ -38,11 +38,11 @@ public LCONST(long l) { - super(org.apache.bcel.Constants.LCONST_0, (short) 1); + super(org.apache.tomcat.util.bcel.Constants.LCONST_0, (short) 1); if (l == 0) { - opcode = org.apache.bcel.Constants.LCONST_0; + opcode = org.apache.tomcat.util.bcel.Constants.LCONST_0; } else if (l == 1) { - opcode = org.apache.bcel.Constants.LCONST_1; + opcode = org.apache.tomcat.util.bcel.Constants.LCONST_1; } else { throw new ClassGenException("LCONST can be used only for 0 and 1: " + l); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC.java Fri Dec 4 17:49:49 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; /** * LDC - Push item from constant pool. @@ -40,18 +40,18 @@ public LDC(int index) { - super(org.apache.bcel.Constants.LDC_W, index); + super(org.apache.tomcat.util.bcel.Constants.LDC_W, index); setSize(); } // Adjust to proper size protected final void setSize() { - if (index <= org.apache.bcel.Constants.MAX_BYTE) { // Fits in one byte? - opcode = org.apache.bcel.Constants.LDC; + if (index <= org.apache.tomcat.util.bcel.Constants.MAX_BYTE) { // Fits in one byte? + opcode = org.apache.tomcat.util.bcel.Constants.LDC; length = 2; } else { - opcode = org.apache.bcel.Constants.LDC_W; + opcode = org.apache.tomcat.util.bcel.Constants.LDC_W; length = 3; } } @@ -90,17 +90,17 @@ public Object getValue( ConstantPoolGen cpg ) { - org.apache.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(index); + org.apache.tomcat.util.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(index); switch (c.getTag()) { - case org.apache.bcel.Constants.CONSTANT_String: - int i = ((org.apache.bcel.classfile.ConstantString) c).getStringIndex(); + case org.apache.tomcat.util.bcel.Constants.CONSTANT_String: + int i = ((org.apache.tomcat.util.bcel.classfile.ConstantString) c).getStringIndex(); c = cpg.getConstantPool().getConstant(i); - return ((org.apache.bcel.classfile.ConstantUtf8) c).getBytes(); - case org.apache.bcel.Constants.CONSTANT_Float: - return new Float(((org.apache.bcel.classfile.ConstantFloat) c).getBytes()); - case org.apache.bcel.Constants.CONSTANT_Integer: - return new Integer(((org.apache.bcel.classfile.ConstantInteger) c).getBytes()); - case org.apache.bcel.Constants.CONSTANT_Class: + return ((org.apache.tomcat.util.bcel.classfile.ConstantUtf8) c).getBytes(); + case org.apache.tomcat.util.bcel.Constants.CONSTANT_Float: + return new Float(((org.apache.tomcat.util.bcel.classfile.ConstantFloat) c).getBytes()); + case org.apache.tomcat.util.bcel.Constants.CONSTANT_Integer: + return new Integer(((org.apache.tomcat.util.bcel.classfile.ConstantInteger) c).getBytes()); + case org.apache.tomcat.util.bcel.Constants.CONSTANT_Class: return c; default: // Never reached throw new RuntimeException("Unknown or invalid constant type at " + index); @@ -110,13 +110,13 @@ public Type getType( ConstantPoolGen cpg ) { switch (cpg.getConstantPool().getConstant(index).getTag()) { - case org.apache.bcel.Constants.CONSTANT_String: + case org.apache.tomcat.util.bcel.Constants.CONSTANT_String: return Type.STRING; - case org.apache.bcel.Constants.CONSTANT_Float: + case org.apache.tomcat.util.bcel.Constants.CONSTANT_Float: return Type.FLOAT; - case org.apache.bcel.Constants.CONSTANT_Integer: + case org.apache.tomcat.util.bcel.Constants.CONSTANT_Integer: return Type.INT; - case org.apache.bcel.Constants.CONSTANT_Class: + case org.apache.tomcat.util.bcel.Constants.CONSTANT_Class: return Type.CLASS; default: // Never reached throw new RuntimeException("Unknown or invalid constant type at " + index); @@ -125,7 +125,7 @@ public Class[] getExceptions() { - return org.apache.bcel.ExceptionConstants.EXCS_STRING_RESOLUTION; + return org.apache.tomcat.util.bcel.ExceptionConstants.EXCS_STRING_RESOLUTION; } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC2_W.java Fri Dec 4 17:49:49 2009 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; /** * LDC2_W - Push long or double from constant pool @@ -35,15 +35,15 @@ public LDC2_W(int index) { - super(org.apache.bcel.Constants.LDC2_W, index); + super(org.apache.tomcat.util.bcel.Constants.LDC2_W, index); } public Type getType( ConstantPoolGen cpg ) { switch (cpg.getConstantPool().getConstant(index).getTag()) { - case org.apache.bcel.Constants.CONSTANT_Long: + case org.apache.tomcat.util.bcel.Constants.CONSTANT_Long: return Type.LONG; - case org.apache.bcel.Constants.CONSTANT_Double: + case org.apache.tomcat.util.bcel.Constants.CONSTANT_Double: return Type.DOUBLE; default: // Never reached throw new RuntimeException("Unknown constant type " + opcode); @@ -52,12 +52,12 @@ public Number getValue( ConstantPoolGen cpg ) { - org.apache.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(index); + org.apache.tomcat.util.bcel.classfile.Constant c = cpg.getConstantPool().getConstant(index); switch (c.getTag()) { - case org.apache.bcel.Constants.CONSTANT_Long: - return new Long(((org.apache.bcel.classfile.ConstantLong) c).getBytes()); - case org.apache.bcel.Constants.CONSTANT_Double: - return new Double(((org.apache.bcel.classfile.ConstantDouble) c).getBytes()); + case org.apache.tomcat.util.bcel.Constants.CONSTANT_Long: + return new Long(((org.apache.tomcat.util.bcel.classfile.ConstantLong) c).getBytes()); + case org.apache.tomcat.util.bcel.Constants.CONSTANT_Double: + return new Double(((org.apache.tomcat.util.bcel.classfile.ConstantDouble) c).getBytes()); default: // Never reached throw new RuntimeException("Unknown or invalid constant type at " + index); } Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java?rev=887296&r1=886844&r2=887296&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/bcel/generic/LDC_W.java Fri Dec 4 17:49:49 2009 @@ -14,10 +14,10 @@ * limitations under the License. * */ -package org.apache.bcel.generic; +package org.apache.tomcat.util.bcel.generic; import java.io.IOException; -import org.apache.bcel.util.ByteSequence; +import org.apache.tomcat.util.bcel.util.ByteSequence; /** * LDC_W - Push item from constant pool (wide index) @@ -48,7 +48,7 @@ protected void initFromFile( ByteSequence bytes, boolean wide ) throws IOException { setIndex(bytes.readUnsignedShort()); // Override just in case it has been changed - opcode = org.apache.bcel.Constants.LDC_W; + opcode = org.apache.tomcat.util.bcel.Constants.LDC_W; length = 3; } } 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=887296&r1=886844&r2=887296&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:49:49 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=887296&r1=886844&r2=887296&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:49:49 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=887296&r1=886844&r2=887296&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:49:49 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=887296&r1=886844&r2=887296&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:49:49 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); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org