Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassLoaderRepository.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassLoaderRepository.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassLoaderRepository.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassLoaderRepository.java Sun Aug 9 21:21:10 2015 @@ -15,14 +15,15 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.io.IOException; import java.io.InputStream; import java.util.HashMap; import java.util.Map; -import org.apache.bcel.classfile.ClassParser; -import org.apache.bcel.classfile.JavaClass; + +import org.apache.commons.bcel6.classfile.ClassParser; +import org.apache.commons.bcel6.classfile.JavaClass; /** * The repository maintains information about which classes have @@ -31,7 +32,7 @@ import org.apache.bcel.classfile.JavaCla * It loads its data from the ClassLoader implementation * passed into its constructor. * - * @see org.apache.bcel.Repository + * @see org.apache.commons.bcel6.Repository * * @version $Id$ * @author <A HREF="mailto:[email protected]";>M. Dahm</A>
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.io.DataInputStream; import java.io.File; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassQueue.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassQueue.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassQueue.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassQueue.java Sun Aug 9 21:21:10 2015 @@ -15,10 +15,11 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.util.LinkedList; -import org.apache.bcel.classfile.JavaClass; + +import org.apache.commons.bcel6.classfile.JavaClass; /** * Utility class implementing a (typesafe) queue of JavaClass Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassSet.java Sun Aug 9 21:21:10 2015 @@ -15,12 +15,13 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.apache.bcel.classfile.JavaClass; + +import org.apache.commons.bcel6.classfile.JavaClass; /** * Utility class implementing a (typesafe) set of JavaClass objects. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassStack.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassStack.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassStack.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassStack.java Sun Aug 9 21:21:10 2015 @@ -15,10 +15,11 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.util.Stack; -import org.apache.bcel.classfile.JavaClass; + +import org.apache.commons.bcel6.classfile.JavaClass; /** * Utility class implementing a (typesafe) stack of JavaClass objects. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassVector.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassVector.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassVector.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassVector.java Sun Aug 9 21:21:10 2015 @@ -15,11 +15,12 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.util.ArrayList; import java.util.List; -import org.apache.bcel.classfile.JavaClass; + +import org.apache.commons.bcel6.classfile.JavaClass; /** * Utility class implementing a (typesafe) collection of JavaClass Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/CodeHTML.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/CodeHTML.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/CodeHTML.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/CodeHTML.java Sun Aug 9 21:21:10 2015 @@ -15,25 +15,26 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; import java.util.BitSet; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.Code; -import org.apache.bcel.classfile.CodeException; -import org.apache.bcel.classfile.ConstantFieldref; -import org.apache.bcel.classfile.ConstantInterfaceMethodref; -import org.apache.bcel.classfile.ConstantInvokeDynamic; -import org.apache.bcel.classfile.ConstantMethodref; -import org.apache.bcel.classfile.ConstantNameAndType; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.LocalVariable; -import org.apache.bcel.classfile.LocalVariableTable; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.Utility; + +import org.apache.commons.bcel6.classfile.Attribute; +import org.apache.commons.bcel6.classfile.Code; +import org.apache.commons.bcel6.classfile.CodeException; +import org.apache.commons.bcel6.classfile.ConstantFieldref; +import org.apache.commons.bcel6.classfile.ConstantInterfaceMethodref; +import org.apache.commons.bcel6.classfile.ConstantInvokeDynamic; +import org.apache.commons.bcel6.classfile.ConstantMethodref; +import org.apache.commons.bcel6.classfile.ConstantNameAndType; +import org.apache.commons.bcel6.classfile.ConstantPool; +import org.apache.commons.bcel6.classfile.LocalVariable; +import org.apache.commons.bcel6.classfile.LocalVariableTable; +import org.apache.commons.bcel6.classfile.Method; +import org.apache.commons.bcel6.classfile.Utility; /** * Convert code into HTML file. @@ -42,7 +43,7 @@ import org.apache.bcel.classfile.Utility * @author <A HREF="mailto:[email protected]";>M. Dahm</A> * */ -final class CodeHTML implements org.apache.bcel.Constants { +final class CodeHTML implements org.apache.commons.bcel6.Constants { private final String class_name; // name of current class // private Method[] methods; // Methods to print Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ConstantHTML.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ConstantHTML.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ConstantHTML.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ConstantHTML.java Sun Aug 9 21:21:10 2015 @@ -15,21 +15,22 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.classfile.ConstantClass; -import org.apache.bcel.classfile.ConstantFieldref; -import org.apache.bcel.classfile.ConstantInterfaceMethodref; -import org.apache.bcel.classfile.ConstantMethodref; -import org.apache.bcel.classfile.ConstantNameAndType; -import org.apache.bcel.classfile.ConstantPool; -import org.apache.bcel.classfile.ConstantString; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.Utility; + +import org.apache.commons.bcel6.classfile.Constant; +import org.apache.commons.bcel6.classfile.ConstantClass; +import org.apache.commons.bcel6.classfile.ConstantFieldref; +import org.apache.commons.bcel6.classfile.ConstantInterfaceMethodref; +import org.apache.commons.bcel6.classfile.ConstantMethodref; +import org.apache.commons.bcel6.classfile.ConstantNameAndType; +import org.apache.commons.bcel6.classfile.ConstantPool; +import org.apache.commons.bcel6.classfile.ConstantString; +import org.apache.commons.bcel6.classfile.Method; +import org.apache.commons.bcel6.classfile.Utility; /** * Convert constant pool into HTML file. @@ -38,7 +39,7 @@ import org.apache.bcel.classfile.Utility * @author <A HREF="mailto:[email protected]";>M. Dahm</A> * */ -final class ConstantHTML implements org.apache.bcel.Constants { +final class ConstantHTML implements org.apache.commons.bcel6.Constants { private final String class_name; // name of current class private final String class_package; // name of package Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/InstructionFinder.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.util.ArrayList; import java.util.HashMap; @@ -26,11 +26,11 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.bcel.Constants; -import org.apache.bcel.generic.ClassGenException; -import org.apache.bcel.generic.Instruction; -import org.apache.bcel.generic.InstructionHandle; -import org.apache.bcel.generic.InstructionList; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.generic.ClassGenException; +import org.apache.commons.bcel6.generic.Instruction; +import org.apache.commons.bcel6.generic.InstructionHandle; +import org.apache.commons.bcel6.generic.InstructionList; /** * InstructionFinder is a tool to search for given instructions patterns, i.e., Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/JavaWrapper.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/JavaWrapper.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/JavaWrapper.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/JavaWrapper.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -26,11 +26,11 @@ import java.lang.reflect.Modifier; * for your own applications.<br> * Call this wrapper with: * - * <pre>java org.apache.bcel.util.JavaWrapper <real.class.name> [arguments]</pre> + * <pre>java org.apache.commons.bcel6.util.JavaWrapper <real.class.name> [arguments]</pre> * * <p>To use your own class loader you can set the "bcel.classloader" system property - * which defaults to "org.apache.bcel.util.ClassLoader", e.g., with:</p> - * <pre>java org.apache.bcel.util.JavaWrapper -Dbcel.classloader=foo.MyLoader <real.class.name> [arguments]</pre> + * which defaults to "org.apache.commons.bcel6.util.ClassLoader", e.g., with:</p> + * <pre>java org.apache.commons.bcel6.util.JavaWrapper -Dbcel.classloader=foo.MyLoader <real.class.name> [arguments]</pre> * * @version $Id$ * @author <A HREF="mailto:[email protected]";>M. Dahm</A> @@ -44,7 +44,7 @@ public class JavaWrapper { private static java.lang.ClassLoader getClassLoader() { String s = System.getProperty("bcel.classloader"); if ((s == null) || "".equals(s)) { - s = "org.apache.bcel.util.ClassLoader"; + s = "org.apache.commons.bcel6.util.ClassLoader"; } try { return (java.lang.ClassLoader) Class.forName(s).newInstance(); Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MethodHTML.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MethodHTML.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MethodHTML.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/MethodHTML.java Sun Aug 9 21:21:10 2015 @@ -15,18 +15,19 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import org.apache.bcel.classfile.Attribute; -import org.apache.bcel.classfile.Code; -import org.apache.bcel.classfile.ConstantValue; -import org.apache.bcel.classfile.ExceptionTable; -import org.apache.bcel.classfile.Field; -import org.apache.bcel.classfile.Method; -import org.apache.bcel.classfile.Utility; + +import org.apache.commons.bcel6.classfile.Attribute; +import org.apache.commons.bcel6.classfile.Code; +import org.apache.commons.bcel6.classfile.ConstantValue; +import org.apache.commons.bcel6.classfile.ExceptionTable; +import org.apache.commons.bcel6.classfile.Field; +import org.apache.commons.bcel6.classfile.Method; +import org.apache.commons.bcel6.classfile.Utility; /** * Convert methods and fields into HTML file. @@ -35,7 +36,7 @@ import org.apache.bcel.classfile.Utility * @author <A HREF="mailto:[email protected]";>M. Dahm</A> * */ -final class MethodHTML implements org.apache.bcel.Constants { +final class MethodHTML implements org.apache.commons.bcel6.Constants { private final String class_name; // name of current class private final PrintWriter file; // file to write to Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Repository.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Repository.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Repository.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/Repository.java Sun Aug 9 21:21:10 2015 @@ -15,16 +15,16 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; -import org.apache.bcel.classfile.JavaClass; +import org.apache.commons.bcel6.classfile.JavaClass; /** * Abstract definition of a class repository. Instances may be used * to load classes from different sources and may be used in the * Repository.setRepository method. * - * @see org.apache.bcel.Repository + * @see org.apache.commons.bcel6.Repository * @version $Id$ * @author <A HREF="mailto:[email protected]";>M. Dahm</A> * @author David Dixon-Peugh Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/SyntheticRepository.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/SyntheticRepository.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/SyntheticRepository.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/SyntheticRepository.java Sun Aug 9 21:21:10 2015 @@ -15,15 +15,16 @@ * limitations under the License. * */ -package org.apache.bcel.util; +package org.apache.commons.bcel6.util; import java.io.IOException; import java.io.InputStream; import java.lang.ref.SoftReference; import java.util.HashMap; import java.util.Map; -import org.apache.bcel.classfile.ClassParser; -import org.apache.bcel.classfile.JavaClass; + +import org.apache.commons.bcel6.classfile.ClassParser; +import org.apache.commons.bcel6.classfile.JavaClass; /** * This repository is used in situations where a Class is created @@ -35,7 +36,7 @@ import org.apache.bcel.classfile.JavaCla * It is designed to be used as a singleton, however it * can also be used with custom classpaths. * - * @see org.apache.bcel.Repository + * @see org.apache.commons.bcel6.Repository * * @version $Id$ * @author <A HREF="mailto:[email protected]";>M. Dahm</A> Copied: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/GraphicalVerifier.java (from r1694824, commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java) URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/GraphicalVerifier.java?p2=commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/GraphicalVerifier.java&p1=commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java&r1=1694824&r2=1694911&rev=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/GraphicalVerifier.java Sun Aug 9 21:21:10 2015 @@ -15,12 +15,13 @@ * limitations under the License. * */ -package org.apache.bcel.verifier; +package org.apache.commons.bcel6.verifier; import java.awt.Dimension; import java.awt.Toolkit; import javax.swing.UIManager; -import org.apache.bcel.generic.Type; + +import org.apache.commons.bcel6.generic.Type; /** * A graphical user interface application demonstrating JustIce. Copied: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/NativeVerifier.java (from r1694824, commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/NativeVerifier.java) URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/NativeVerifier.java?p2=commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/NativeVerifier.java&p1=commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/NativeVerifier.java&r1=1694824&r2=1694911&rev=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/NativeVerifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/NativeVerifier.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier; +package org.apache.commons.bcel6.verifier; /** * The NativeVerifier class implements a main(String[] args) method that's Copied: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/PassVerifier.java (from r1694824, commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/PassVerifier.java) URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/PassVerifier.java?p2=commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/PassVerifier.java&p1=commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/PassVerifier.java&r1=1694824&r2=1694911&rev=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/PassVerifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/PassVerifier.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier; +package org.apache.commons.bcel6.verifier; import java.util.ArrayList; import java.util.List; @@ -43,7 +43,7 @@ import java.util.List; * * @version $Id$ * @author Enver Haase - * @see org.apache.bcel.verifier.Verifier + * @see org.apache.commons.bcel6.verifier.Verifier * @see #verify() */ public abstract class PassVerifier { Copied: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/TransitiveHull.java (from r1694824, commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/TransitiveHull.java) URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/TransitiveHull.java?p2=commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/TransitiveHull.java&p1=commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/TransitiveHull.java&r1=1694824&r2=1694911&rev=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/TransitiveHull.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/TransitiveHull.java Sun Aug 9 21:21:10 2015 @@ -15,10 +15,10 @@ * limitations under the License. * */ -package org.apache.bcel.verifier; +package org.apache.commons.bcel6.verifier; -import org.apache.bcel.Repository; -import org.apache.bcel.classfile.JavaClass; +import org.apache.commons.bcel6.Repository; +import org.apache.commons.bcel6.classfile.JavaClass; /** * This class has a main method implementing a demonstration program Copied: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerificationResult.java (from r1694824, commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java) URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerificationResult.java?p2=commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerificationResult.java&p1=commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java&r1=1694824&r2=1694911&rev=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerificationResult.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerificationResult.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier; +package org.apache.commons.bcel6.verifier; /** * A VerificationResult is what a PassVerifier returns Copied: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/Verifier.java (from r1694824, commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/Verifier.java) URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/Verifier.java?p2=commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/Verifier.java&p1=commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/Verifier.java&r1=1694824&r2=1694911&rev=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/Verifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/Verifier.java Sun Aug 9 21:21:10 2015 @@ -15,18 +15,18 @@ * limitations under the License. * */ -package org.apache.bcel.verifier; +package org.apache.commons.bcel6.verifier; import java.util.ArrayList; import java.util.HashMap; import java.util.List; 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.commons.bcel6.classfile.JavaClass; +import org.apache.commons.bcel6.verifier.statics.Pass1Verifier; +import org.apache.commons.bcel6.verifier.statics.Pass2Verifier; +import org.apache.commons.bcel6.verifier.statics.Pass3aVerifier; +import org.apache.commons.bcel6.verifier.structurals.Pass3bVerifier; /** * A Verifier instance is there to verify a class file according to The Java Virtual @@ -41,8 +41,8 @@ import org.apache.bcel.verifier.structur * * @version $Id$ * @author Enver Haase - * @see org.apache.bcel.verifier.VerifierFactory - * @see org.apache.bcel.verifier.PassVerifier + * @see org.apache.commons.bcel6.verifier.VerifierFactory + * @see org.apache.commons.bcel6.verifier.PassVerifier */ public class Verifier { @@ -164,7 +164,7 @@ public class Verifier { int meth = pv.getMethodNo(); for (String element : p3am) { messages.add("Pass 3a, method " + meth + " ('" - + org.apache.bcel.Repository.lookupClass(classname).getMethods()[meth] + + org.apache.commons.bcel6.Repository.lookupClass(classname).getMethods()[meth] + "'): " + element); } } @@ -173,7 +173,7 @@ public class Verifier { int meth = pv.getMethodNo(); for (String element : p3bm) { messages.add("Pass 3b, method " + meth + " ('" - + org.apache.bcel.Repository.lookupClass(classname).getMethods()[meth] + + org.apache.commons.bcel6.Repository.lookupClass(classname).getMethods()[meth] + "'): " + element); } } @@ -215,7 +215,7 @@ public class Verifier { 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.commons.bcel6.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 + " ['" @@ -236,7 +236,7 @@ public class Verifier { System.out.println("\n"); // avoid swapping. v.flush(); - org.apache.bcel.Repository.clearCache(); + org.apache.commons.bcel6.Repository.clearCache(); System.gc(); } catch (ClassNotFoundException e) { e.printStackTrace(); Copied: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java (from r1694824, commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java) URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java?p2=commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java&p1=commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java&r1=1694824&r2=1694911&rev=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier; +package org.apache.commons.bcel6.verifier; import java.awt.AWTEvent; import java.awt.CardLayout; @@ -38,8 +38,9 @@ import javax.swing.JSplitPane; 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.commons.bcel6.Repository; +import org.apache.commons.bcel6.classfile.JavaClass; /** * This class implements a machine-generated frame for use with Copied: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactory.java (from r1694824, commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactory.java) URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactory.java?p2=commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactory.java&p1=commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactory.java&r1=1694824&r2=1694911&rev=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactory.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactory.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier; +package org.apache.commons.bcel6.verifier; import java.util.HashMap; import java.util.List; @@ -30,7 +30,7 @@ import java.util.Vector; * * @version $Id$ * @author Enver Haase - * @see org.apache.bcel.verifier.Verifier + * @see org.apache.commons.bcel6.verifier.Verifier */ public class VerifierFactory { Copied: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactoryListModel.java (from r1694824, commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java) URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactoryListModel.java?p2=commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactoryListModel.java&p1=commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java&r1=1694824&r2=1694911&rev=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryListModel.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactoryListModel.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier; +package org.apache.commons.bcel6.verifier; import java.util.ArrayList; import java.util.List; @@ -32,7 +32,7 @@ import javax.swing.event.ListDataListene * @version $Id$ * @author Enver Haase */ -public class VerifierFactoryListModel implements org.apache.bcel.verifier.VerifierFactoryObserver, +public class VerifierFactoryListModel implements org.apache.commons.bcel6.verifier.VerifierFactoryObserver, javax.swing.ListModel { private final List<ListDataListener> listeners = new ArrayList<ListDataListener>(); Copied: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactoryObserver.java (from r1694824, commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryObserver.java) URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactoryObserver.java?p2=commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactoryObserver.java&p1=commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryObserver.java&r1=1694824&r2=1694911&rev=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifierFactoryObserver.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierFactoryObserver.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier; +package org.apache.commons.bcel6.verifier; /** * VerifierFactoryObserver instances are notified when new Verifier Copied: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifyDialog.java (from r1694824, commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifyDialog.java) URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifyDialog.java?p2=commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifyDialog.java&p1=commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifyDialog.java&r1=1694824&r2=1694911&rev=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/VerifyDialog.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifyDialog.java Sun Aug 9 21:21:10 2015 @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.bcel.verifier; +package org.apache.commons.bcel6.verifier; import java.awt.Color; -import org.apache.bcel.Repository; -import org.apache.bcel.classfile.JavaClass; +import org.apache.commons.bcel6.Repository; +import org.apache.commons.bcel6.classfile.JavaClass; /** * A class for simple graphical class file verification. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/AssertionViolatedException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/AssertionViolatedException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/AssertionViolatedException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/AssertionViolatedException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/ClassConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/ClassConstraintException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/ClassConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/ClassConstraintException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/CodeConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/CodeConstraintException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/CodeConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/CodeConstraintException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; /** * Instances of this class are thrown by BCEL's class file verifier "JustIce" when Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/InvalidMethodException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/InvalidMethodException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/InvalidMethodException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/InvalidMethodException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; /** * Instances of this class are thrown by BCEL's class file verifier "JustIce" Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/LinkingConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/LinkingConstraintException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/LinkingConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/LinkingConstraintException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; /** * Instances of this class are thrown by BCEL's class file verifier "JustIce" when Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/LoadingException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/LoadingException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/LoadingException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/LoadingException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/LocalVariableInfoInconsistentException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/LocalVariableInfoInconsistentException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/LocalVariableInfoInconsistentException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/LocalVariableInfoInconsistentException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StaticCodeConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StaticCodeConstraintException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StaticCodeConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StaticCodeConstraintException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StaticCodeInstructionConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StaticCodeInstructionConstraintException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StaticCodeInstructionConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StaticCodeInstructionConstraintException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StaticCodeInstructionOperandConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StaticCodeInstructionOperandConstraintException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StaticCodeInstructionOperandConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StaticCodeInstructionOperandConstraintException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StructuralCodeConstraintException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StructuralCodeConstraintException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StructuralCodeConstraintException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/StructuralCodeConstraintException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; /** * Instances of this class are thrown by BCEL's class file verifier "JustIce" when Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/Utility.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/Utility.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/Utility.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/Utility.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; import java.io.PrintWriter; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/VerificationException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/VerificationException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/VerificationException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/VerificationException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/VerifierConstraintViolatedException.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/VerifierConstraintViolatedException.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/VerifierConstraintViolatedException.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/exc/VerifierConstraintViolatedException.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.exc; +package org.apache.commons.bcel6.verifier.exc; /** Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/DOUBLE_Upper.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/DOUBLE_Upper.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/DOUBLE_Upper.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/DOUBLE_Upper.java Sun Aug 9 21:21:10 2015 @@ -15,11 +15,11 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.statics; +package org.apache.commons.bcel6.verifier.statics; -import org.apache.bcel.Constants; -import org.apache.bcel.generic.Type; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.generic.Type; /** * This class represents the upper half of a DOUBLE variable. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/IntList.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/IntList.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/IntList.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/IntList.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.statics; +package org.apache.commons.bcel6.verifier.statics; import java.util.ArrayList; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LONG_Upper.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LONG_Upper.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LONG_Upper.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LONG_Upper.java Sun Aug 9 21:21:10 2015 @@ -15,11 +15,11 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.statics; +package org.apache.commons.bcel6.verifier.statics; -import org.apache.bcel.Constants; -import org.apache.bcel.generic.Type; +import org.apache.commons.bcel6.Constants; +import org.apache.commons.bcel6.generic.Type; /** * This class represents the upper half of a LONG variable. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java Sun Aug 9 21:21:10 2015 @@ -15,12 +15,13 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.statics; +package org.apache.commons.bcel6.verifier.statics; import java.util.Hashtable; -import org.apache.bcel.generic.Type; -import org.apache.bcel.verifier.exc.LocalVariableInfoInconsistentException; + +import org.apache.commons.bcel6.generic.Type; +import org.apache.commons.bcel6.verifier.exc.LocalVariableInfoInconsistentException; /** * A utility class holding the information about Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariablesInfo.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariablesInfo.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariablesInfo.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariablesInfo.java Sun Aug 9 21:21:10 2015 @@ -15,12 +15,12 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.statics; +package org.apache.commons.bcel6.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.commons.bcel6.generic.Type; +import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException; +import org.apache.commons.bcel6.verifier.exc.LocalVariableInfoInconsistentException; /** * A utility class holding the information about Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass1Verifier.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass1Verifier.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass1Verifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass1Verifier.java Sun Aug 9 21:21:10 2015 @@ -15,17 +15,17 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.statics; +package org.apache.commons.bcel6.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.commons.bcel6.Repository; +import org.apache.commons.bcel6.classfile.ClassFormatException; +import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.commons.bcel6.verifier.PassVerifier; +import org.apache.commons.bcel6.verifier.VerificationResult; +import org.apache.commons.bcel6.verifier.Verifier; +import org.apache.commons.bcel6.verifier.exc.LoadingException; +import org.apache.commons.bcel6.verifier.exc.Utility; /** * This PassVerifier verifies a class file according to pass 1 as @@ -67,7 +67,7 @@ public final class Pass1Verifier extends /** * Should only be instantiated by a Verifier. * - * @see org.apache.bcel.verifier.Verifier + * @see org.apache.commons.bcel6.verifier.Verifier */ public Pass1Verifier(Verifier owner){ myOwner = owner; @@ -129,7 +129,7 @@ public final class Pass1Verifier extends * (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).</P> * - * @see org.apache.bcel.Repository + * @see org.apache.commons.bcel6.Repository */ @Override public VerificationResult do_verify(){ Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.statics; +package org.apache.commons.bcel6.verifier.statics; import java.util.HashMap; @@ -23,53 +23,54 @@ import java.util.HashSet; 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.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.commons.bcel6.Constants; +import org.apache.commons.bcel6.Repository; +import org.apache.commons.bcel6.classfile.Attribute; +import org.apache.commons.bcel6.classfile.ClassFormatException; +import org.apache.commons.bcel6.classfile.Code; +import org.apache.commons.bcel6.classfile.CodeException; +import org.apache.commons.bcel6.classfile.Constant; +import org.apache.commons.bcel6.classfile.ConstantClass; +import org.apache.commons.bcel6.classfile.ConstantDouble; +import org.apache.commons.bcel6.classfile.ConstantFieldref; +import org.apache.commons.bcel6.classfile.ConstantFloat; +import org.apache.commons.bcel6.classfile.ConstantInteger; +import org.apache.commons.bcel6.classfile.ConstantInterfaceMethodref; +import org.apache.commons.bcel6.classfile.ConstantLong; +import org.apache.commons.bcel6.classfile.ConstantMethodref; +import org.apache.commons.bcel6.classfile.ConstantNameAndType; +import org.apache.commons.bcel6.classfile.ConstantPool; +import org.apache.commons.bcel6.classfile.ConstantString; +import org.apache.commons.bcel6.classfile.ConstantUtf8; +import org.apache.commons.bcel6.classfile.ConstantValue; +import org.apache.commons.bcel6.classfile.Deprecated; +import org.apache.commons.bcel6.classfile.DescendingVisitor; +import org.apache.commons.bcel6.classfile.EmptyVisitor; +import org.apache.commons.bcel6.classfile.ExceptionTable; +import org.apache.commons.bcel6.classfile.Field; +import org.apache.commons.bcel6.classfile.InnerClass; +import org.apache.commons.bcel6.classfile.InnerClasses; +import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.commons.bcel6.classfile.LineNumber; +import org.apache.commons.bcel6.classfile.LineNumberTable; +import org.apache.commons.bcel6.classfile.LocalVariable; +import org.apache.commons.bcel6.classfile.LocalVariableTable; +import org.apache.commons.bcel6.classfile.Method; +import org.apache.commons.bcel6.classfile.Node; +import org.apache.commons.bcel6.classfile.SourceFile; +import org.apache.commons.bcel6.classfile.Synthetic; +import org.apache.commons.bcel6.classfile.Unknown; +import org.apache.commons.bcel6.generic.ArrayType; +import org.apache.commons.bcel6.generic.ObjectType; +import org.apache.commons.bcel6.generic.Type; +import org.apache.commons.bcel6.verifier.PassVerifier; +import org.apache.commons.bcel6.verifier.VerificationResult; +import org.apache.commons.bcel6.verifier.Verifier; +import org.apache.commons.bcel6.verifier.VerifierFactory; +import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException; +import org.apache.commons.bcel6.verifier.exc.ClassConstraintException; +import org.apache.commons.bcel6.verifier.exc.LocalVariableInfoInconsistentException; /** * This PassVerifier verifies a class file according to @@ -143,7 +144,7 @@ public final class Pass2Verifier extends * 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.commons.bcel6.verifier.statics.Pass3aVerifier */ @Override public VerificationResult do_verify(){ @@ -306,7 +307,7 @@ public final class Pass2Verifier extends * * @see #constant_pool_entries_satisfy_static_constraints() */ - private class CPESSC_Visitor extends org.apache.bcel.classfile.EmptyVisitor{ + private class CPESSC_Visitor extends org.apache.commons.bcel6.classfile.EmptyVisitor{ private final Class<?> CONST_Class; /* private Class<?> CONST_Fieldref; @@ -335,19 +336,19 @@ public final class Pass2Verifier extends cp = _jc.getConstantPool(); cplen = cp.getLength(); - CONST_Class = org.apache.bcel.classfile.ConstantClass.class; + CONST_Class = org.apache.commons.bcel6.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.commons.bcel6.classfile.ConstantFieldref.class; + CONST_Methodref = org.apache.commons.bcel6.classfile.ConstantMethodref.class; + CONST_InterfaceMethodref = org.apache.commons.bcel6.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.commons.bcel6.classfile.ConstantString.class; + CONST_Integer = org.apache.commons.bcel6.classfile.ConstantInteger.class; + CONST_Float = org.apache.commons.bcel6.classfile.ConstantFloat.class; + CONST_Long = org.apache.commons.bcel6.classfile.ConstantLong.class; + CONST_Double = org.apache.commons.bcel6.classfile.ConstantDouble.class; + CONST_NameAndType = org.apache.commons.bcel6.classfile.ConstantNameAndType.class; + CONST_Utf8 = org.apache.commons.bcel6.classfile.ConstantUtf8.class; carrier = new DescendingVisitor(_jc, this); carrier.visit(); @@ -1203,7 +1204,7 @@ public final class Pass2Verifier extends * pool must be valid.</B> * * @see #constant_pool_entries_satisfy_static_constraints() - * @see org.apache.bcel.classfile.ConstantCP + * @see org.apache.commons.bcel6.classfile.ConstantCP */ private class FAMRAV_Visitor extends EmptyVisitor{ private final ConstantPool cp; // ==jc.getConstantPool() -- only here to save typing work. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass3aVerifier.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass3aVerifier.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass3aVerifier.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass3aVerifier.java Sun Aug 9 21:21:10 2015 @@ -15,89 +15,89 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.statics; +package org.apache.commons.bcel6.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.INVOKEDYNAMIC; -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.commons.bcel6.Constants; +import org.apache.commons.bcel6.Repository; +import org.apache.commons.bcel6.classfile.Attribute; +import org.apache.commons.bcel6.classfile.Code; +import org.apache.commons.bcel6.classfile.CodeException; +import org.apache.commons.bcel6.classfile.Constant; +import org.apache.commons.bcel6.classfile.ConstantClass; +import org.apache.commons.bcel6.classfile.ConstantDouble; +import org.apache.commons.bcel6.classfile.ConstantFieldref; +import org.apache.commons.bcel6.classfile.ConstantFloat; +import org.apache.commons.bcel6.classfile.ConstantInteger; +import org.apache.commons.bcel6.classfile.ConstantInterfaceMethodref; +import org.apache.commons.bcel6.classfile.ConstantLong; +import org.apache.commons.bcel6.classfile.ConstantMethodref; +import org.apache.commons.bcel6.classfile.ConstantNameAndType; +import org.apache.commons.bcel6.classfile.ConstantString; +import org.apache.commons.bcel6.classfile.ConstantUtf8; +import org.apache.commons.bcel6.classfile.Field; +import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.commons.bcel6.classfile.LineNumber; +import org.apache.commons.bcel6.classfile.LineNumberTable; +import org.apache.commons.bcel6.classfile.LocalVariable; +import org.apache.commons.bcel6.classfile.LocalVariableTable; +import org.apache.commons.bcel6.classfile.Method; +import org.apache.commons.bcel6.generic.ALOAD; +import org.apache.commons.bcel6.generic.ANEWARRAY; +import org.apache.commons.bcel6.generic.ASTORE; +import org.apache.commons.bcel6.generic.ATHROW; +import org.apache.commons.bcel6.generic.ArrayType; +import org.apache.commons.bcel6.generic.BREAKPOINT; +import org.apache.commons.bcel6.generic.CHECKCAST; +import org.apache.commons.bcel6.generic.ConstantPoolGen; +import org.apache.commons.bcel6.generic.DLOAD; +import org.apache.commons.bcel6.generic.DSTORE; +import org.apache.commons.bcel6.generic.FLOAD; +import org.apache.commons.bcel6.generic.FSTORE; +import org.apache.commons.bcel6.generic.FieldInstruction; +import org.apache.commons.bcel6.generic.GETSTATIC; +import org.apache.commons.bcel6.generic.GotoInstruction; +import org.apache.commons.bcel6.generic.IINC; +import org.apache.commons.bcel6.generic.ILOAD; +import org.apache.commons.bcel6.generic.IMPDEP1; +import org.apache.commons.bcel6.generic.IMPDEP2; +import org.apache.commons.bcel6.generic.INSTANCEOF; +import org.apache.commons.bcel6.generic.INVOKEDYNAMIC; +import org.apache.commons.bcel6.generic.INVOKEINTERFACE; +import org.apache.commons.bcel6.generic.INVOKESPECIAL; +import org.apache.commons.bcel6.generic.INVOKESTATIC; +import org.apache.commons.bcel6.generic.INVOKEVIRTUAL; +import org.apache.commons.bcel6.generic.ISTORE; +import org.apache.commons.bcel6.generic.Instruction; +import org.apache.commons.bcel6.generic.InstructionHandle; +import org.apache.commons.bcel6.generic.InstructionList; +import org.apache.commons.bcel6.generic.InvokeInstruction; +import org.apache.commons.bcel6.generic.JsrInstruction; +import org.apache.commons.bcel6.generic.LDC; +import org.apache.commons.bcel6.generic.LDC2_W; +import org.apache.commons.bcel6.generic.LLOAD; +import org.apache.commons.bcel6.generic.LOOKUPSWITCH; +import org.apache.commons.bcel6.generic.LSTORE; +import org.apache.commons.bcel6.generic.LoadClass; +import org.apache.commons.bcel6.generic.MULTIANEWARRAY; +import org.apache.commons.bcel6.generic.NEW; +import org.apache.commons.bcel6.generic.NEWARRAY; +import org.apache.commons.bcel6.generic.ObjectType; +import org.apache.commons.bcel6.generic.PUTSTATIC; +import org.apache.commons.bcel6.generic.RET; +import org.apache.commons.bcel6.generic.ReturnInstruction; +import org.apache.commons.bcel6.generic.TABLESWITCH; +import org.apache.commons.bcel6.generic.Type; +import org.apache.commons.bcel6.verifier.PassVerifier; +import org.apache.commons.bcel6.verifier.VerificationResult; +import org.apache.commons.bcel6.verifier.Verifier; +import org.apache.commons.bcel6.verifier.VerifierFactory; +import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException; +import org.apache.commons.bcel6.verifier.exc.ClassConstraintException; +import org.apache.commons.bcel6.verifier.exc.InvalidMethodException; +import org.apache.commons.bcel6.verifier.exc.StaticCodeConstraintException; +import org.apache.commons.bcel6.verifier.exc.StaticCodeInstructionConstraintException; +import org.apache.commons.bcel6.verifier.exc.StaticCodeInstructionOperandConstraintException; /** * This PassVerifier verifies a class file according to @@ -443,7 +443,7 @@ public final class Pass3aVerifier extend * 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.commons.bcel6.generic.EmptyVisitor{ /** The ConstantPoolGen instance this Visitor operates on. */ private final ConstantPoolGen cpg; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java Sun Aug 9 21:21:10 2015 @@ -15,48 +15,48 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.statics; +package org.apache.commons.bcel6.verifier.statics; -import org.apache.bcel.classfile.Annotations; -import org.apache.bcel.classfile.BootstrapMethods; -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.EnclosingMethod; -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.MethodParameters; -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.StackMapTable; -import org.apache.bcel.classfile.Synthetic; -import org.apache.bcel.classfile.Unknown; -import org.apache.bcel.verifier.exc.AssertionViolatedException; +import org.apache.commons.bcel6.classfile.Annotations; +import org.apache.commons.bcel6.classfile.BootstrapMethods; +import org.apache.commons.bcel6.classfile.Code; +import org.apache.commons.bcel6.classfile.CodeException; +import org.apache.commons.bcel6.classfile.ConstantClass; +import org.apache.commons.bcel6.classfile.ConstantDouble; +import org.apache.commons.bcel6.classfile.ConstantFieldref; +import org.apache.commons.bcel6.classfile.ConstantFloat; +import org.apache.commons.bcel6.classfile.ConstantInteger; +import org.apache.commons.bcel6.classfile.ConstantInterfaceMethodref; +import org.apache.commons.bcel6.classfile.ConstantLong; +import org.apache.commons.bcel6.classfile.ConstantMethodref; +import org.apache.commons.bcel6.classfile.ConstantNameAndType; +import org.apache.commons.bcel6.classfile.ConstantPool; +import org.apache.commons.bcel6.classfile.ConstantString; +import org.apache.commons.bcel6.classfile.ConstantUtf8; +import org.apache.commons.bcel6.classfile.ConstantValue; +import org.apache.commons.bcel6.classfile.Deprecated; +import org.apache.commons.bcel6.classfile.EnclosingMethod; +import org.apache.commons.bcel6.classfile.ExceptionTable; +import org.apache.commons.bcel6.classfile.Field; +import org.apache.commons.bcel6.classfile.InnerClass; +import org.apache.commons.bcel6.classfile.InnerClasses; +import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.commons.bcel6.classfile.LineNumber; +import org.apache.commons.bcel6.classfile.LineNumberTable; +import org.apache.commons.bcel6.classfile.LocalVariable; +import org.apache.commons.bcel6.classfile.LocalVariableTable; +import org.apache.commons.bcel6.classfile.LocalVariableTypeTable; +import org.apache.commons.bcel6.classfile.Method; +import org.apache.commons.bcel6.classfile.MethodParameters; +import org.apache.commons.bcel6.classfile.Node; +import org.apache.commons.bcel6.classfile.Signature; +import org.apache.commons.bcel6.classfile.SourceFile; +import org.apache.commons.bcel6.classfile.StackMap; +import org.apache.commons.bcel6.classfile.StackMapTable; +import org.apache.commons.bcel6.classfile.Synthetic; +import org.apache.commons.bcel6.classfile.Unknown; +import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException; /** * BCEL's Node classes (those from the classfile API that <B>accept()</B> Visitor @@ -73,7 +73,7 @@ import org.apache.bcel.verifier.exc.Asse * @version $Id$ * @author Enver Haase */ -public class StringRepresentation extends org.apache.bcel.classfile.EmptyVisitor { +public class StringRepresentation extends org.apache.commons.bcel6.classfile.EmptyVisitor { /** 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: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.structurals; +package org.apache.commons.bcel6.verifier.structurals; import java.util.ArrayList; @@ -23,18 +23,18 @@ import java.util.HashMap; import java.util.List; 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.commons.bcel6.generic.ATHROW; +import org.apache.commons.bcel6.generic.BranchInstruction; +import org.apache.commons.bcel6.generic.GotoInstruction; +import org.apache.commons.bcel6.generic.Instruction; +import org.apache.commons.bcel6.generic.InstructionHandle; +import org.apache.commons.bcel6.generic.JsrInstruction; +import org.apache.commons.bcel6.generic.MethodGen; +import org.apache.commons.bcel6.generic.RET; +import org.apache.commons.bcel6.generic.ReturnInstruction; +import org.apache.commons.bcel6.generic.Select; +import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException; +import org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException; /** * This class represents a control flow graph of a method. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExceptionHandler.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExceptionHandler.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExceptionHandler.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExceptionHandler.java Sun Aug 9 21:21:10 2015 @@ -15,11 +15,11 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.structurals; +package org.apache.commons.bcel6.verifier.structurals; -import org.apache.bcel.generic.InstructionHandle; -import org.apache.bcel.generic.ObjectType; +import org.apache.commons.bcel6.generic.InstructionHandle; +import org.apache.commons.bcel6.generic.ObjectType; /** * This class represents an exception handler; that is, an ObjectType Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExceptionHandlers.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExceptionHandlers.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExceptionHandlers.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExceptionHandlers.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.structurals; +package org.apache.commons.bcel6.verifier.structurals; import java.util.HashMap; @@ -23,9 +23,9 @@ import java.util.HashSet; 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.commons.bcel6.generic.CodeExceptionGen; +import org.apache.commons.bcel6.generic.InstructionHandle; +import org.apache.commons.bcel6.generic.MethodGen; /** * This class allows easy access to ExceptionHandler objects. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java Sun Aug 9 21:21:10 2015 @@ -15,18 +15,18 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.structurals; +package org.apache.commons.bcel6.verifier.structurals; -import org.apache.bcel.Constants; -import org.apache.bcel.classfile.Constant; -import org.apache.bcel.classfile.ConstantClass; -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.commons.bcel6.Constants; +import org.apache.commons.bcel6.classfile.Constant; +import org.apache.commons.bcel6.classfile.ConstantClass; +import org.apache.commons.bcel6.classfile.ConstantDouble; +import org.apache.commons.bcel6.classfile.ConstantFloat; +import org.apache.commons.bcel6.classfile.ConstantInteger; +import org.apache.commons.bcel6.classfile.ConstantLong; +import org.apache.commons.bcel6.classfile.ConstantString; +import org.apache.commons.bcel6.generic.*; /** * This Visitor class may be used for a type-based Java Virtual Machine Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Frame.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Frame.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Frame.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Frame.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.structurals; +package org.apache.commons.bcel6.verifier.structurals; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/GenericArray.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/GenericArray.java?rev=1694911&r1=1694824&r2=1694911&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/GenericArray.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/GenericArray.java Sun Aug 9 21:21:10 2015 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.bcel.verifier.structurals; +package org.apache.commons.bcel6.verifier.structurals; /**
