Author: britter Date: Tue Jun 7 17:13:56 2016 New Revision: 1747273 URL: http://svn.apache.org/viewvc?rev=1747273&view=rev Log: Revert changes introduced in BCEL-222 (rev 1694911).
In particular this means that the package coordinates have been changed back from org.apache.commons.bcel6 to org.apache.bcel Furthermore the maven coordinates have been changes back from org.apache.commons:commons-bcel6:6.0-SNAPSHOT to org.apache.bcel:bcel:6.0-SNAPSHOT Added: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ - copied from r1747272, commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ - copied from r1747272, commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/ Removed: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/ Modified: commons/proper/bcel/trunk/pom.xml commons/proper/bcel/trunk/src/examples/ClassDumper.java commons/proper/bcel/trunk/src/examples/HelloWorldBuilder.java commons/proper/bcel/trunk/src/examples/JasminVisitor.java commons/proper/bcel/trunk/src/examples/Mini/ASTExpr.java commons/proper/bcel/trunk/src/examples/Mini/ASTFunAppl.java commons/proper/bcel/trunk/src/examples/Mini/ASTFunDecl.java commons/proper/bcel/trunk/src/examples/Mini/ASTIdent.java commons/proper/bcel/trunk/src/examples/Mini/ASTIfExpr.java commons/proper/bcel/trunk/src/examples/Mini/ASTInteger.java commons/proper/bcel/trunk/src/examples/Mini/ASTLetExpr.java commons/proper/bcel/trunk/src/examples/Mini/ASTProgram.java commons/proper/bcel/trunk/src/examples/Mini/Function.java commons/proper/bcel/trunk/src/examples/Mini/MiniC.java commons/proper/bcel/trunk/src/examples/Mini/Variable.java commons/proper/bcel/trunk/src/examples/Package.java commons/proper/bcel/trunk/src/examples/Peephole.java commons/proper/bcel/trunk/src/examples/ProxyCreator.java commons/proper/bcel/trunk/src/examples/TransitiveHull.java commons/proper/bcel/trunk/src/examples/helloify.java commons/proper/bcel/trunk/src/examples/id.java commons/proper/bcel/trunk/src/examples/listclass.java commons/proper/bcel/trunk/src/examples/maxstack.java commons/proper/bcel/trunk/src/examples/patchclass.java commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Const.java commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConst.java commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConstants.java commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Repository.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnonymousClassTestCase.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/BCELBenchmark.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/CounterVisitorTestCase.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/InstructionFinderTestCase.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/NanoTimer.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PLSETestCase.java commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PerformanceTest.java Modified: commons/proper/bcel/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/pom.xml?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/pom.xml (original) +++ commons/proper/bcel/trunk/pom.xml Tue Jun 7 17:13:56 2016 @@ -27,8 +27,8 @@ <version>40</version> </parent> - <groupId>org.apache.commons</groupId> - <artifactId>commons-bcel6</artifactId> + <groupId>org.apache.bcel</groupId> + <artifactId>bcel</artifactId> <packaging>jar</packaging> <version>6.0-SNAPSHOT</version> <name>Apache Commons BCEL</name> Modified: commons/proper/bcel/trunk/src/examples/ClassDumper.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/ClassDumper.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/ClassDumper.java (original) +++ commons/proper/bcel/trunk/src/examples/ClassDumper.java Tue Jun 7 17:13:56 2016 @@ -21,14 +21,14 @@ import java.io.IOException; import javax.imageio.stream.FileImageInputStream; -import org.apache.commons.bcel6.Constants; -import org.apache.commons.bcel6.classfile.Attribute; -import org.apache.commons.bcel6.classfile.ClassFormatException; -import org.apache.commons.bcel6.classfile.Constant; -import org.apache.commons.bcel6.classfile.ConstantPool; -import org.apache.commons.bcel6.classfile.Field; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.util.BCELifier; +import org.apache.bcel.Constants; +import org.apache.bcel.classfile.Attribute; +import org.apache.bcel.classfile.ClassFormatException; +import org.apache.bcel.classfile.Constant; +import org.apache.bcel.classfile.ConstantPool; +import org.apache.bcel.classfile.Field; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.util.BCELifier; /** * Display Java .class file data. Modified: commons/proper/bcel/trunk/src/examples/HelloWorldBuilder.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/HelloWorldBuilder.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/HelloWorldBuilder.java (original) +++ commons/proper/bcel/trunk/src/examples/HelloWorldBuilder.java Tue Jun 7 17:13:56 2016 @@ -18,22 +18,22 @@ import java.io.IOException; -import org.apache.commons.bcel6.Constants; -import org.apache.commons.bcel6.generic.ALOAD; -import org.apache.commons.bcel6.generic.ASTORE; -import org.apache.commons.bcel6.generic.ArrayType; -import org.apache.commons.bcel6.generic.ClassGen; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.GOTO; -import org.apache.commons.bcel6.generic.InstructionConstants; -import org.apache.commons.bcel6.generic.InstructionFactory; -import org.apache.commons.bcel6.generic.InstructionHandle; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.LocalVariableGen; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.ObjectType; -import org.apache.commons.bcel6.generic.PUSH; -import org.apache.commons.bcel6.generic.Type; +import org.apache.bcel.Constants; +import org.apache.bcel.generic.ALOAD; +import org.apache.bcel.generic.ASTORE; +import org.apache.bcel.generic.ArrayType; +import org.apache.bcel.generic.ClassGen; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.GOTO; +import org.apache.bcel.generic.InstructionConstants; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.LocalVariableGen; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.PUSH; +import org.apache.bcel.generic.Type; /** * Create HelloWorld class: Modified: commons/proper/bcel/trunk/src/examples/JasminVisitor.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/JasminVisitor.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/JasminVisitor.java (original) +++ commons/proper/bcel/trunk/src/examples/JasminVisitor.java Tue Jun 7 17:13:56 2016 @@ -24,32 +24,32 @@ import java.util.Date; import java.util.Hashtable; import java.util.StringTokenizer; -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.ClassParser; -import org.apache.commons.bcel6.classfile.Code; -import org.apache.commons.bcel6.classfile.ConstantValue; -import org.apache.commons.bcel6.classfile.Deprecated; -import org.apache.commons.bcel6.classfile.ExceptionTable; -import org.apache.commons.bcel6.classfile.Field; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.classfile.Synthetic; -import org.apache.commons.bcel6.classfile.Utility; -import org.apache.commons.bcel6.generic.BranchHandle; -import org.apache.commons.bcel6.generic.BranchInstruction; -import org.apache.commons.bcel6.generic.CodeExceptionGen; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -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.LineNumberGen; -import org.apache.commons.bcel6.generic.LocalVariableGen; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.ObjectType; -import org.apache.commons.bcel6.generic.Select; -import org.apache.commons.bcel6.generic.TABLESWITCH; +import org.apache.bcel.Constants; +import org.apache.bcel.Repository; +import org.apache.bcel.classfile.Attribute; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.Code; +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.JavaClass; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.classfile.Synthetic; +import org.apache.bcel.classfile.Utility; +import org.apache.bcel.generic.BranchHandle; +import org.apache.bcel.generic.BranchInstruction; +import org.apache.bcel.generic.CodeExceptionGen; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.Instruction; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.LineNumberGen; +import org.apache.bcel.generic.LocalVariableGen; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.Select; +import org.apache.bcel.generic.TABLESWITCH; /** * Disassemble Java class object into the <a href="http://jasmin.sourceforge.net"> @@ -57,7 +57,7 @@ import org.apache.commons.bcel6.generic. * * @version $Id$ */ -public class JasminVisitor extends org.apache.commons.bcel6.classfile.EmptyVisitor { +public class JasminVisitor extends org.apache.bcel.classfile.EmptyVisitor { private JavaClass clazz; private PrintWriter out; private String class_name; @@ -74,7 +74,7 @@ public class JasminVisitor extends org.a * Start traversal using DefaultVisitor pattern. */ public void disassemble() { - new org.apache.commons.bcel6.classfile.DescendingVisitor(clazz, this).visit(); + new org.apache.bcel.classfile.DescendingVisitor(clazz, this).visit(); out.close(); } Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTExpr.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTExpr.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/Mini/ASTExpr.java (original) +++ commons/proper/bcel/trunk/src/examples/Mini/ASTExpr.java Tue Jun 7 17:13:56 2016 @@ -19,19 +19,19 @@ /* JJT: 0.3pre1 */ package Mini; -import org.apache.commons.bcel6.generic.BranchHandle; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.GOTO; -import org.apache.commons.bcel6.generic.IF_ICMPEQ; -import org.apache.commons.bcel6.generic.IF_ICMPGE; -import org.apache.commons.bcel6.generic.IF_ICMPGT; -import org.apache.commons.bcel6.generic.IF_ICMPLE; -import org.apache.commons.bcel6.generic.IF_ICMPLT; -import org.apache.commons.bcel6.generic.IF_ICMPNE; -import org.apache.commons.bcel6.generic.InstructionConstants; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.PUSH; +import org.apache.bcel.generic.BranchHandle; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.GOTO; +import org.apache.bcel.generic.IF_ICMPEQ; +import org.apache.bcel.generic.IF_ICMPGE; +import org.apache.bcel.generic.IF_ICMPGT; +import org.apache.bcel.generic.IF_ICMPLE; +import org.apache.bcel.generic.IF_ICMPLT; +import org.apache.bcel.generic.IF_ICMPNE; +import org.apache.bcel.generic.InstructionConstants; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.PUSH; /** * Represents arithmetic expressions such as `(a + 12 == b) OR c'. @@ -48,7 +48,7 @@ import org.apache.commons.bcel6.generic. * are discarded in the first pass. */ public class ASTExpr extends SimpleNode -implements MiniParserConstants, MiniParserTreeConstants, org.apache.commons.bcel6.Constants { +implements MiniParserConstants, MiniParserTreeConstants, org.apache.bcel.Constants { protected int kind=-1; // Single twig to leaf? private int unop=-1; // Special case: Unary operand applied protected ASTExpr[] exprs; // Sub expressions Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTFunAppl.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTFunAppl.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/Mini/ASTFunAppl.java (original) +++ commons/proper/bcel/trunk/src/examples/Mini/ASTFunAppl.java Tue Jun 7 17:13:56 2016 @@ -19,18 +19,18 @@ /* JJT: 0.3pre1 */ package Mini; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.INVOKESTATIC; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.Type; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.INVOKESTATIC; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.Type; /** * * @version $Id$ */ public class ASTFunAppl extends ASTExpr implements MiniParserTreeConstants, - org.apache.commons.bcel6.Constants { + org.apache.bcel.Constants { private ASTIdent name; private Function function; // Points to Function in environment Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTFunDecl.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTFunDecl.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/Mini/ASTFunDecl.java (original) +++ commons/proper/bcel/trunk/src/examples/Mini/ASTFunDecl.java Tue Jun 7 17:13:56 2016 @@ -22,33 +22,33 @@ package Mini; import java.io.PrintWriter; import java.util.Iterator; -import org.apache.commons.bcel6.generic.ALOAD; -import org.apache.commons.bcel6.generic.ASTORE; -import org.apache.commons.bcel6.generic.ArrayType; -import org.apache.commons.bcel6.generic.BranchHandle; -import org.apache.commons.bcel6.generic.BranchInstruction; -import org.apache.commons.bcel6.generic.ClassGen; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.GETSTATIC; -import org.apache.commons.bcel6.generic.GOTO; -import org.apache.commons.bcel6.generic.INVOKEVIRTUAL; -import org.apache.commons.bcel6.generic.InstructionConstants; -import org.apache.commons.bcel6.generic.InstructionHandle; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.InstructionTargeter; -import org.apache.commons.bcel6.generic.LocalVariableGen; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.ObjectType; -import org.apache.commons.bcel6.generic.TargetLostException; -import org.apache.commons.bcel6.generic.Type; -import org.apache.commons.bcel6.util.InstructionFinder; +import org.apache.bcel.generic.ALOAD; +import org.apache.bcel.generic.ASTORE; +import org.apache.bcel.generic.ArrayType; +import org.apache.bcel.generic.BranchHandle; +import org.apache.bcel.generic.BranchInstruction; +import org.apache.bcel.generic.ClassGen; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.GETSTATIC; +import org.apache.bcel.generic.GOTO; +import org.apache.bcel.generic.INVOKEVIRTUAL; +import org.apache.bcel.generic.InstructionConstants; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.InstructionTargeter; +import org.apache.bcel.generic.LocalVariableGen; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.TargetLostException; +import org.apache.bcel.generic.Type; +import org.apache.bcel.util.InstructionFinder; /** * * @version $Id$ */ public class ASTFunDecl extends SimpleNode -implements MiniParserTreeConstants, org.apache.commons.bcel6.Constants { +implements MiniParserTreeConstants, org.apache.bcel.Constants { private ASTIdent name; private ASTIdent[] argv; private ASTExpr body; Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTIdent.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTIdent.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/Mini/ASTIdent.java (original) +++ commons/proper/bcel/trunk/src/examples/Mini/ASTIdent.java Tue Jun 7 17:13:56 2016 @@ -19,18 +19,18 @@ /* JJT: 0.3pre1 */ package Mini; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.ILOAD; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.LocalVariableGen; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.PUSH; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.ILOAD; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.LocalVariableGen; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.PUSH; /** * * @version $Id$ */ -public class ASTIdent extends ASTExpr implements org.apache.commons.bcel6.Constants { +public class ASTIdent extends ASTExpr implements org.apache.bcel.Constants { private String name; private Variable reference; // Reference in environment to decl of this ident Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTIfExpr.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTIfExpr.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/Mini/ASTIfExpr.java (original) +++ commons/proper/bcel/trunk/src/examples/Mini/ASTIfExpr.java Tue Jun 7 17:13:56 2016 @@ -19,19 +19,19 @@ /* JJT: 0.3pre1 */ package Mini; -import org.apache.commons.bcel6.generic.BranchHandle; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.GOTO; -import org.apache.commons.bcel6.generic.IFEQ; -import org.apache.commons.bcel6.generic.InstructionConstants; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.MethodGen; +import org.apache.bcel.generic.BranchHandle; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.GOTO; +import org.apache.bcel.generic.IFEQ; +import org.apache.bcel.generic.InstructionConstants; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.MethodGen; /** * * @version $Id$ */ -public class ASTIfExpr extends ASTExpr implements org.apache.commons.bcel6.Constants { +public class ASTIfExpr extends ASTExpr implements org.apache.bcel.Constants { private ASTExpr if_expr, then_expr, else_expr; // Generated methods Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTInteger.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTInteger.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/Mini/ASTInteger.java (original) +++ commons/proper/bcel/trunk/src/examples/Mini/ASTInteger.java Tue Jun 7 17:13:56 2016 @@ -19,10 +19,10 @@ /* JJT: 0.3pre1 */ package Mini; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.PUSH; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.PUSH; /** * Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTLetExpr.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTLetExpr.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/Mini/ASTLetExpr.java (original) +++ commons/proper/bcel/trunk/src/examples/Mini/ASTLetExpr.java Tue Jun 7 17:13:56 2016 @@ -19,20 +19,20 @@ /* JJT: 0.3pre1 */ package Mini; -import org.apache.commons.bcel6.generic.BasicType; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.ISTORE; -import org.apache.commons.bcel6.generic.InstructionHandle; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.LocalVariableGen; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.Type; +import org.apache.bcel.generic.BasicType; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.ISTORE; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.LocalVariableGen; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.Type; /** * * @version $Id$ */ -public class ASTLetExpr extends ASTExpr implements org.apache.commons.bcel6.Constants { +public class ASTLetExpr extends ASTExpr implements org.apache.bcel.Constants { private ASTIdent[] idents; private ASTExpr[] exprs; private ASTExpr body; Modified: commons/proper/bcel/trunk/src/examples/Mini/ASTProgram.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/ASTProgram.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/Mini/ASTProgram.java (original) +++ commons/proper/bcel/trunk/src/examples/Mini/ASTProgram.java Tue Jun 7 17:13:56 2016 @@ -21,23 +21,23 @@ package Mini; import java.io.PrintWriter; -import org.apache.commons.bcel6.classfile.Field; -import org.apache.commons.bcel6.generic.ALOAD; -import org.apache.commons.bcel6.generic.ClassGen; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.GETSTATIC; -import org.apache.commons.bcel6.generic.ILOAD; -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.InstructionConstants; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.NEW; -import org.apache.commons.bcel6.generic.PUSH; -import org.apache.commons.bcel6.generic.PUTSTATIC; -import org.apache.commons.bcel6.generic.RETURN; -import org.apache.commons.bcel6.generic.Type; +import org.apache.bcel.classfile.Field; +import org.apache.bcel.generic.ALOAD; +import org.apache.bcel.generic.ClassGen; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.GETSTATIC; +import org.apache.bcel.generic.ILOAD; +import org.apache.bcel.generic.INVOKESPECIAL; +import org.apache.bcel.generic.INVOKESTATIC; +import org.apache.bcel.generic.INVOKEVIRTUAL; +import org.apache.bcel.generic.InstructionConstants; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.NEW; +import org.apache.bcel.generic.PUSH; +import org.apache.bcel.generic.PUTSTATIC; +import org.apache.bcel.generic.RETURN; +import org.apache.bcel.generic.Type; /** * Root node of everything, direct children are nodes of type FunDecl @@ -45,7 +45,7 @@ import org.apache.commons.bcel6.generic. * @version $Id$ */ public class ASTProgram extends SimpleNode -implements MiniParserConstants, MiniParserTreeConstants, org.apache.commons.bcel6.Constants { +implements MiniParserConstants, MiniParserTreeConstants, org.apache.bcel.Constants { private ASTFunDecl[] fun_decls; // Children: Function declarations private Environment env; // Environment contains variables and functions Modified: commons/proper/bcel/trunk/src/examples/Mini/Function.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/Function.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/Mini/Function.java (original) +++ commons/proper/bcel/trunk/src/examples/Mini/Function.java Tue Jun 7 17:13:56 2016 @@ -23,7 +23,7 @@ package Mini; * * @version $Id$ */ -public class Function implements org.apache.commons.bcel6.Constants, EnvEntry { +public class Function implements org.apache.bcel.Constants, EnvEntry { private ASTIdent name; // Reference to the original declaration private ASTIdent[] args; // Reference to argument identifiers // private ASTExpr body; // Reference to function expression body Modified: commons/proper/bcel/trunk/src/examples/Mini/MiniC.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/MiniC.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/Mini/MiniC.java (original) +++ commons/proper/bcel/trunk/src/examples/Mini/MiniC.java Tue Jun 7 17:13:56 2016 @@ -21,11 +21,11 @@ import java.io.FileOutputStream; import java.io.PrintWriter; import java.util.Vector; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.generic.ClassGen; -import org.apache.commons.bcel6.generic.ConstantPoolGen; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.generic.ClassGen; +import org.apache.bcel.generic.ConstantPoolGen; -public class MiniC implements org.apache.commons.bcel6.Constants { +public class MiniC implements org.apache.bcel.Constants { private static Vector<String> errors = null; private static Vector<String> warnings = null; private static String file = null; Modified: commons/proper/bcel/trunk/src/examples/Mini/Variable.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/Variable.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/Mini/Variable.java (original) +++ commons/proper/bcel/trunk/src/examples/Mini/Variable.java Tue Jun 7 17:13:56 2016 @@ -16,7 +16,7 @@ * */ package Mini; -import org.apache.commons.bcel6.generic.LocalVariableGen; +import org.apache.bcel.generic.LocalVariableGen; /** * Represents a variable declared in a LET expression or a FUN declaration. Modified: commons/proper/bcel/trunk/src/examples/Package.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Package.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/Package.java (original) +++ commons/proper/bcel/trunk/src/examples/Package.java Tue Jun 7 17:13:56 2016 @@ -27,14 +27,14 @@ import java.util.TreeMap; import java.util.jar.JarOutputStream; import java.util.zip.ZipEntry; -import org.apache.commons.bcel6.Constants; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.Constant; -import org.apache.commons.bcel6.classfile.ConstantClass; -import org.apache.commons.bcel6.classfile.ConstantPool; -import org.apache.commons.bcel6.classfile.ConstantUtf8; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.util.ClassPath; +import org.apache.bcel.Constants; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.Constant; +import org.apache.bcel.classfile.ConstantClass; +import org.apache.bcel.classfile.ConstantPool; +import org.apache.bcel.classfile.ConstantUtf8; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.util.ClassPath; /** * Package the client. Creates a jar file in the current directory Modified: commons/proper/bcel/trunk/src/examples/Peephole.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Peephole.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/Peephole.java (original) +++ commons/proper/bcel/trunk/src/examples/Peephole.java Tue Jun 7 17:13:56 2016 @@ -18,16 +18,16 @@ import java.util.Iterator; -import org.apache.commons.bcel6.Repository; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.InstructionHandle; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.InstructionTargeter; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.TargetLostException; -import org.apache.commons.bcel6.util.InstructionFinder; +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.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.InstructionTargeter; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.TargetLostException; +import org.apache.bcel.util.InstructionFinder; /** * Remove NOPs from given class Modified: commons/proper/bcel/trunk/src/examples/ProxyCreator.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/ProxyCreator.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/ProxyCreator.java (original) +++ commons/proper/bcel/trunk/src/examples/ProxyCreator.java Tue Jun 7 17:13:56 2016 @@ -19,25 +19,25 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import org.apache.commons.bcel6.Constants; -import org.apache.commons.bcel6.classfile.Utility; -import org.apache.commons.bcel6.generic.ALOAD; -import org.apache.commons.bcel6.generic.ClassGen; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.GETSTATIC; -import org.apache.commons.bcel6.generic.INVOKEVIRTUAL; -import org.apache.commons.bcel6.generic.InstructionConstants; -import org.apache.commons.bcel6.generic.InstructionFactory; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.ObjectType; -import org.apache.commons.bcel6.generic.PUSH; -import org.apache.commons.bcel6.generic.Type; +import org.apache.bcel.Constants; +import org.apache.bcel.classfile.Utility; +import org.apache.bcel.generic.ALOAD; +import org.apache.bcel.generic.ClassGen; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.GETSTATIC; +import org.apache.bcel.generic.INVOKEVIRTUAL; +import org.apache.bcel.generic.InstructionConstants; +import org.apache.bcel.generic.InstructionFactory; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.PUSH; +import org.apache.bcel.generic.Type; /** * Dynamically creates and uses a proxy for {@code java.awt.event.ActionListener} * via the classloader mechanism if called with - * <pre>java org.apache.commons.bcel6.util.JavaWrapper ProxyCreator</pre> + * <pre>java org.apache.bcel.util.JavaWrapper ProxyCreator</pre> * * The trick is to encode the byte code we need into the class name * using the Utility.encode() method. This will result however in big @@ -47,7 +47,7 @@ import org.apache.commons.bcel6.generic. * {@code java.lang.reflect.Proxy}, but much more flexible. * * @version $Id$ - * @see org.apache.commons.bcel6.util.JavaWrapper + * @see org.apache.bcel.util.JavaWrapper * @see Utility */ public class ProxyCreator { @@ -76,7 +76,7 @@ public class ProxyCreator { // instanceof won't work here ... // TODO this is broken; cannot ever be true now that ClassLoader has been dropped - if (loader.getClass().toString().equals("class org.apache.commons.bcel6.util.ClassLoader")) { + if (loader.getClass().toString().equals("class org.apache.bcel.util.ClassLoader")) { // Real class name will be set by the class loader ClassGen cg = new ClassGen("foo", "java.lang.Object", "", Constants.ACC_PUBLIC, new String[]{"java.awt.event.ActionListener"}); @@ -128,7 +128,7 @@ public class ProxyCreator { a.actionPerformed(new ActionEvent(a, ActionEvent.ACTION_PERFORMED, "hello")); } else { - System.err.println("Call me with java org.apache.commons.bcel6.util.JavaWrapper ProxyCreator"); + System.err.println("Call me with java org.apache.bcel.util.JavaWrapper ProxyCreator"); } } Modified: commons/proper/bcel/trunk/src/examples/TransitiveHull.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/TransitiveHull.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/TransitiveHull.java (original) +++ commons/proper/bcel/trunk/src/examples/TransitiveHull.java Tue Jun 7 17:13:56 2016 @@ -19,22 +19,22 @@ import java.util.Arrays; import java.util.regex.Pattern; -import org.apache.commons.bcel6.Constants; -import org.apache.commons.bcel6.Repository; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.ConstantCP; -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.JavaClass; -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.util.ClassQueue; -import org.apache.commons.bcel6.util.ClassSet; +import org.apache.bcel.Constants; +import org.apache.bcel.Repository; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.ConstantCP; +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.JavaClass; +import org.apache.bcel.generic.ArrayType; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.Type; +import org.apache.bcel.util.ClassQueue; +import org.apache.bcel.util.ClassSet; /** * Find all classes referenced by given start class and all classes referenced @@ -51,7 +51,7 @@ import org.apache.commons.bcel6.util.Cla * * @version $Id$ */ -public class TransitiveHull extends org.apache.commons.bcel6.classfile.EmptyVisitor { +public class TransitiveHull extends org.apache.bcel.classfile.EmptyVisitor { private ClassQueue queue; private ClassSet set; @@ -84,7 +84,7 @@ public class TransitiveHull extends org. JavaClass clazz = queue.dequeue(); cp = clazz.getConstantPool(); - new org.apache.commons.bcel6.classfile.DescendingVisitor(clazz, this).visit(); + new org.apache.bcel.classfile.DescendingVisitor(clazz, this).visit(); } } Modified: commons/proper/bcel/trunk/src/examples/helloify.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/helloify.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/helloify.java (original) +++ commons/proper/bcel/trunk/src/examples/helloify.java Tue Jun 7 17:13:56 2016 @@ -16,23 +16,23 @@ * */ -import org.apache.commons.bcel6.Constants; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.Code; -import org.apache.commons.bcel6.classfile.ConstantClass; -import org.apache.commons.bcel6.classfile.ConstantPool; -import org.apache.commons.bcel6.classfile.ConstantUtf8; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.classfile.Utility; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.GETSTATIC; -import org.apache.commons.bcel6.generic.INVOKESPECIAL; -import org.apache.commons.bcel6.generic.INVOKEVIRTUAL; -import org.apache.commons.bcel6.generic.InstructionHandle; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.PUSH; +import org.apache.bcel.Constants; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.Code; +import org.apache.bcel.classfile.ConstantClass; +import org.apache.bcel.classfile.ConstantPool; +import org.apache.bcel.classfile.ConstantUtf8; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.classfile.Utility; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.GETSTATIC; +import org.apache.bcel.generic.INVOKESPECIAL; +import org.apache.bcel.generic.INVOKEVIRTUAL; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.PUSH; /** * Read class file(s) and patch all of its methods, so that they print Modified: commons/proper/bcel/trunk/src/examples/id.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/id.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/id.java (original) +++ commons/proper/bcel/trunk/src/examples/id.java Tue Jun 7 17:13:56 2016 @@ -16,14 +16,14 @@ * */ -import org.apache.commons.bcel6.Repository; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.Field; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.generic.ClassGen; -import org.apache.commons.bcel6.generic.FieldGen; -import org.apache.commons.bcel6.generic.MethodGen; +import org.apache.bcel.Repository; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.Field; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.generic.ClassGen; +import org.apache.bcel.generic.FieldGen; +import org.apache.bcel.generic.MethodGen; /** * Test BCEL if an input file is identical to the outfile generated Modified: commons/proper/bcel/trunk/src/examples/listclass.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/listclass.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/listclass.java (original) +++ commons/proper/bcel/trunk/src/examples/listclass.java Tue Jun 7 17:13:56 2016 @@ -22,16 +22,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.bcel6.Constants; -import org.apache.commons.bcel6.Repository; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.Code; -import org.apache.commons.bcel6.classfile.Constant; -import org.apache.commons.bcel6.classfile.ConstantClass; -import org.apache.commons.bcel6.classfile.ConstantPool; -import org.apache.commons.bcel6.classfile.ConstantUtf8; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.Method; +import org.apache.bcel.Constants; +import org.apache.bcel.Repository; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.Code; +import org.apache.bcel.classfile.Constant; +import org.apache.bcel.classfile.ConstantClass; +import org.apache.bcel.classfile.ConstantPool; +import org.apache.bcel.classfile.ConstantUtf8; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; /** * Read class file(s) and display its contents. The command line usage is: Modified: commons/proper/bcel/trunk/src/examples/maxstack.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/maxstack.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/maxstack.java (original) +++ commons/proper/bcel/trunk/src/examples/maxstack.java Tue Jun 7 17:13:56 2016 @@ -16,12 +16,12 @@ * */ -import org.apache.commons.bcel6.Repository; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.MethodGen; +import org.apache.bcel.Repository; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.MethodGen; /** * Read class file(s) and examine all of its methods, determining the Modified: commons/proper/bcel/trunk/src/examples/patchclass.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/patchclass.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/examples/patchclass.java (original) +++ commons/proper/bcel/trunk/src/examples/patchclass.java Tue Jun 7 17:13:56 2016 @@ -16,10 +16,10 @@ * */ -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.Constant; -import org.apache.commons.bcel6.classfile.ConstantUtf8; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.Constant; +import org.apache.bcel.classfile.ConstantUtf8; +import org.apache.bcel.classfile.JavaClass; /** * Patch all Utf8 constants in the given class file <em>file</em>.class Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Const.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Const.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Const.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Const.java Tue Jun 7 17:13:56 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6; +package org.apache.bcel; import java.util.Arrays; import java.util.Collections; Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Constants.java Tue Jun 7 17:13:56 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6; +package org.apache.bcel; /** * Constants for the project, mostly defined in the JVM specification. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConst.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConst.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConst.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConst.java Tue Jun 7 17:13:56 2016 @@ -1,4 +1,4 @@ -package org.apache.commons.bcel6; +package org.apache.bcel; /** * Exception constants. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConstants.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConstants.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConstants.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/ExceptionConstants.java Tue Jun 7 17:13:56 2016 @@ -15,7 +15,7 @@ * limitations under the License. * */ -package org.apache.commons.bcel6; +package org.apache.bcel; /** * Exception constants. Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Repository.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Repository.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Repository.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/Repository.java Tue Jun 7 17:13:56 2016 @@ -15,39 +15,39 @@ * limitations under the License. * */ -package org.apache.commons.bcel6; +package org.apache.bcel; import java.io.IOException; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.util.ClassPath; -import org.apache.commons.bcel6.util.SyntheticRepository; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.util.ClassPath; +import org.apache.bcel.util.SyntheticRepository; /** * The repository maintains informations about class interdependencies, e.g., * whether a class is a sub-class of another. Delegates actual class loading * to SyntheticRepository with current class path by default. * - * @see org.apache.commons.bcel6.util.Repository + * @see org.apache.bcel.util.Repository * @see SyntheticRepository * * @version $Id$ */ public abstract class Repository { - private static org.apache.commons.bcel6.util.Repository _repository = SyntheticRepository.getInstance(); + private static org.apache.bcel.util.Repository _repository = SyntheticRepository.getInstance(); /** @return currently used repository instance */ - public static org.apache.commons.bcel6.util.Repository getRepository() { + public static org.apache.bcel.util.Repository getRepository() { return _repository; } /** Set repository instance to be used for class loading */ - public static void setRepository( final org.apache.commons.bcel6.util.Repository rep ) { + public static void setRepository( final org.apache.bcel.util.Repository rep ) { _repository = rep; } Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java Tue Jun 7 17:13:56 2016 @@ -16,11 +16,11 @@ * */ -package org.apache.commons.bcel6; +package org.apache.bcel; -import org.apache.commons.bcel6.classfile.DescendingVisitor; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.visitors.CounterVisitor; +import org.apache.bcel.classfile.DescendingVisitor; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.visitors.CounterVisitor; public abstract class AbstractCounterVisitorTestCase extends AbstractTestCase { Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java Tue Jun 7 17:13:56 2016 @@ -16,24 +16,24 @@ * */ -package org.apache.commons.bcel6; +package org.apache.bcel; import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.commons.bcel6.classfile.AnnotationEntry; -import org.apache.commons.bcel6.classfile.Attribute; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.generic.AnnotationEntryGen; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.ElementValueGen; -import org.apache.commons.bcel6.generic.ElementValuePairGen; -import org.apache.commons.bcel6.generic.ObjectType; -import org.apache.commons.bcel6.generic.SimpleElementValueGen; -import org.apache.commons.bcel6.util.ClassPath; -import org.apache.commons.bcel6.util.SyntheticRepository; +import org.apache.bcel.classfile.AnnotationEntry; +import org.apache.bcel.classfile.Attribute; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.generic.AnnotationEntryGen; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.ElementValueGen; +import org.apache.bcel.generic.ElementValuePairGen; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.SimpleElementValueGen; +import org.apache.bcel.util.ClassPath; +import org.apache.bcel.util.SyntheticRepository; import junit.framework.TestCase; Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java Tue Jun 7 17:13:56 2016 @@ -16,9 +16,9 @@ * */ -package org.apache.commons.bcel6; +package org.apache.bcel; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.classfile.JavaClass; public class AnnotationAccessFlagTestCase extends AbstractTestCase { Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java Tue Jun 7 17:13:56 2016 @@ -16,13 +16,13 @@ * */ -package org.apache.commons.bcel6; +package org.apache.bcel; -import org.apache.commons.bcel6.classfile.AnnotationDefault; -import org.apache.commons.bcel6.classfile.ElementValue; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.classfile.SimpleElementValue; +import org.apache.bcel.classfile.AnnotationDefault; +import org.apache.bcel.classfile.ElementValue; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.classfile.SimpleElementValue; public class AnnotationDefaultAttributeTestCase extends AbstractTestCase { Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnonymousClassTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnonymousClassTestCase.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnonymousClassTestCase.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnonymousClassTestCase.java Tue Jun 7 17:13:56 2016 @@ -16,9 +16,9 @@ * */ -package org.apache.commons.bcel6; +package org.apache.bcel; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.classfile.JavaClass; public class AnonymousClassTestCase extends AbstractTestCase { Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/BCELBenchmark.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/BCELBenchmark.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/BCELBenchmark.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/BCELBenchmark.java Tue Jun 7 17:13:56 2016 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.bcel6; +package org.apache.bcel; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -23,12 +23,12 @@ import java.util.concurrent.TimeUnit; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.generic.ClassGen; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.MethodGen; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.generic.ClassGen; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.MethodGen; import org.apache.commons.collections4.Predicate; import org.apache.commons.collections4.iterators.EnumerationIterator; import org.apache.commons.collections4.iterators.FilterIterator; Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/CounterVisitorTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/CounterVisitorTestCase.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/CounterVisitorTestCase.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/CounterVisitorTestCase.java Tue Jun 7 17:13:56 2016 @@ -16,9 +16,9 @@ * */ -package org.apache.commons.bcel6; +package org.apache.bcel; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.classfile.JavaClass; public class CounterVisitorTestCase extends AbstractCounterVisitorTestCase { Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java Tue Jun 7 17:13:56 2016 @@ -16,7 +16,7 @@ * */ -package org.apache.commons.bcel6; +package org.apache.bcel; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -24,13 +24,13 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.commons.bcel6.generic.ClassElementValueGen; -import org.apache.commons.bcel6.generic.ClassGen; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.ElementValueGen; -import org.apache.commons.bcel6.generic.EnumElementValueGen; -import org.apache.commons.bcel6.generic.ObjectType; -import org.apache.commons.bcel6.generic.SimpleElementValueGen; +import org.apache.bcel.generic.ClassElementValueGen; +import org.apache.bcel.generic.ClassGen; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.ElementValueGen; +import org.apache.bcel.generic.EnumElementValueGen; +import org.apache.bcel.generic.ObjectType; +import org.apache.bcel.generic.SimpleElementValueGen; public class ElementValueGenTestCase extends AbstractTestCase { Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java Tue Jun 7 17:13:56 2016 @@ -16,16 +16,16 @@ * */ -package org.apache.commons.bcel6; +package org.apache.bcel; import java.io.File; import java.io.IOException; -import org.apache.commons.bcel6.classfile.Attribute; -import org.apache.commons.bcel6.classfile.ConstantPool; -import org.apache.commons.bcel6.classfile.EnclosingMethod; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.util.SyntheticRepository; +import org.apache.bcel.classfile.Attribute; +import org.apache.bcel.classfile.ConstantPool; +import org.apache.bcel.classfile.EnclosingMethod; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.util.SyntheticRepository; import org.junit.Assert; public class EnclosingMethodAttributeTestCase extends AbstractTestCase Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java Tue Jun 7 17:13:56 2016 @@ -16,9 +16,9 @@ * */ -package org.apache.commons.bcel6; +package org.apache.bcel; -import org.apache.commons.bcel6.classfile.JavaClass; +import org.apache.bcel.classfile.JavaClass; public class EnumAccessFlagTestCase extends AbstractTestCase { Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/InstructionFinderTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/InstructionFinderTestCase.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/InstructionFinderTestCase.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/InstructionFinderTestCase.java Tue Jun 7 17:13:56 2016 @@ -15,15 +15,15 @@ * limitations under the License. * */ -package org.apache.commons.bcel6; +package org.apache.bcel; import java.util.Iterator; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.generic.InstructionHandle; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.util.InstructionFinder; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.generic.InstructionHandle; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.util.InstructionFinder; public class InstructionFinderTestCase extends AbstractTestCase { Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/NanoTimer.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/NanoTimer.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/NanoTimer.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/NanoTimer.java Tue Jun 7 17:13:56 2016 @@ -16,7 +16,7 @@ * */ -package org.apache.commons.bcel6; +package org.apache.bcel; public class NanoTimer { Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PLSETestCase.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PLSETestCase.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PLSETestCase.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PLSETestCase.java Tue Jun 7 17:13:56 2016 @@ -16,15 +16,15 @@ * */ -package org.apache.commons.bcel6; +package org.apache.bcel; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.LocalVariableTable; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.generic.ClassGen; -import org.apache.commons.bcel6.generic.ConstantPoolGen; -import org.apache.commons.bcel6.generic.MethodGen; -import org.apache.commons.bcel6.generic.Type; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.LocalVariableTable; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.generic.ClassGen; +import org.apache.bcel.generic.ConstantPoolGen; +import org.apache.bcel.generic.MethodGen; +import org.apache.bcel.generic.Type; public class PLSETestCase extends AbstractTestCase { Modified: commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PerformanceTest.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PerformanceTest.java?rev=1747273&r1=1747272&r2=1747273&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PerformanceTest.java (original) +++ commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PerformanceTest.java Tue Jun 7 17:13:56 2016 @@ -16,7 +16,7 @@ * */ -package org.apache.commons.bcel6; +package org.apache.bcel; import java.io.ByteArrayInputStream; import java.io.File; @@ -27,12 +27,12 @@ import java.util.Enumeration; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import org.apache.commons.bcel6.classfile.ClassParser; -import org.apache.commons.bcel6.classfile.JavaClass; -import org.apache.commons.bcel6.classfile.Method; -import org.apache.commons.bcel6.generic.ClassGen; -import org.apache.commons.bcel6.generic.InstructionList; -import org.apache.commons.bcel6.generic.MethodGen; +import org.apache.bcel.classfile.ClassParser; +import org.apache.bcel.classfile.JavaClass; +import org.apache.bcel.classfile.Method; +import org.apache.bcel.generic.ClassGen; +import org.apache.bcel.generic.InstructionList; +import org.apache.bcel.generic.MethodGen; import org.junit.Assert; import junit.framework.TestCase;