tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r887302 [5/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/verifier/GraphicalVerifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/GraphicalVerifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/GraphicalVerifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/GraphicalVerifier.java Fri Dec  4 17:59:52 2009
@@ -14,12 +14,12 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
 
 import java.awt.Dimension;
 import java.awt.Toolkit;
 import javax.swing.UIManager;
-import org.apache.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.generic.Type;
 
 /**
  * A graphical user interface application demonstrating JustIce.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/NativeVerifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/NativeVerifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/NativeVerifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/NativeVerifier.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
 
 /**
  * The NativeVerifier class implements a main(String[] args) method that's

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/PassVerifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/PassVerifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/PassVerifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/PassVerifier.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +42,7 @@
  *
  * @version $Id$
  * @author Enver Haase
- * @see org.apache.bcel.verifier.Verifier
+ * @see org.apache.tomcat.util.bcel.verifier.Verifier
  * @see #verify()
  */
 public abstract class PassVerifier {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/TransitiveHull.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/TransitiveHull.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/TransitiveHull.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/TransitiveHull.java Fri Dec  4 17:59:52 2009
@@ -14,10 +14,10 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
 
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
 
 /**
  * This class has a main method implementing a demonstration program

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerificationResult.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerificationResult.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerificationResult.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerificationResult.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
 
 /**
  * A VerificationResult is what a PassVerifier returns

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/Verifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/Verifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/Verifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/Verifier.java Fri Dec  4 17:59:52 2009
@@ -14,17 +14,17 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.verifier.statics.Pass1Verifier;
-import org.apache.bcel.verifier.statics.Pass2Verifier;
-import org.apache.bcel.verifier.statics.Pass3aVerifier;
-import org.apache.bcel.verifier.structurals.Pass3bVerifier;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.verifier.statics.Pass1Verifier;
+import org.apache.tomcat.util.bcel.verifier.statics.Pass2Verifier;
+import org.apache.tomcat.util.bcel.verifier.statics.Pass3aVerifier;
+import org.apache.tomcat.util.bcel.verifier.structurals.Pass3bVerifier;
 
 /**
  * A Verifier instance is there to verify a class file according to The Java Virtual
@@ -39,8 +39,8 @@
  *
  * @version $Id$
  * @author Enver Haase
- * @see org.apache.bcel.verifier.VerifierFactory
- * @see org.apache.bcel.verifier.PassVerifier
+ * @see org.apache.tomcat.util.bcel.verifier.VerifierFactory
+ * @see org.apache.tomcat.util.bcel.verifier.PassVerifier
  */
 public class Verifier {
 
@@ -164,7 +164,7 @@
             int meth = pv.getMethodNo();
             for (int i = 0; i < p3am.length; i++) {
                 messages.add("Pass 3a, method " + meth + " ('"
-                        + org.apache.bcel.Repository.lookupClass(classname).getMethods()[meth]
+                        + org.apache.tomcat.util.bcel.Repository.lookupClass(classname).getMethods()[meth]
                         + "'): " + p3am[i]);
             }
         }
@@ -175,7 +175,7 @@
             int meth = pv.getMethodNo();
             for (int i = 0; i < p3bm.length; i++) {
                 messages.add("Pass 3b, method " + meth + " ('"
-                        + org.apache.bcel.Repository.lookupClass(classname).getMethods()[meth]
+                        + org.apache.tomcat.util.bcel.Repository.lookupClass(classname).getMethods()[meth]
                         + "'): " + p3bm[i]);
             }
         }
@@ -217,7 +217,7 @@
                 vr = v.doPass2();
                 System.out.println("Pass 2:\n" + vr);
                 if (vr == VerificationResult.VR_OK) {
-                    JavaClass jc = org.apache.bcel.Repository.lookupClass(args[k]);
+                    JavaClass jc = org.apache.tomcat.util.bcel.Repository.lookupClass(args[k]);
                     for (int i = 0; i < jc.getMethods().length; i++) {
                         vr = v.doPass3a(i);
                         System.out.println("Pass 3a, method number " + i + " ['"
@@ -238,7 +238,7 @@
                 System.out.println("\n");
                 // avoid swapping.
                 v.flush();
-                org.apache.bcel.Repository.clearCache();
+                org.apache.tomcat.util.bcel.Repository.clearCache();
                 System.gc();
             } catch (ClassNotFoundException e) {
                 e.printStackTrace();

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierAppFrame.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierAppFrame.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierAppFrame.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierAppFrame.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
 
 import java.awt.AWTEvent;
 import java.awt.CardLayout;
@@ -36,8 +36,8 @@
 import javax.swing.JTextPane;
 import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
 
 /**
  * This class implements a machine-generated frame for use with

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactory.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactory.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -30,7 +30,7 @@
  *
  * @version $Id$
  * @author Enver Haase
- * @see org.apache.bcel.verifier.Verifier
+ * @see org.apache.tomcat.util.bcel.verifier.Verifier
  */
 public class VerifierFactory {
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryListModel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryListModel.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryListModel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryListModel.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
 
 import javax.swing.event.ListDataEvent;
 
@@ -25,7 +25,7 @@
  * @version $Id$
  * @author Enver Haase
  */
-public class VerifierFactoryListModel implements org.apache.bcel.verifier.VerifierFactoryObserver,
+public class VerifierFactoryListModel implements org.apache.tomcat.util.bcel.verifier.VerifierFactoryObserver,
         javax.swing.ListModel {
 
     private java.util.ArrayList listeners = new java.util.ArrayList();

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryObserver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryObserver.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryObserver.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifierFactoryObserver.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
 
 /**
  * VerifierFactoryObserver instances are notified when new Verifier

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifyDialog.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifyDialog.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifyDialog.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/VerifyDialog.java Fri Dec  4 17:59:52 2009
@@ -14,11 +14,11 @@
  *  limitations under the License. 
  *
  */
-package org.apache.bcel.verifier;
+package org.apache.tomcat.util.bcel.verifier;
 
 import java.awt.Color;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
 
 /**
  * A class for simple graphical class file verification.

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

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/CodeConstraintException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/CodeConstraintException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/CodeConstraintException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/CodeConstraintException.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
 
 /**
  * Instances of this class are thrown by BCEL's class file verifier "JustIce" when

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/InvalidMethodException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/InvalidMethodException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/InvalidMethodException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/InvalidMethodException.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
 
 /**
  * Instances of this class are thrown by BCEL's class file verifier "JustIce"

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LinkingConstraintException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LinkingConstraintException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LinkingConstraintException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/LinkingConstraintException.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
 
 /**
  * Instances of this class are thrown by BCEL's class file verifier "JustIce" when

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

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

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

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

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StructuralCodeConstraintException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StructuralCodeConstraintException.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StructuralCodeConstraintException.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/exc/StructuralCodeConstraintException.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.exc;
+package org.apache.tomcat.util.bcel.verifier.exc;
 
 /**
  * Instances of this class are thrown by BCEL's class file verifier "JustIce" when

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

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

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/DOUBLE_Upper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/DOUBLE_Upper.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/DOUBLE_Upper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/DOUBLE_Upper.java Fri Dec  4 17:59:52 2009
@@ -14,11 +14,11 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
 
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.generic.Type;
 
 /**
  * This class represents the upper half of a DOUBLE variable.

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LONG_Upper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LONG_Upper.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LONG_Upper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LONG_Upper.java Fri Dec  4 17:59:52 2009
@@ -14,11 +14,11 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
 
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.generic.Type;
 
 /**
  * This class represents the upper half of a LONG variable.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariableInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariableInfo.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariableInfo.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariableInfo.java Fri Dec  4 17:59:52 2009
@@ -14,12 +14,12 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
 
 
 import java.util.Hashtable;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.exc.LocalVariableInfoInconsistentException;
 
 /**
  * A utility class holding the information about

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariablesInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariablesInfo.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariablesInfo.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/LocalVariablesInfo.java Fri Dec  4 17:59:52 2009
@@ -14,12 +14,12 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
 
 
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.LocalVariableInfoInconsistentException;
 
 /**
  * A utility class holding the information about

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass1Verifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass1Verifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass1Verifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass1Verifier.java Fri Dec  4 17:59:52 2009
@@ -14,17 +14,17 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
 
 
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.ClassFormatException;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.verifier.PassVerifier;
-import org.apache.bcel.verifier.VerificationResult;
-import org.apache.bcel.verifier.Verifier;
-import org.apache.bcel.verifier.exc.LoadingException;
-import org.apache.bcel.verifier.exc.Utility;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.ClassFormatException;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.verifier.PassVerifier;
+import org.apache.tomcat.util.bcel.verifier.VerificationResult;
+import org.apache.tomcat.util.bcel.verifier.Verifier;
+import org.apache.tomcat.util.bcel.verifier.exc.LoadingException;
+import org.apache.tomcat.util.bcel.verifier.exc.Utility;
 
 /**
  * This PassVerifier verifies a class file according to pass 1 as
@@ -66,7 +66,7 @@
 	/**
 	 * Should only be instantiated by a Verifier.
 	 *
-	 * @see org.apache.bcel.verifier.Verifier
+	 * @see org.apache.tomcat.util.bcel.verifier.Verifier
 	 */
 	public Pass1Verifier(Verifier owner){
 		myOwner = owner;
@@ -128,7 +128,7 @@
 	 * (like the check for extra bytes at the end of the class file) are handy when actually using BCEL to repair a class file (otherwise you would not be
 	 * able to load it into BCEL).
 	 *
-	 * @see org.apache.bcel.Repository
+	 * @see org.apache.tomcat.util.bcel.Repository
 	 */
 	public VerificationResult do_verify(){
 		JavaClass jc;

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass2Verifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass2Verifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass2Verifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass2Verifier.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
 
 
 import java.util.HashMap;
@@ -22,54 +22,54 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import org.apache.bcel.Constants;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.Attribute;
-import org.apache.bcel.classfile.ClassFormatException;
-import org.apache.bcel.classfile.Code;
-import org.apache.bcel.classfile.CodeException;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantDouble;
-import org.apache.bcel.classfile.ConstantFieldref;
-import org.apache.bcel.classfile.ConstantFloat;
-import org.apache.bcel.classfile.ConstantInteger;
-import org.apache.bcel.classfile.ConstantInterfaceMethodref;
-import org.apache.bcel.classfile.ConstantLong;
-import org.apache.bcel.classfile.ConstantMethodref;
-import org.apache.bcel.classfile.ConstantNameAndType;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.ConstantString;
-import org.apache.bcel.classfile.ConstantUtf8;
-import org.apache.bcel.classfile.ConstantValue;
-import org.apache.bcel.classfile.Deprecated;
-import org.apache.bcel.classfile.DescendingVisitor;
-import org.apache.bcel.classfile.EmptyVisitor;
-import org.apache.bcel.classfile.ExceptionTable;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.InnerClass;
-import org.apache.bcel.classfile.InnerClasses;
-import org.apache.bcel.classfile.JavaClass;
-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.Method;
-import org.apache.bcel.classfile.Node;
-import org.apache.bcel.classfile.SourceFile;
-import org.apache.bcel.classfile.Synthetic;
-import org.apache.bcel.classfile.Unknown;
-import org.apache.bcel.classfile.Visitor;
-import org.apache.bcel.generic.ArrayType;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.PassVerifier;
-import org.apache.bcel.verifier.VerificationResult;
-import org.apache.bcel.verifier.Verifier;
-import org.apache.bcel.verifier.VerifierFactory;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.ClassConstraintException;
-import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.Attribute;
+import org.apache.tomcat.util.bcel.classfile.ClassFormatException;
+import org.apache.tomcat.util.bcel.classfile.Code;
+import org.apache.tomcat.util.bcel.classfile.CodeException;
+import org.apache.tomcat.util.bcel.classfile.Constant;
+import org.apache.tomcat.util.bcel.classfile.ConstantClass;
+import org.apache.tomcat.util.bcel.classfile.ConstantDouble;
+import org.apache.tomcat.util.bcel.classfile.ConstantFieldref;
+import org.apache.tomcat.util.bcel.classfile.ConstantFloat;
+import org.apache.tomcat.util.bcel.classfile.ConstantInteger;
+import org.apache.tomcat.util.bcel.classfile.ConstantInterfaceMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantLong;
+import org.apache.tomcat.util.bcel.classfile.ConstantMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantNameAndType;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.classfile.ConstantString;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.ConstantValue;
+import org.apache.tomcat.util.bcel.classfile.Deprecated;
+import org.apache.tomcat.util.bcel.classfile.DescendingVisitor;
+import org.apache.tomcat.util.bcel.classfile.EmptyVisitor;
+import org.apache.tomcat.util.bcel.classfile.ExceptionTable;
+import org.apache.tomcat.util.bcel.classfile.Field;
+import org.apache.tomcat.util.bcel.classfile.InnerClass;
+import org.apache.tomcat.util.bcel.classfile.InnerClasses;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+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.Method;
+import org.apache.tomcat.util.bcel.classfile.Node;
+import org.apache.tomcat.util.bcel.classfile.SourceFile;
+import org.apache.tomcat.util.bcel.classfile.Synthetic;
+import org.apache.tomcat.util.bcel.classfile.Unknown;
+import org.apache.tomcat.util.bcel.classfile.Visitor;
+import org.apache.tomcat.util.bcel.generic.ArrayType;
+import org.apache.tomcat.util.bcel.generic.ObjectType;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.PassVerifier;
+import org.apache.tomcat.util.bcel.verifier.VerificationResult;
+import org.apache.tomcat.util.bcel.verifier.Verifier;
+import org.apache.tomcat.util.bcel.verifier.VerifierFactory;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.ClassConstraintException;
+import org.apache.tomcat.util.bcel.verifier.exc.LocalVariableInfoInconsistentException;
 
 /**
  * This PassVerifier verifies a class file according to
@@ -143,7 +143,7 @@
 	 * the "Code" array of methods in a few cases. Please
 	 * see the pass 3a documentation, too.
 	 *
-	 * @see org.apache.bcel.verifier.statics.Pass3aVerifier
+	 * @see org.apache.tomcat.util.bcel.verifier.statics.Pass3aVerifier
 	 */
 	public VerificationResult do_verify(){
 	    try {
@@ -310,7 +310,7 @@
    *
    * @see #constant_pool_entries_satisfy_static_constraints()
 	 */
-	private class CPESSC_Visitor extends org.apache.bcel.classfile.EmptyVisitor implements Visitor{
+	private class CPESSC_Visitor extends org.apache.tomcat.util.bcel.classfile.EmptyVisitor implements Visitor{
 		private Class CONST_Class;
 		/*
         private Class CONST_Fieldref;
@@ -339,19 +339,19 @@
 			cp = _jc.getConstantPool();
 			cplen = cp.getLength();
 
-			CONST_Class = org.apache.bcel.classfile.ConstantClass.class;
+			CONST_Class = org.apache.tomcat.util.bcel.classfile.ConstantClass.class;
 			/*
-            CONST_Fieldref = org.apache.bcel.classfile.ConstantFieldref.class;
-			CONST_Methodref = org.apache.bcel.classfile.ConstantMethodref.class;
-			CONST_InterfaceMethodref = org.apache.bcel.classfile.ConstantInterfaceMethodref.class;
+            CONST_Fieldref = org.apache.tomcat.util.bcel.classfile.ConstantFieldref.class;
+			CONST_Methodref = org.apache.tomcat.util.bcel.classfile.ConstantMethodref.class;
+			CONST_InterfaceMethodref = org.apache.tomcat.util.bcel.classfile.ConstantInterfaceMethodref.class;
             */
-			CONST_String = org.apache.bcel.classfile.ConstantString.class;
-			CONST_Integer = org.apache.bcel.classfile.ConstantInteger.class;
-			CONST_Float = org.apache.bcel.classfile.ConstantFloat.class;
-			CONST_Long = org.apache.bcel.classfile.ConstantLong.class;
-			CONST_Double = org.apache.bcel.classfile.ConstantDouble.class;
-			CONST_NameAndType = org.apache.bcel.classfile.ConstantNameAndType.class;
-			CONST_Utf8 = org.apache.bcel.classfile.ConstantUtf8.class;
+			CONST_String = org.apache.tomcat.util.bcel.classfile.ConstantString.class;
+			CONST_Integer = org.apache.tomcat.util.bcel.classfile.ConstantInteger.class;
+			CONST_Float = org.apache.tomcat.util.bcel.classfile.ConstantFloat.class;
+			CONST_Long = org.apache.tomcat.util.bcel.classfile.ConstantLong.class;
+			CONST_Double = org.apache.tomcat.util.bcel.classfile.ConstantDouble.class;
+			CONST_NameAndType = org.apache.tomcat.util.bcel.classfile.ConstantNameAndType.class;
+			CONST_Utf8 = org.apache.tomcat.util.bcel.classfile.ConstantUtf8.class;
 
 			carrier = new DescendingVisitor(_jc, this);
 			carrier.visit();
@@ -1181,7 +1181,7 @@
    * pool must be valid.</B>
 	 *
    * @see #constant_pool_entries_satisfy_static_constraints()
-	 * @see org.apache.bcel.classfile.ConstantCP
+	 * @see org.apache.tomcat.util.bcel.classfile.ConstantCP
 	 */
 	private class FAMRAV_Visitor extends EmptyVisitor implements Visitor{
 		private final ConstantPool cp; // ==jc.getConstantPool() -- only here to save typing work.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass3aVerifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass3aVerifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass3aVerifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/Pass3aVerifier.java Fri Dec  4 17:59:52 2009
@@ -14,88 +14,88 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
 
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.Attribute;
-import org.apache.bcel.classfile.Code;
-import org.apache.bcel.classfile.CodeException;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantDouble;
-import org.apache.bcel.classfile.ConstantFieldref;
-import org.apache.bcel.classfile.ConstantFloat;
-import org.apache.bcel.classfile.ConstantInteger;
-import org.apache.bcel.classfile.ConstantInterfaceMethodref;
-import org.apache.bcel.classfile.ConstantLong;
-import org.apache.bcel.classfile.ConstantMethodref;
-import org.apache.bcel.classfile.ConstantNameAndType;
-import org.apache.bcel.classfile.ConstantString;
-import org.apache.bcel.classfile.ConstantUtf8;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.JavaClass;
-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.Method;
-import org.apache.bcel.generic.ALOAD;
-import org.apache.bcel.generic.ANEWARRAY;
-import org.apache.bcel.generic.ASTORE;
-import org.apache.bcel.generic.ATHROW;
-import org.apache.bcel.generic.ArrayType;
-import org.apache.bcel.generic.BREAKPOINT;
-import org.apache.bcel.generic.CHECKCAST;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.DLOAD;
-import org.apache.bcel.generic.DSTORE;
-import org.apache.bcel.generic.FLOAD;
-import org.apache.bcel.generic.FSTORE;
-import org.apache.bcel.generic.FieldInstruction;
-import org.apache.bcel.generic.GETSTATIC;
-import org.apache.bcel.generic.GotoInstruction;
-import org.apache.bcel.generic.IINC;
-import org.apache.bcel.generic.ILOAD;
-import org.apache.bcel.generic.IMPDEP1;
-import org.apache.bcel.generic.IMPDEP2;
-import org.apache.bcel.generic.INSTANCEOF;
-import org.apache.bcel.generic.INVOKEINTERFACE;
-import org.apache.bcel.generic.INVOKESPECIAL;
-import org.apache.bcel.generic.INVOKESTATIC;
-import org.apache.bcel.generic.INVOKEVIRTUAL;
-import org.apache.bcel.generic.ISTORE;
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.InstructionList;
-import org.apache.bcel.generic.InvokeInstruction;
-import org.apache.bcel.generic.JsrInstruction;
-import org.apache.bcel.generic.LDC;
-import org.apache.bcel.generic.LDC2_W;
-import org.apache.bcel.generic.LLOAD;
-import org.apache.bcel.generic.LOOKUPSWITCH;
-import org.apache.bcel.generic.LSTORE;
-import org.apache.bcel.generic.LoadClass;
-import org.apache.bcel.generic.MULTIANEWARRAY;
-import org.apache.bcel.generic.NEW;
-import org.apache.bcel.generic.NEWARRAY;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.PUTSTATIC;
-import org.apache.bcel.generic.RET;
-import org.apache.bcel.generic.ReturnInstruction;
-import org.apache.bcel.generic.TABLESWITCH;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.PassVerifier;
-import org.apache.bcel.verifier.VerificationResult;
-import org.apache.bcel.verifier.Verifier;
-import org.apache.bcel.verifier.VerifierFactory;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.ClassConstraintException;
-import org.apache.bcel.verifier.exc.InvalidMethodException;
-import org.apache.bcel.verifier.exc.StaticCodeConstraintException;
-import org.apache.bcel.verifier.exc.StaticCodeInstructionConstraintException;
-import org.apache.bcel.verifier.exc.StaticCodeInstructionOperandConstraintException;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Repository;
+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.Constant;
+import org.apache.tomcat.util.bcel.classfile.ConstantClass;
+import org.apache.tomcat.util.bcel.classfile.ConstantDouble;
+import org.apache.tomcat.util.bcel.classfile.ConstantFieldref;
+import org.apache.tomcat.util.bcel.classfile.ConstantFloat;
+import org.apache.tomcat.util.bcel.classfile.ConstantInteger;
+import org.apache.tomcat.util.bcel.classfile.ConstantInterfaceMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantLong;
+import org.apache.tomcat.util.bcel.classfile.ConstantMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantNameAndType;
+import org.apache.tomcat.util.bcel.classfile.ConstantString;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.Field;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+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.Method;
+import org.apache.tomcat.util.bcel.generic.ALOAD;
+import org.apache.tomcat.util.bcel.generic.ANEWARRAY;
+import org.apache.tomcat.util.bcel.generic.ASTORE;
+import org.apache.tomcat.util.bcel.generic.ATHROW;
+import org.apache.tomcat.util.bcel.generic.ArrayType;
+import org.apache.tomcat.util.bcel.generic.BREAKPOINT;
+import org.apache.tomcat.util.bcel.generic.CHECKCAST;
+import org.apache.tomcat.util.bcel.generic.ConstantPoolGen;
+import org.apache.tomcat.util.bcel.generic.DLOAD;
+import org.apache.tomcat.util.bcel.generic.DSTORE;
+import org.apache.tomcat.util.bcel.generic.FLOAD;
+import org.apache.tomcat.util.bcel.generic.FSTORE;
+import org.apache.tomcat.util.bcel.generic.FieldInstruction;
+import org.apache.tomcat.util.bcel.generic.GETSTATIC;
+import org.apache.tomcat.util.bcel.generic.GotoInstruction;
+import org.apache.tomcat.util.bcel.generic.IINC;
+import org.apache.tomcat.util.bcel.generic.ILOAD;
+import org.apache.tomcat.util.bcel.generic.IMPDEP1;
+import org.apache.tomcat.util.bcel.generic.IMPDEP2;
+import org.apache.tomcat.util.bcel.generic.INSTANCEOF;
+import org.apache.tomcat.util.bcel.generic.INVOKEINTERFACE;
+import org.apache.tomcat.util.bcel.generic.INVOKESPECIAL;
+import org.apache.tomcat.util.bcel.generic.INVOKESTATIC;
+import org.apache.tomcat.util.bcel.generic.INVOKEVIRTUAL;
+import org.apache.tomcat.util.bcel.generic.ISTORE;
+import org.apache.tomcat.util.bcel.generic.Instruction;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.InstructionList;
+import org.apache.tomcat.util.bcel.generic.InvokeInstruction;
+import org.apache.tomcat.util.bcel.generic.JsrInstruction;
+import org.apache.tomcat.util.bcel.generic.LDC;
+import org.apache.tomcat.util.bcel.generic.LDC2_W;
+import org.apache.tomcat.util.bcel.generic.LLOAD;
+import org.apache.tomcat.util.bcel.generic.LOOKUPSWITCH;
+import org.apache.tomcat.util.bcel.generic.LSTORE;
+import org.apache.tomcat.util.bcel.generic.LoadClass;
+import org.apache.tomcat.util.bcel.generic.MULTIANEWARRAY;
+import org.apache.tomcat.util.bcel.generic.NEW;
+import org.apache.tomcat.util.bcel.generic.NEWARRAY;
+import org.apache.tomcat.util.bcel.generic.ObjectType;
+import org.apache.tomcat.util.bcel.generic.PUTSTATIC;
+import org.apache.tomcat.util.bcel.generic.RET;
+import org.apache.tomcat.util.bcel.generic.ReturnInstruction;
+import org.apache.tomcat.util.bcel.generic.TABLESWITCH;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.PassVerifier;
+import org.apache.tomcat.util.bcel.verifier.VerificationResult;
+import org.apache.tomcat.util.bcel.verifier.Verifier;
+import org.apache.tomcat.util.bcel.verifier.VerifierFactory;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.ClassConstraintException;
+import org.apache.tomcat.util.bcel.verifier.exc.InvalidMethodException;
+import org.apache.tomcat.util.bcel.verifier.exc.StaticCodeConstraintException;
+import org.apache.tomcat.util.bcel.verifier.exc.StaticCodeInstructionConstraintException;
+import org.apache.tomcat.util.bcel.verifier.exc.StaticCodeInstructionOperandConstraintException;
 
 /**
  * This PassVerifier verifies a class file according to
@@ -438,7 +438,7 @@
 	 * This visitor class does the actual checking for the instruction
 	 * operand's constraints.
 	 */
-	private class InstOperandConstraintVisitor extends org.apache.bcel.generic.EmptyVisitor{
+	private class InstOperandConstraintVisitor extends org.apache.tomcat.util.bcel.generic.EmptyVisitor{
 		/** The ConstantPoolGen instance this Visitor operates on. */
 		private ConstantPoolGen cpg;
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/StringRepresentation.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/StringRepresentation.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/StringRepresentation.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/statics/StringRepresentation.java Fri Dec  4 17:59:52 2009
@@ -14,45 +14,45 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.statics;
+package org.apache.tomcat.util.bcel.verifier.statics;
 
 
-import org.apache.bcel.classfile.Annotations;
-import org.apache.bcel.classfile.Code;
-import org.apache.bcel.classfile.CodeException;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantDouble;
-import org.apache.bcel.classfile.ConstantFieldref;
-import org.apache.bcel.classfile.ConstantFloat;
-import org.apache.bcel.classfile.ConstantInteger;
-import org.apache.bcel.classfile.ConstantInterfaceMethodref;
-import org.apache.bcel.classfile.ConstantLong;
-import org.apache.bcel.classfile.ConstantMethodref;
-import org.apache.bcel.classfile.ConstantNameAndType;
-import org.apache.bcel.classfile.ConstantPool;
-import org.apache.bcel.classfile.ConstantString;
-import org.apache.bcel.classfile.ConstantUtf8;
-import org.apache.bcel.classfile.ConstantValue;
-import org.apache.bcel.classfile.Deprecated;
-import org.apache.bcel.classfile.ExceptionTable;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.InnerClass;
-import org.apache.bcel.classfile.InnerClasses;
-import org.apache.bcel.classfile.JavaClass;
-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.Node;
-import org.apache.bcel.classfile.Signature;
-import org.apache.bcel.classfile.SourceFile;
-import org.apache.bcel.classfile.StackMap;
-import org.apache.bcel.classfile.Synthetic;
-import org.apache.bcel.classfile.Unknown;
-import org.apache.bcel.classfile.Visitor;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.classfile.Annotations;
+import org.apache.tomcat.util.bcel.classfile.Code;
+import org.apache.tomcat.util.bcel.classfile.CodeException;
+import org.apache.tomcat.util.bcel.classfile.ConstantClass;
+import org.apache.tomcat.util.bcel.classfile.ConstantDouble;
+import org.apache.tomcat.util.bcel.classfile.ConstantFieldref;
+import org.apache.tomcat.util.bcel.classfile.ConstantFloat;
+import org.apache.tomcat.util.bcel.classfile.ConstantInteger;
+import org.apache.tomcat.util.bcel.classfile.ConstantInterfaceMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantLong;
+import org.apache.tomcat.util.bcel.classfile.ConstantMethodref;
+import org.apache.tomcat.util.bcel.classfile.ConstantNameAndType;
+import org.apache.tomcat.util.bcel.classfile.ConstantPool;
+import org.apache.tomcat.util.bcel.classfile.ConstantString;
+import org.apache.tomcat.util.bcel.classfile.ConstantUtf8;
+import org.apache.tomcat.util.bcel.classfile.ConstantValue;
+import org.apache.tomcat.util.bcel.classfile.Deprecated;
+import org.apache.tomcat.util.bcel.classfile.ExceptionTable;
+import org.apache.tomcat.util.bcel.classfile.Field;
+import org.apache.tomcat.util.bcel.classfile.InnerClass;
+import org.apache.tomcat.util.bcel.classfile.InnerClasses;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+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.Node;
+import org.apache.tomcat.util.bcel.classfile.Signature;
+import org.apache.tomcat.util.bcel.classfile.SourceFile;
+import org.apache.tomcat.util.bcel.classfile.StackMap;
+import org.apache.tomcat.util.bcel.classfile.Synthetic;
+import org.apache.tomcat.util.bcel.classfile.Unknown;
+import org.apache.tomcat.util.bcel.classfile.Visitor;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
 
 /**
  * BCEL's Node classes (those from the classfile API that <B>accept()</B> Visitor
@@ -69,7 +69,7 @@
  * @version $Id$
  * @author Enver Haase
  */
-public class StringRepresentation extends org.apache.bcel.classfile.EmptyVisitor implements Visitor {
+public class StringRepresentation extends org.apache.tomcat.util.bcel.classfile.EmptyVisitor implements Visitor {
     /** The string representation, created by a visitXXX() method, output by toString(). */
     private String tostring;
     /** The node we ask for its string representation. Not really needed; only for debug output. */

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ControlFlowGraph.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ControlFlowGraph.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ControlFlowGraph.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ControlFlowGraph.java Fri Dec  4 17:59:52 2009
@@ -14,25 +14,25 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
 
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.bcel.generic.ATHROW;
-import org.apache.bcel.generic.BranchInstruction;
-import org.apache.bcel.generic.GotoInstruction;
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.JsrInstruction;
-import org.apache.bcel.generic.MethodGen;
-import org.apache.bcel.generic.RET;
-import org.apache.bcel.generic.ReturnInstruction;
-import org.apache.bcel.generic.Select;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.tomcat.util.bcel.generic.ATHROW;
+import org.apache.tomcat.util.bcel.generic.BranchInstruction;
+import org.apache.tomcat.util.bcel.generic.GotoInstruction;
+import org.apache.tomcat.util.bcel.generic.Instruction;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.JsrInstruction;
+import org.apache.tomcat.util.bcel.generic.MethodGen;
+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.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException;
 
 /**
  * This class represents a control flow graph of a method.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandler.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandler.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandler.java Fri Dec  4 17:59:52 2009
@@ -14,11 +14,11 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
 
 
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.ObjectType;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.ObjectType;
 
 /**
  * This class represents an exception handler; that is, an ObjectType

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandlers.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandlers.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandlers.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExceptionHandlers.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
 
 
 import java.util.HashMap;
@@ -22,9 +22,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.bcel.generic.CodeExceptionGen;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.MethodGen;
+import org.apache.tomcat.util.bcel.generic.CodeExceptionGen;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.MethodGen;
 
 /**
  * This class allows easy access to ExceptionHandler objects.

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExecutionVisitor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExecutionVisitor.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExecutionVisitor.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/ExecutionVisitor.java Fri Dec  4 17:59:52 2009
@@ -14,17 +14,17 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
 
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.Constant;
-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.ConstantString;
-import org.apache.bcel.generic.*;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.classfile.Constant;
+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.ConstantString;
+import org.apache.tomcat.util.bcel.generic.*;
 
 /**
  * This Visitor class may be used for a type-based Java Virtual Machine

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

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstConstraintVisitor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstConstraintVisitor.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstConstraintVisitor.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstConstraintVisitor.java Fri Dec  4 17:59:52 2009
@@ -14,27 +14,27 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
 
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantDouble;
-import org.apache.bcel.classfile.ConstantFieldref;
-import org.apache.bcel.classfile.ConstantFloat;
-import org.apache.bcel.classfile.ConstantInteger;
-import org.apache.bcel.classfile.ConstantLong;
-import org.apache.bcel.classfile.ConstantString;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.generic.*;
-import org.apache.bcel.verifier.VerificationResult;
-import org.apache.bcel.verifier.Verifier;
-import org.apache.bcel.verifier.VerifierFactory;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.Constant;
+import org.apache.tomcat.util.bcel.classfile.ConstantClass;
+import org.apache.tomcat.util.bcel.classfile.ConstantDouble;
+import org.apache.tomcat.util.bcel.classfile.ConstantFieldref;
+import org.apache.tomcat.util.bcel.classfile.ConstantFloat;
+import org.apache.tomcat.util.bcel.classfile.ConstantInteger;
+import org.apache.tomcat.util.bcel.classfile.ConstantLong;
+import org.apache.tomcat.util.bcel.classfile.ConstantString;
+import org.apache.tomcat.util.bcel.classfile.Field;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.generic.*;
+import org.apache.tomcat.util.bcel.verifier.VerificationResult;
+import org.apache.tomcat.util.bcel.verifier.Verifier;
+import org.apache.tomcat.util.bcel.verifier.VerifierFactory;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException;
 
 
 /**
@@ -47,12 +47,12 @@
  *
  * @version $Id$
  * @author Enver Haase
- * @see org.apache.bcel.verifier.exc.StructuralCodeConstraintException
- * @see org.apache.bcel.verifier.exc.LinkingConstraintException
+ * @see org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException
+ * @see org.apache.tomcat.util.bcel.verifier.exc.LinkingConstraintException
  */
-public class InstConstraintVisitor extends EmptyVisitor implements org.apache.bcel.generic.Visitor{
+public class InstConstraintVisitor extends EmptyVisitor implements org.apache.tomcat.util.bcel.generic.Visitor{
 
-	private static ObjectType GENERIC_ARRAY = new ObjectType("org.apache.bcel.verifier.structurals.GenericArray");
+	private static ObjectType GENERIC_ARRAY = new ObjectType("org.apache.tomcat.util.bcel.verifier.structurals.GenericArray");
 
 	/**
 	 * The constructor. Constructs a new instance of this class.
@@ -104,7 +104,7 @@
    * This method is called by the visitXXX() to notify the acceptor of this InstConstraintVisitor
    * that a constraint violation has occured. This is done by throwing an instance of a
    * StructuralCodeConstraintException.
-   * @throws org.apache.bcel.verifier.exc.StructuralCodeConstraintException always.
+   * @throws org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException always.
    */
 	private void constraintViolated(Instruction violator, String description){
 		String fq_classname = violator.getClass().getName();
@@ -143,7 +143,7 @@
 
 	/**
 	 * Assures index is of type INT.
-	 * @throws org.apache.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is not satisfied.
+	 * @throws org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is not satisfied.
 	 */
 	private void indexOfInt(Instruction o, Type index){
 		if (! index.equals(Type.INT)) {
@@ -155,7 +155,7 @@
 	 * Assures the ReferenceType r is initialized (or Type.NULL).
 	 * Formally, this means (!(r instanceof UninitializedObjectType)), because
 	 * there are no uninitialized array types.
-	 * @throws org.apache.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is not satisfied.
+	 * @throws org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is not satisfied.
 	 */
 	private void referenceTypeIsInitialized(Instruction o, ReferenceType r){
 		if (r instanceof UninitializedObjectType){
@@ -173,7 +173,7 @@
 	/**
 	 * Assures arrayref is of ArrayType or NULL;
 	 * returns true if and only if arrayref is non-NULL.
-	 * @throws org.apache.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is violated.
+	 * @throws org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is violated.
  	 */
 	private boolean arrayrefOfArrayType(Instruction o, Type arrayref){
 		if (! ((arrayref instanceof ArrayType) || arrayref.equals(Type.NULL)) ) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstructionContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstructionContext.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstructionContext.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/InstructionContext.java Fri Dec  4 17:59:52 2009
@@ -14,11 +14,11 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
 
 
 import java.util.ArrayList;
-import org.apache.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
 
 /**
  * An InstructionContext offers convenient access

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/LocalVariables.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/LocalVariables.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/LocalVariables.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/LocalVariables.java Fri Dec  4 17:59:52 2009
@@ -14,13 +14,13 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
 
 
-import org.apache.bcel.generic.ReferenceType;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.tomcat.util.bcel.generic.ReferenceType;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException;
 
 /**
  * This class implements an array of local variables used for symbolic JVM
@@ -167,7 +167,7 @@
 		else{
 			if (! (locals[i].equals(lv.locals[i])) ){
 /*TODO
-				if ((locals[i] instanceof org.apache.bcel.generic.ReturnaddressType) && (lv.locals[i] instanceof org.apache.bcel.generic.ReturnaddressType)){
+				if ((locals[i] instanceof org.apache.tomcat.util.bcel.generic.ReturnaddressType) && (lv.locals[i] instanceof org.apache.tomcat.util.bcel.generic.ReturnaddressType)){
 					//System.err.println("merging "+locals[i]+" and "+lv.locals[i]);
 					throw new AssertionViolatedException("Merging different ReturnAddresses: '"+locals[i]+"' and '"+lv.locals[i]+"'.");
 				}

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/OperandStack.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/OperandStack.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/OperandStack.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/OperandStack.java Fri Dec  4 17:59:52 2009
@@ -14,20 +14,20 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
 
 
 import java.util.ArrayList;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.ReferenceType;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.tomcat.util.bcel.generic.ObjectType;
+import org.apache.tomcat.util.bcel.generic.ReferenceType;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException;
 
 /**
  * This class implements a stack used for symbolic JVM stack simulation.
  * [It's used an an operand stack substitute.]
- * Elements of this stack are org.apache.bcel.generic.Type objects.
+ * Elements of this stack are org.apache.tomcat.util.bcel.generic.Type objects.
  *
  * @version $Id$
  * @author Enver Haase

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Pass3bVerifier.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Pass3bVerifier.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Pass3bVerifier.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Pass3bVerifier.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
 
 
 import java.io.PrintWriter;
@@ -24,28 +24,28 @@
 import java.util.Random;
 import java.util.Vector;
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.GETFIELD;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.InvokeInstruction;
-import org.apache.bcel.generic.JsrInstruction;
-import org.apache.bcel.generic.LoadInstruction;
-import org.apache.bcel.generic.MethodGen;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.RET;
-import org.apache.bcel.generic.ReturnInstruction;
-import org.apache.bcel.generic.ReturnaddressType;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.PassVerifier;
-import org.apache.bcel.verifier.VerificationResult;
-import org.apache.bcel.verifier.Verifier;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
-import org.apache.bcel.verifier.exc.VerifierConstraintViolatedException;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.Repository;
+import org.apache.tomcat.util.bcel.classfile.JavaClass;
+import org.apache.tomcat.util.bcel.classfile.Method;
+import org.apache.tomcat.util.bcel.generic.ConstantPoolGen;
+import org.apache.tomcat.util.bcel.generic.GETFIELD;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.InvokeInstruction;
+import org.apache.tomcat.util.bcel.generic.JsrInstruction;
+import org.apache.tomcat.util.bcel.generic.LoadInstruction;
+import org.apache.tomcat.util.bcel.generic.MethodGen;
+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.ReturnaddressType;
+import org.apache.tomcat.util.bcel.generic.Type;
+import org.apache.tomcat.util.bcel.verifier.PassVerifier;
+import org.apache.tomcat.util.bcel.verifier.VerificationResult;
+import org.apache.tomcat.util.bcel.verifier.Verifier;
+import org.apache.tomcat.util.bcel.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.tomcat.util.bcel.verifier.exc.VerifierConstraintViolatedException;
 
 /**
  * This PassVerifier verifies a method of class file according to pass 3,
@@ -117,7 +117,7 @@
 	/**
 	 * This class should only be instantiated by a Verifier.
 	 *
-	 * @see org.apache.bcel.verifier.Verifier
+	 * @see org.apache.tomcat.util.bcel.verifier.Verifier
 	 */
 	public Pass3bVerifier(Verifier owner, int method_no){
 		myOwner = owner;
@@ -301,8 +301,8 @@
  	 * verifier-inferred types and the class file's debug information (LocalVariables
  	 * attributes) match [TODO].
  	 *
- 	 * @see org.apache.bcel.verifier.statics.LocalVariablesInfo
- 	 * @see org.apache.bcel.verifier.statics.Pass2Verifier#getLocalVariablesInfo(int)
+ 	 * @see org.apache.tomcat.util.bcel.verifier.statics.LocalVariablesInfo
+ 	 * @see org.apache.tomcat.util.bcel.verifier.statics.Pass2Verifier#getLocalVariablesInfo(int)
  	 */
 	public VerificationResult do_verify(){
 		if (! myOwner.doPass3a(method_no).equals(VerificationResult.VR_OK)){

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutine.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutine.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutine.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutine.java Fri Dec  4 17:59:52 2009
@@ -14,10 +14,10 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
 
 
-import org.apache.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
 
 /**
  * This interface defines properties of JVM bytecode subroutines.
@@ -40,7 +40,7 @@
 	 * Note that JustIce has a pretty rigid notion of a subroutine.
 	 * <B>Must not be invoked on the 'top-level subroutine'.</B>
 	 *
-	 * @see org.apache.bcel.verifier.structurals.Subroutines
+	 * @see org.apache.tomcat.util.bcel.verifier.structurals.Subroutines
 	 */
 	public InstructionHandle getLeavingRET();
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutines.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutines.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutines.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/Subroutines.java Fri Dec  4 17:59:52 2009
@@ -14,7 +14,7 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,22 +23,22 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.bcel.generic.ASTORE;
-import org.apache.bcel.generic.ATHROW;
-import org.apache.bcel.generic.BranchInstruction;
-import org.apache.bcel.generic.CodeExceptionGen;
-import org.apache.bcel.generic.GotoInstruction;
-import org.apache.bcel.generic.IndexedInstruction;
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.JsrInstruction;
-import org.apache.bcel.generic.LocalVariableInstruction;
-import org.apache.bcel.generic.MethodGen;
-import org.apache.bcel.generic.RET;
-import org.apache.bcel.generic.ReturnInstruction;
-import org.apache.bcel.generic.Select;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.tomcat.util.bcel.generic.ASTORE;
+import org.apache.tomcat.util.bcel.generic.ATHROW;
+import org.apache.tomcat.util.bcel.generic.BranchInstruction;
+import org.apache.tomcat.util.bcel.generic.CodeExceptionGen;
+import org.apache.tomcat.util.bcel.generic.GotoInstruction;
+import org.apache.tomcat.util.bcel.generic.IndexedInstruction;
+import org.apache.tomcat.util.bcel.generic.Instruction;
+import org.apache.tomcat.util.bcel.generic.InstructionHandle;
+import org.apache.tomcat.util.bcel.generic.JsrInstruction;
+import org.apache.tomcat.util.bcel.generic.LocalVariableInstruction;
+import org.apache.tomcat.util.bcel.generic.MethodGen;
+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.verifier.exc.AssertionViolatedException;
+import org.apache.tomcat.util.bcel.verifier.exc.StructuralCodeConstraintException;
 
 	/**
 	 * Instances of this class contain information about the subroutines

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/UninitializedObjectType.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/UninitializedObjectType.java?rev=887302&r1=886844&r2=887302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/UninitializedObjectType.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/verifier/structurals/UninitializedObjectType.java Fri Dec  4 17:59:52 2009
@@ -14,12 +14,12 @@
  *  limitations under the License. 
  *
  */ 
-package org.apache.bcel.verifier.structurals;
+package org.apache.tomcat.util.bcel.verifier.structurals;
 
 
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.ReferenceType;
+import org.apache.tomcat.util.bcel.Constants;
+import org.apache.tomcat.util.bcel.generic.ObjectType;
+import org.apache.tomcat.util.bcel.generic.ReferenceType;
 
 /**
  * This class represents an uninitialized object type; see The Java



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


Mime
View raw message