You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2015/08/09 23:21:14 UTC
svn commit: r1694911 [7/8] - in /commons/proper/bcel/trunk: ./ src/examples/
src/examples/Mini/ src/main/java/org/apache/bcel/
src/main/java/org/apache/commons/ src/main/java/org/apache/commons/bcel6/
src/main/java/org/apache/commons/bcel6/classfile/ s...
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java Sun Aug 9 21:21:10 2015
@@ -15,27 +15,27 @@
* 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.Repository;
-import org.apache.bcel.classfile.Constant;
-import org.apache.bcel.classfile.ConstantClass;
-import org.apache.bcel.classfile.ConstantDouble;
-import org.apache.bcel.classfile.ConstantFieldref;
-import org.apache.bcel.classfile.ConstantFloat;
-import org.apache.bcel.classfile.ConstantInteger;
-import org.apache.bcel.classfile.ConstantLong;
-import org.apache.bcel.classfile.ConstantString;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.generic.*;
-import org.apache.bcel.verifier.VerificationResult;
-import org.apache.bcel.verifier.Verifier;
-import org.apache.bcel.verifier.VerifierFactory;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.Repository;
+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.ConstantLong;
+import org.apache.commons.bcel6.classfile.ConstantString;
+import org.apache.commons.bcel6.classfile.Field;
+import org.apache.commons.bcel6.classfile.JavaClass;
+import org.apache.commons.bcel6.generic.*;
+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.StructuralCodeConstraintException;
/**
@@ -48,12 +48,12 @@ import org.apache.bcel.verifier.exc.Stru
*
* @version $Id$
* @author Enver Haase
- * @see org.apache.bcel.verifier.exc.StructuralCodeConstraintException
- * @see org.apache.bcel.verifier.exc.LinkingConstraintException
+ * @see org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException
+ * @see org.apache.commons.bcel6.verifier.exc.LinkingConstraintException
*/
public class InstConstraintVisitor extends EmptyVisitor{
- private static final ObjectType GENERIC_ARRAY = ObjectType.getInstance("org.apache.bcel.verifier.structurals.GenericArray");
+ private static final ObjectType GENERIC_ARRAY = ObjectType.getInstance("org.apache.commons.bcel6.verifier.structurals.GenericArray");
/**
* The constructor. Constructs a new instance of this class.
@@ -105,7 +105,7 @@ public class InstConstraintVisitor exten
* This method is called by the visitXXX() to notify the acceptor of this InstConstraintVisitor
* that a constraint violation has occured. This is done by throwing an instance of a
* StructuralCodeConstraintException.
- * @throws org.apache.bcel.verifier.exc.StructuralCodeConstraintException always.
+ * @throws org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException always.
*/
private void constraintViolated(Instruction violator, String description){
String fq_classname = violator.getClass().getName();
@@ -144,7 +144,7 @@ public class InstConstraintVisitor exten
/**
* Assures index is of type INT.
- * @throws org.apache.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is not satisfied.
+ * @throws org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException if the above constraint is not satisfied.
*/
private void indexOfInt(Instruction o, Type index){
if (! index.equals(Type.INT)) {
@@ -156,7 +156,7 @@ public class InstConstraintVisitor exten
* Assures the ReferenceType r is initialized (or Type.NULL).
* Formally, this means (!(r instanceof UninitializedObjectType)), because
* there are no uninitialized array types.
- * @throws org.apache.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is not satisfied.
+ * @throws org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException if the above constraint is not satisfied.
*/
private void referenceTypeIsInitialized(Instruction o, ReferenceType r){
if (r instanceof UninitializedObjectType){
@@ -174,7 +174,7 @@ public class InstConstraintVisitor exten
/**
* Assures arrayref is of ArrayType or NULL;
* returns true if and only if arrayref is non-NULL.
- * @throws org.apache.bcel.verifier.exc.StructuralCodeConstraintException if the above constraint is violated.
+ * @throws org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException if the above constraint is violated.
*/
private boolean arrayrefOfArrayType(Instruction o, Type arrayref){
if (! ((arrayref instanceof ArrayType) || arrayref.equals(Type.NULL)) ) {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstructionContext.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstructionContext.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstructionContext.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstructionContext.java Sun Aug 9 21:21:10 2015
@@ -15,11 +15,12 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.commons.bcel6.verifier.structurals;
import java.util.ArrayList;
-import org.apache.bcel.generic.InstructionHandle;
+
+import org.apache.commons.bcel6.generic.InstructionHandle;
/**
* An InstructionContext offers convenient access
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/LocalVariables.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/LocalVariables.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/LocalVariables.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/LocalVariables.java Sun Aug 9 21:21:10 2015
@@ -15,13 +15,13 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.commons.bcel6.verifier.structurals;
-import org.apache.bcel.generic.ReferenceType;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.commons.bcel6.generic.ReferenceType;
+import org.apache.commons.bcel6.generic.Type;
+import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException;
+import org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException;
/**
* This class implements an array of local variables used for symbolic JVM
@@ -171,7 +171,7 @@ public class LocalVariables{
else{
if (! (locals[i].equals(lv.locals[i])) ){
/*TODO
- if ((locals[i] instanceof org.apache.bcel.generic.ReturnaddressType) && (lv.locals[i] instanceof org.apache.bcel.generic.ReturnaddressType)){
+ if ((locals[i] instanceof org.apache.commons.bcel6.generic.ReturnaddressType) && (lv.locals[i] instanceof org.apache.commons.bcel6.generic.ReturnaddressType)){
//System.err.println("merging "+locals[i]+" and "+lv.locals[i]);
throw new AssertionViolatedException("Merging different ReturnAddresses: '"+locals[i]+"' and '"+lv.locals[i]+"'.");
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/OperandStack.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/OperandStack.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/OperandStack.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/OperandStack.java Sun Aug 9 21:21:10 2015
@@ -15,20 +15,21 @@
* limitations under the License.
*
*/
-package org.apache.bcel.verifier.structurals;
+package org.apache.commons.bcel6.verifier.structurals;
import java.util.ArrayList;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.ReferenceType;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+
+import org.apache.commons.bcel6.generic.ObjectType;
+import org.apache.commons.bcel6.generic.ReferenceType;
+import org.apache.commons.bcel6.generic.Type;
+import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException;
+import org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException;
/**
* This class implements a stack used for symbolic JVM stack simulation.
* [It's used an an operand stack substitute.]
- * Elements of this stack are org.apache.bcel.generic.Type objects.
+ * Elements of this stack are org.apache.commons.bcel6.generic.Type objects.
*
* @version $Id$
* @author Enver Haase
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.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.io.PrintWriter;
@@ -25,26 +25,26 @@ import java.util.List;
import java.util.Random;
import java.util.Vector;
-import org.apache.bcel.Constants;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.JsrInstruction;
-import org.apache.bcel.generic.MethodGen;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.RET;
-import org.apache.bcel.generic.ReferenceType;
-import org.apache.bcel.generic.ReturnInstruction;
-import org.apache.bcel.generic.ReturnaddressType;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.verifier.PassVerifier;
-import org.apache.bcel.verifier.VerificationResult;
-import org.apache.bcel.verifier.Verifier;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
-import org.apache.bcel.verifier.exc.VerifierConstraintViolatedException;
+import org.apache.commons.bcel6.Constants;
+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.JsrInstruction;
+import org.apache.commons.bcel6.generic.MethodGen;
+import org.apache.commons.bcel6.generic.ObjectType;
+import org.apache.commons.bcel6.generic.RET;
+import org.apache.commons.bcel6.generic.ReferenceType;
+import org.apache.commons.bcel6.generic.ReturnInstruction;
+import org.apache.commons.bcel6.generic.ReturnaddressType;
+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.exc.AssertionViolatedException;
+import org.apache.commons.bcel6.verifier.exc.StructuralCodeConstraintException;
+import org.apache.commons.bcel6.verifier.exc.VerifierConstraintViolatedException;
/**
* This PassVerifier verifies a method of class file according to pass 3,
@@ -113,7 +113,7 @@ public final class Pass3bVerifier extend
/**
* This class should only be instantiated by a Verifier.
*
- * @see org.apache.bcel.verifier.Verifier
+ * @see org.apache.commons.bcel6.verifier.Verifier
*/
public Pass3bVerifier(Verifier owner, int method_no){
myOwner = owner;
@@ -293,8 +293,8 @@ public final class Pass3bVerifier extend
* verifier-inferred types and the class file's debug information (LocalVariables
* attributes) match [TODO].
*
- * @see org.apache.bcel.verifier.statics.LocalVariablesInfo
- * @see org.apache.bcel.verifier.statics.Pass2Verifier#getLocalVariablesInfo(int)
+ * @see org.apache.commons.bcel6.verifier.statics.LocalVariablesInfo
+ * @see org.apache.commons.bcel6.verifier.statics.Pass2Verifier#getLocalVariablesInfo(int)
*/
@Override
public VerificationResult do_verify(){
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Subroutine.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Subroutine.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Subroutine.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Subroutine.java Sun Aug 9 21:21:10 2015
@@ -15,10 +15,10 @@
* 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.commons.bcel6.generic.InstructionHandle;
/**
* This interface defines properties of JVM bytecode subroutines.
@@ -41,7 +41,7 @@ public interface Subroutine{
* Note that JustIce has a pretty rigid notion of a subroutine.
* <B>Must not be invoked on the 'top-level subroutine'.</B>
*
- * @see org.apache.bcel.verifier.structurals.Subroutines
+ * @see org.apache.commons.bcel6.verifier.structurals.Subroutines
*/
InstructionHandle getLeavingRET();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Subroutines.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Subroutines.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Subroutines.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Subroutines.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;
import java.util.HashMap;
@@ -24,22 +24,22 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.bcel.generic.ASTORE;
-import org.apache.bcel.generic.ATHROW;
-import org.apache.bcel.generic.BranchInstruction;
-import org.apache.bcel.generic.CodeExceptionGen;
-import org.apache.bcel.generic.GotoInstruction;
-import org.apache.bcel.generic.IndexedInstruction;
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.JsrInstruction;
-import org.apache.bcel.generic.LocalVariableInstruction;
-import org.apache.bcel.generic.MethodGen;
-import org.apache.bcel.generic.RET;
-import org.apache.bcel.generic.ReturnInstruction;
-import org.apache.bcel.generic.Select;
-import org.apache.bcel.verifier.exc.AssertionViolatedException;
-import org.apache.bcel.verifier.exc.StructuralCodeConstraintException;
+import org.apache.commons.bcel6.generic.ASTORE;
+import org.apache.commons.bcel6.generic.ATHROW;
+import org.apache.commons.bcel6.generic.BranchInstruction;
+import org.apache.commons.bcel6.generic.CodeExceptionGen;
+import org.apache.commons.bcel6.generic.GotoInstruction;
+import org.apache.commons.bcel6.generic.IndexedInstruction;
+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.LocalVariableInstruction;
+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;
/**
* Instances of this class contain information about the subroutines
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/UninitializedObjectType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/UninitializedObjectType.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/UninitializedObjectType.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/UninitializedObjectType.java Sun Aug 9 21:21:10 2015
@@ -15,12 +15,12 @@
* 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.generic.ObjectType;
-import org.apache.bcel.generic.ReferenceType;
+import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.generic.ObjectType;
+import org.apache.commons.bcel6.generic.ReferenceType;
/**
* This class represents an uninitialized object type; see The Java
Modified: commons/proper/bcel/trunk/src/site/xdoc/faq.xml
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/site/xdoc/faq.xml?rev=1694911&r1=1694910&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/site/xdoc/faq.xml (original)
+++ commons/proper/bcel/trunk/src/site/xdoc/faq.xml Sun Aug 9 21:21:10 2015
@@ -31,7 +31,7 @@
<b>Q: </b>How can I ... with BCEL?
<br/>
<b>A: </b>Take a look at
- <tt>org.apache.bcel.util.BCELifier</tt>, it takes a given class
+ <tt>org.apache.commons.bcel6.util.BCELifier</tt>, it takes a given class
and converts it to a BCEL program (in Java, of course). It will
show you how certain code is generated using BCEL.
</p>
@@ -85,7 +85,7 @@
<b>A:</b> Use the JustIce verifier that comes together with BCEL
to get more detailed information:
<pre>
- java org.apache.bcel.verifier.Verifier <your class></pre>
+ java org.apache.commons.bcel6.verifier.Verifier <your class></pre>
</p>
</section>
Modified: commons/proper/bcel/trunk/src/site/xdoc/manual.xml
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/site/xdoc/manual.xml?rev=1694911&r1=1694910&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/site/xdoc/manual.xml (original)
+++ commons/proper/bcel/trunk/src/site/xdoc/manual.xml Sun Aug 9 21:21:10 2015
@@ -623,7 +623,7 @@
<p>
The "static" component of the <font
face="helvetica,arial">BCEL</font> API resides in the package
- <tt>org.apache.bcel.classfile</tt> and closely represents class
+ <tt>org.apache.commons.bcel6.classfile</tt> and closely represents class
files. All of the binary components and data structures declared
in the <a
href="http://docs.oracle.com/javase/specs/">JVM
@@ -751,7 +751,7 @@
<section name="3.3 ClassGen">
<p>
- This part of the API (package <tt>org.apache.bcel.generic</tt>)
+ This part of the API (package <tt>org.apache.commons.bcel6.generic</tt>)
supplies an abstraction level for creating or transforming class
files dynamically. It makes the static constraints of Java class
files like the hard-coded byte code addresses "generic". The
@@ -1095,7 +1095,7 @@
<p>
The <tt>search()</tt> method of class
- <tt>org.apache.bcel.util.InstructionFinder</tt> gets a regular
+ <tt>org.apache.commons.bcel6.util.InstructionFinder</tt> gets a regular
expression and a starting point as arguments and returns an
iterator describing the area of matched instructions. Additional
constraints to the matching area of instructions, which can not be
@@ -1577,10 +1577,10 @@ symbolic type signature encoded with <tt
import java.io.*;
import java.util.Iterator;
-import org.apache.bcel.classfile.*;
-import org.apache.bcel.generic.*;
-import org.apache.bcel.Repository;
-import org.apache.bcel.util.InstructionFinder;
+import org.apache.commons.bcel6.classfile.*;
+import org.apache.commons.bcel6.generic.*;
+import org.apache.commons.bcel6.Repository;
+import org.apache.commons.bcel6.util.InstructionFinder;
public class Peephole {
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AbstractCounterVisitorTestCase.java (from r1694824, 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/commons/bcel6/AbstractCounterVisitorTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AbstractCounterVisitorTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractCounterVisitorTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AbstractCounterVisitorTestCase.java Sun Aug 9 21:21:10 2015
@@ -16,11 +16,11 @@
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
-import org.apache.bcel.classfile.DescendingVisitor;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.visitors.CounterVisitor;
+import org.apache.commons.bcel6.classfile.DescendingVisitor;
+import org.apache.commons.bcel6.classfile.JavaClass;
+import org.apache.commons.bcel6.visitors.CounterVisitor;
public abstract class AbstractCounterVisitorTestCase extends AbstractTestCase
{
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java (from r1694824, 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/commons/bcel6/AbstractTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AbstractTestCase.java Sun Aug 9 21:21:10 2015
@@ -16,26 +16,26 @@
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
+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;
public abstract class AbstractTestCase extends TestCase
{
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnnotationAccessFlagTestCase.java (from r1694824, 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/commons/bcel6/AnnotationAccessFlagTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnnotationAccessFlagTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationAccessFlagTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnnotationAccessFlagTestCase.java Sun Aug 9 21:21:10 2015
@@ -16,9 +16,9 @@
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.commons.bcel6.classfile.JavaClass;
public class AnnotationAccessFlagTestCase extends AbstractTestCase
{
@@ -29,11 +29,11 @@ public class AnnotationAccessFlagTestCas
*/
public void testAnnotationClassSaysItIs() throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.bcel.data.SimpleAnnotation");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.SimpleAnnotation");
assertTrue(
"Expected SimpleAnnotation class to say it was an annotation - but it didn't !",
clazz.isAnnotation());
- clazz = getTestClass("org.apache.bcel.data.SimpleClass");
+ clazz = getTestClass("org.apache.commons.bcel6.data.SimpleClass");
assertTrue(
"Expected SimpleClass class to say it was not an annotation - but it didn't !",
!clazz.isAnnotation());
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnnotationDefaultAttributeTestCase.java (from r1694824, 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/commons/bcel6/AnnotationDefaultAttributeTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnnotationDefaultAttributeTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnnotationDefaultAttributeTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnnotationDefaultAttributeTestCase.java Sun Aug 9 21:21:10 2015
@@ -16,13 +16,13 @@
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
-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;
+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;
public class AnnotationDefaultAttributeTestCase extends AbstractTestCase
{
@@ -33,7 +33,7 @@ public class AnnotationDefaultAttributeT
*/
public void testMethodAnnotations() throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.bcel.data.SimpleAnnotation");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.SimpleAnnotation");
Method m = getMethod(clazz, "fruit");
AnnotationDefault a = (AnnotationDefault) findAttribute(
"AnnotationDefault", m.getAttributes());
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnonymousClassTestCase.java (from r1694824, 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/commons/bcel6/AnonymousClassTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnonymousClassTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnonymousClassTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AnonymousClassTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/AnonymousClassTestCase.java Sun Aug 9 21:21:10 2015
@@ -16,15 +16,15 @@
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.commons.bcel6.classfile.JavaClass;
public class AnonymousClassTestCase extends AbstractTestCase
{
public void testRegularClassIsNotAnonymous() throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.bcel.data.AnonymousClassTest");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AnonymousClassTest");
assertFalse("regular outer classes are not anonymous", clazz
.isAnonymous());
assertFalse("regular outer classes are not nested", clazz.isNested());
@@ -33,7 +33,7 @@ public class AnonymousClassTestCase exte
public void testNamedInnerClassIsNotAnonymous()
throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.bcel.data.AnonymousClassTest$X");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AnonymousClassTest$X");
assertFalse("regular inner classes are not anonymous", clazz
.isAnonymous());
assertTrue("regular inner classes are nested", clazz.isNested());
@@ -42,7 +42,7 @@ public class AnonymousClassTestCase exte
public void testStaticInnerClassIsNotAnonymous()
throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.bcel.data.AnonymousClassTest$Y");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AnonymousClassTest$Y");
assertFalse("regular static inner classes are not anonymous", clazz
.isAnonymous());
assertTrue("regular static inner classes are nested", clazz.isNested());
@@ -51,7 +51,7 @@ public class AnonymousClassTestCase exte
public void testAnonymousInnerClassIsAnonymous()
throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.bcel.data.AnonymousClassTest$1");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AnonymousClassTest$1");
assertTrue("anonymous inner classes are anonymous", clazz.isAnonymous());
assertTrue("anonymous inner classes are anonymous", clazz.isNested());
}
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/BCELBenchmark.java (from r1694824, 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/commons/bcel6/BCELBenchmark.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/BCELBenchmark.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/BCELBenchmark.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/BCELBenchmark.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/BCELBenchmark.java Sun Aug 9 21:21:10 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
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.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.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.commons.collections4.Predicate;
import org.apache.commons.collections4.iterators.EnumerationIterator;
import org.apache.commons.collections4.iterators.FilterIterator;
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/CounterVisitorTestCase.java (from r1694824, 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/commons/bcel6/CounterVisitorTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/CounterVisitorTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/CounterVisitorTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/CounterVisitorTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/CounterVisitorTestCase.java Sun Aug 9 21:21:10 2015
@@ -16,16 +16,16 @@
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.commons.bcel6.classfile.JavaClass;
public class CounterVisitorTestCase extends AbstractCounterVisitorTestCase
{
@Override
protected JavaClass getTestClass() throws ClassNotFoundException
{
- return getTestClass("org.apache.bcel.data.MarkedType");
+ return getTestClass("org.apache.commons.bcel6.data.MarkedType");
}
public void testAnnotationsCount()
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/ElementValueGenTestCase.java (from r1694824, 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/commons/bcel6/ElementValueGenTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/ElementValueGenTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/ElementValueGenTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/ElementValueGenTestCase.java Sun Aug 9 21:21:10 2015
@@ -16,21 +16,22 @@
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.ElementValueGen;
-import org.apache.bcel.generic.SimpleElementValueGen;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.generic.ClassElementValueGen;
-import org.apache.bcel.generic.EnumElementValueGen;
+
+import org.apache.commons.bcel6.Constants;
+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;
public class ElementValueGenTestCase extends AbstractTestCase
{
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnclosingMethodAttributeTestCase.java (from r1694824, 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/commons/bcel6/EnclosingMethodAttributeTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnclosingMethodAttributeTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnclosingMethodAttributeTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnclosingMethodAttributeTestCase.java Sun Aug 9 21:21:10 2015
@@ -16,16 +16,16 @@
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
import java.io.File;
import java.io.IOException;
-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.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;
public class EnclosingMethodAttributeTestCase extends AbstractTestCase
{
@@ -36,7 +36,7 @@ public class EnclosingMethodAttributeTes
public void testCheckMethodLevelNamedInnerClass()
throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.bcel.data.AttributeTestClassEM01$1S");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AttributeTestClassEM01$1S");
ConstantPool pool = clazz.getConstantPool();
Attribute[] encMethodAttrs = findAttribute("EnclosingMethod", clazz);
assertTrue("Expected 1 EnclosingMethod attribute but found "
@@ -45,9 +45,9 @@ public class EnclosingMethodAttributeTes
String enclosingClassName = em.getEnclosingClass().getBytes(pool);
String enclosingMethodName = em.getEnclosingMethod().getName(pool);
assertTrue(
- "Expected class name to be 'org/apache/bcel/data/AttributeTestClassEM01' but was "
+ "Expected class name to be 'org/apache/commons/bcel6/data/AttributeTestClassEM01' but was "
+ enclosingClassName, enclosingClassName
- .equals("org/apache/bcel/data/AttributeTestClassEM01"));
+ .equals("org/apache/commons/bcel6/data/AttributeTestClassEM01"));
assertTrue("Expected method name to be 'main' but was "
+ enclosingMethodName, enclosingMethodName.equals("main"));
}
@@ -59,7 +59,7 @@ public class EnclosingMethodAttributeTes
public void testCheckClassLevelNamedInnerClass()
throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.bcel.data.AttributeTestClassEM02$1");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AttributeTestClassEM02$1");
ConstantPool pool = clazz.getConstantPool();
Attribute[] encMethodAttrs = findAttribute("EnclosingMethod", clazz);
assertTrue("Expected 1 EnclosingMethod attribute but found "
@@ -71,9 +71,9 @@ public class EnclosingMethodAttributeTes
+ em.getEnclosingMethodIndex(), em
.getEnclosingMethodIndex() == 0);
assertTrue(
- "Expected class name to be 'org/apache/bcel/data/AttributeTestClassEM02' but was "
+ "Expected class name to be 'org/apache/commons/bcel6/data/AttributeTestClassEM02' but was "
+ enclosingClassName, enclosingClassName
- .equals("org/apache/bcel/data/AttributeTestClassEM02"));
+ .equals("org/apache/commons/bcel6/data/AttributeTestClassEM02"));
}
/**
@@ -82,7 +82,7 @@ public class EnclosingMethodAttributeTes
public void testAttributeSerializtion() throws ClassNotFoundException,
IOException
{
- JavaClass clazz = getTestClass("org.apache.bcel.data.AttributeTestClassEM02$1");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AttributeTestClassEM02$1");
ConstantPool pool = clazz.getConstantPool();
Attribute[] encMethodAttrs = findAttribute("EnclosingMethod", clazz);
assertTrue("Expected 1 EnclosingMethod attribute but found "
@@ -101,9 +101,9 @@ public class EnclosingMethodAttributeTes
+ em.getEnclosingMethodIndex(), em
.getEnclosingMethodIndex() == 0);
assertTrue(
- "Expected class name to be 'org/apache/bcel/data/AttributeTestClassEM02' but was "
+ "Expected class name to be 'org/apache/commons/bcel6/data/AttributeTestClassEM02' but was "
+ enclosingClassName, enclosingClassName
- .equals("org/apache/bcel/data/AttributeTestClassEM02"));
+ .equals("org/apache/commons/bcel6/data/AttributeTestClassEM02"));
tfile.deleteOnExit();
}
}
\ No newline at end of file
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnumAccessFlagTestCase.java (from r1694824, 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/commons/bcel6/EnumAccessFlagTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnumAccessFlagTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/EnumAccessFlagTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/EnumAccessFlagTestCase.java Sun Aug 9 21:21:10 2015
@@ -16,9 +16,9 @@
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
-import org.apache.bcel.classfile.JavaClass;
+import org.apache.commons.bcel6.classfile.JavaClass;
public class EnumAccessFlagTestCase extends AbstractTestCase
{
@@ -29,11 +29,11 @@ public class EnumAccessFlagTestCase exte
*/
public void testEnumClassSaysItIs() throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.bcel.data.SimpleEnum");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.SimpleEnum");
assertTrue(
"Expected SimpleEnum class to say it was an enum - but it didn't !",
clazz.isEnum());
- clazz = getTestClass("org.apache.bcel.data.SimpleClass");
+ clazz = getTestClass("org.apache.commons.bcel6.data.SimpleClass");
assertTrue(
"Expected SimpleClass class to say it was not an enum - but it didn't !",
!clazz.isEnum());
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/FieldAnnotationsTestCase.java (from r1694824, commons/proper/bcel/trunk/src/test/java/org/apache/bcel/FieldAnnotationsTestCase.java)
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/FieldAnnotationsTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/FieldAnnotationsTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/FieldAnnotationsTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/FieldAnnotationsTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/FieldAnnotationsTestCase.java Sun Aug 9 21:21:10 2015
@@ -16,18 +16,19 @@
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
import java.io.File;
import java.io.IOException;
-import org.apache.bcel.classfile.Field;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.AnnotationEntry;
-import org.apache.bcel.classfile.ElementValuePair;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.FieldGen;
-import org.apache.bcel.generic.AnnotationEntryGen;
-import org.apache.bcel.util.SyntheticRepository;
+
+import org.apache.commons.bcel6.classfile.AnnotationEntry;
+import org.apache.commons.bcel6.classfile.ElementValuePair;
+import org.apache.commons.bcel6.classfile.Field;
+import org.apache.commons.bcel6.classfile.JavaClass;
+import org.apache.commons.bcel6.generic.AnnotationEntryGen;
+import org.apache.commons.bcel6.generic.ClassGen;
+import org.apache.commons.bcel6.generic.FieldGen;
+import org.apache.commons.bcel6.util.SyntheticRepository;
public class FieldAnnotationsTestCase extends AbstractTestCase
{
@@ -36,10 +37,10 @@ public class FieldAnnotationsTestCase ex
*/
public void testFieldAnnotationEntrys() throws ClassNotFoundException
{
- JavaClass clazz = getTestClass("org.apache.bcel.data.AnnotatedFields");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AnnotatedFields");
// TODO L...;?
- checkAnnotatedField(clazz, "i", "Lorg/apache/bcel/data/SimpleAnnotation;", "id", "1");
- checkAnnotatedField(clazz, "s", "Lorg/apache/bcel/data/SimpleAnnotation;", "id", "2");
+ checkAnnotatedField(clazz, "i", "Lorg/apache/commons/bcel6/data/SimpleAnnotation;", "id", "1");
+ checkAnnotatedField(clazz, "s", "Lorg/apache/commons/bcel6/data/SimpleAnnotation;", "id", "2");
}
/**
@@ -48,16 +49,16 @@ public class FieldAnnotationsTestCase ex
public void testFieldAnnotationEntrysReadWrite() throws ClassNotFoundException,
IOException
{
- JavaClass clazz = getTestClass("org.apache.bcel.data.AnnotatedFields");
- checkAnnotatedField(clazz, "i", "Lorg/apache/bcel/data/SimpleAnnotation;", "id", "1");
- checkAnnotatedField(clazz, "s", "Lorg/apache/bcel/data/SimpleAnnotation;", "id", "2");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AnnotatedFields");
+ checkAnnotatedField(clazz, "i", "Lorg/apache/commons/bcel6/data/SimpleAnnotation;", "id", "1");
+ checkAnnotatedField(clazz, "s", "Lorg/apache/commons/bcel6/data/SimpleAnnotation;", "id", "2");
// Write it out
File tfile = createTestdataFile("AnnotatedFields.class");
clazz.dump(tfile);
SyntheticRepository repos2 = createRepos(".");
repos2.loadClass("AnnotatedFields");
- checkAnnotatedField(clazz, "i", "Lorg/apache/bcel/data/SimpleAnnotation;", "id", "1");
- checkAnnotatedField(clazz, "s", "Lorg/apache/bcel/data/SimpleAnnotation;", "id", "2");
+ checkAnnotatedField(clazz, "i", "Lorg/apache/commons/bcel6/data/SimpleAnnotation;", "id", "1");
+ checkAnnotatedField(clazz, "s", "Lorg/apache/commons/bcel6/data/SimpleAnnotation;", "id", "2");
assertTrue(tfile.delete());
}
@@ -69,7 +70,7 @@ public class FieldAnnotationsTestCase ex
throws ClassNotFoundException
{
boolean dbg = false;
- JavaClass clazz = getTestClass("org.apache.bcel.data.AnnotatedFields");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.data.AnnotatedFields");
ClassGen clg = new ClassGen(clazz);
Field f = clg.getFields()[0];
if (dbg) {
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/GeneratingAnnotatedClassesTestCase.java (from r1694824, commons/proper/bcel/trunk/src/test/java/org/apache/bcel/GeneratingAnnotatedClassesTestCase.java)
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/GeneratingAnnotatedClassesTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/GeneratingAnnotatedClassesTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/GeneratingAnnotatedClassesTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/GeneratingAnnotatedClassesTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/GeneratingAnnotatedClassesTestCase.java Sun Aug 9 21:21:10 2015
@@ -15,42 +15,43 @@
* limitations under the License.
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.apache.bcel.classfile.AnnotationEntry;
-import org.apache.bcel.classfile.ArrayElementValue;
-import org.apache.bcel.classfile.ElementValue;
-import org.apache.bcel.classfile.ElementValuePair;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.Method;
-import org.apache.bcel.classfile.ParameterAnnotationEntry;
-import org.apache.bcel.classfile.SimpleElementValue;
-import org.apache.bcel.generic.ALOAD;
-import org.apache.bcel.generic.ASTORE;
-import org.apache.bcel.generic.AnnotationElementValueGen;
-import org.apache.bcel.generic.AnnotationEntryGen;
-import org.apache.bcel.generic.ArrayElementValueGen;
-import org.apache.bcel.generic.ArrayType;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.ElementValueGen;
-import org.apache.bcel.generic.ElementValuePairGen;
-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.SimpleElementValueGen;
-import org.apache.bcel.generic.Type;
-import org.apache.bcel.util.SyntheticRepository;
+import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.classfile.AnnotationEntry;
+import org.apache.commons.bcel6.classfile.ArrayElementValue;
+import org.apache.commons.bcel6.classfile.ElementValue;
+import org.apache.commons.bcel6.classfile.ElementValuePair;
+import org.apache.commons.bcel6.classfile.JavaClass;
+import org.apache.commons.bcel6.classfile.Method;
+import org.apache.commons.bcel6.classfile.ParameterAnnotationEntry;
+import org.apache.commons.bcel6.classfile.SimpleElementValue;
+import org.apache.commons.bcel6.generic.ALOAD;
+import org.apache.commons.bcel6.generic.ASTORE;
+import org.apache.commons.bcel6.generic.AnnotationElementValueGen;
+import org.apache.commons.bcel6.generic.AnnotationEntryGen;
+import org.apache.commons.bcel6.generic.ArrayElementValueGen;
+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.ElementValueGen;
+import org.apache.commons.bcel6.generic.ElementValuePairGen;
+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.SimpleElementValueGen;
+import org.apache.commons.bcel6.generic.Type;
+import org.apache.commons.bcel6.util.SyntheticRepository;
/**
* The program that some of the tests generate looks like this:
@@ -215,7 +216,7 @@ public class GeneratingAnnotatedClassesT
public void testTransformClassToClassGen_SimpleTypes()
throws ClassNotFoundException
{
- JavaClass jc = getTestClass("org.apache.bcel.data.SimpleAnnotatedClass");
+ JavaClass jc = getTestClass("org.apache.commons.bcel6.data.SimpleAnnotatedClass");
ClassGen cgen = new ClassGen(jc);
// Check annotations are correctly preserved
AnnotationEntryGen[] annotations = cgen.getAnnotationEntries();
@@ -230,7 +231,7 @@ public class GeneratingAnnotatedClassesT
public void testTransformClassToClassGen_EnumType()
throws ClassNotFoundException
{
- JavaClass jc = getTestClass("org.apache.bcel.data.AnnotatedWithEnumClass");
+ JavaClass jc = getTestClass("org.apache.commons.bcel6.data.AnnotatedWithEnumClass");
ClassGen cgen = new ClassGen(jc);
// Check annotations are correctly preserved
AnnotationEntryGen[] annotations = cgen.getAnnotationEntries();
@@ -245,7 +246,7 @@ public class GeneratingAnnotatedClassesT
public void testTransformClassToClassGen_ArrayAndAnnotationTypes()
throws ClassNotFoundException
{
- JavaClass jc = getTestClass("org.apache.bcel.data.AnnotatedWithCombinedAnnotation");
+ JavaClass jc = getTestClass("org.apache.commons.bcel6.data.AnnotatedWithCombinedAnnotation");
ClassGen cgen = new ClassGen(jc);
// Check annotations are correctly preserved
AnnotationEntryGen[] annotations = cgen.getAnnotationEntries();
@@ -268,10 +269,10 @@ public class GeneratingAnnotatedClassesT
+ innerValue,
innerValue instanceof AnnotationElementValueGen);
AnnotationElementValueGen innerAnnotationValue = (AnnotationElementValueGen) innerValue;
- assertTrue("Should be called Lorg/apache/bcel/data/SimpleAnnotation; but is called: "
+ assertTrue("Should be called Lorg/apache/commons/bcel6/data/SimpleAnnotation; but is called: "
+ innerAnnotationValue.getAnnotation().getTypeName(),
innerAnnotationValue.getAnnotation().getTypeSignature().equals(
- "Lorg/apache/bcel/data/SimpleAnnotation;"));
+ "Lorg/apache/commons/bcel6/data/SimpleAnnotation;"));
// check the three methods
Method[] methods = cgen.getMethods();
@@ -352,7 +353,7 @@ public class GeneratingAnnotatedClassesT
public void testTransformComplexClassToClassGen()
throws ClassNotFoundException
{
- JavaClass jc = getTestClass("org.apache.bcel.data.ComplexAnnotatedClass");
+ JavaClass jc = getTestClass("org.apache.commons.bcel6.data.ComplexAnnotatedClass");
ClassGen cgen = new ClassGen(jc);
// Check annotations are correctly preserved
AnnotationEntryGen[] annotations = cgen.getAnnotationEntries();
@@ -380,7 +381,7 @@ public class GeneratingAnnotatedClassesT
*/
public void testModifyingClasses1() throws ClassNotFoundException
{
- JavaClass jc = getTestClass("org.apache.bcel.data.SimpleAnnotatedClass");
+ JavaClass jc = getTestClass("org.apache.commons.bcel6.data.SimpleAnnotatedClass");
ClassGen cgen = new ClassGen(jc);
ConstantPoolGen cp = cgen.getConstantPool();
cgen.addAnnotationEntry(createFruitAnnotation(cp, "Pineapple"));
@@ -397,7 +398,7 @@ public class GeneratingAnnotatedClassesT
*/
public void testModifyingClasses2() throws ClassNotFoundException
{
- JavaClass jc = getTestClass("org.apache.bcel.data.SimpleAnnotatedClass");
+ JavaClass jc = getTestClass("org.apache.commons.bcel6.data.SimpleAnnotatedClass");
ClassGen cgen = new ClassGen(jc);
ConstantPoolGen cp = cgen.getConstantPool();
cgen.addAnnotationEntry(createCombinedAnnotation(cp));
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/InstructionFinderTestCase.java (from r1694824, 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/commons/bcel6/InstructionFinderTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/InstructionFinderTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/InstructionFinderTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/InstructionFinderTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/InstructionFinderTestCase.java Sun Aug 9 21:21:10 2015
@@ -15,22 +15,22 @@
* limitations under the License.
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
import java.util.Iterator;
-import org.apache.bcel.AbstractTestCase;
-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;
+import org.apache.commons.bcel6.AbstractTestCase;
+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;
public class InstructionFinderTestCase extends AbstractTestCase
{
public void testSearchAll() throws Exception
{
- JavaClass clazz = getTestClass("org.apache.bcel.util.InstructionFinder");
+ JavaClass clazz = getTestClass("org.apache.commons.bcel6.util.InstructionFinder");
Method[] methods = clazz.getMethods();
Method searchM = null;
for (Method m : methods)
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/NanoTimer.java (from r1694824, 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/commons/bcel6/NanoTimer.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/NanoTimer.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/NanoTimer.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/NanoTimer.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/NanoTimer.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
public class NanoTimer {
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/PerformanceTest.java (from r1694824, 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/commons/bcel6/PerformanceTest.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/PerformanceTest.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PerformanceTest.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/PerformanceTest.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/PerformanceTest.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel;
+package org.apache.commons.bcel6;
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.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.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.junit.Assert;
import junit.framework.TestCase;
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/classfile/UtilityTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/classfile/UtilityTestCase.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/classfile/UtilityTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/classfile/UtilityTestCase.java Sun Aug 9 21:21:10 2015
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.bcel.classfile;
+package org.apache.commons.bcel6.classfile;
+
+import org.apache.commons.bcel6.classfile.Utility;
import junit.framework.TestCase;
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotatedFields.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotatedFields.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotatedFields.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotatedFields.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
public class AnnotatedFields {
@SimpleAnnotation(id=1) int i;
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotatedWithCombinedAnnotation.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotatedWithCombinedAnnotation.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotatedWithCombinedAnnotation.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotatedWithCombinedAnnotation.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
@CombinedAnnotation( { @SimpleAnnotation(id = 4) })
public class AnnotatedWithCombinedAnnotation
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotatedWithEnumClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotatedWithEnumClass.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotatedWithEnumClass.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotatedWithEnumClass.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
@AnnotationEnumElement(enumval = SimpleEnum.Red)
public class AnnotatedWithEnumClass
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotationEnumElement.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotationEnumElement.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotationEnumElement.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnnotationEnumElement.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnonymousClassTest.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnonymousClassTest.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnonymousClassTest.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AnonymousClassTest.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
public class AnonymousClassTest
{
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM01.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM01.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM01.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM01.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
public class AttributeTestClassEM01
{
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM02.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM02.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM02.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/AttributeTestClassEM02.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
public class AttributeTestClassEM02
{
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/CombinedAnnotation.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/CombinedAnnotation.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/CombinedAnnotation.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/CombinedAnnotation.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/ComplexAnnotatedClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/ComplexAnnotatedClass.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/ComplexAnnotatedClass.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/ComplexAnnotatedClass.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
@ComplexAnnotation(ival = 4, bval = 2, cval = '5', fval = 3.0f, dval = 33.4, zval = false, jval = 56, sval = 99)
public class ComplexAnnotatedClass
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/ComplexAnnotation.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/ComplexAnnotation.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/ComplexAnnotation.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/ComplexAnnotation.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/MarkedType.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/MarkedType.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/MarkedType.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/MarkedType.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
@MarkerAnnotationInvisible
@MarkerAnnotation
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/MarkerAnnotation.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/MarkerAnnotation.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/MarkerAnnotation.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/MarkerAnnotation.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
import java.lang.annotation.*;
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/MarkerAnnotationInvisible.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/MarkerAnnotationInvisible.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/MarkerAnnotationInvisible.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/MarkerAnnotationInvisible.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
import java.lang.annotation.*;
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleAnnotatedClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleAnnotatedClass.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleAnnotatedClass.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleAnnotatedClass.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
@SimpleAnnotation(id = 4)
public class SimpleAnnotatedClass
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleAnnotation.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleAnnotation.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleAnnotation.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleAnnotation.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
import java.lang.annotation.*;
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleClass.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleClass.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleClass.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleClass.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
public class SimpleClass
{
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleEnum.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleEnum.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleEnum.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/data/SimpleEnum.java Sun Aug 9 21:21:10 2015
@@ -16,6 +16,6 @@
*
*/
-package org.apache.bcel.data;
+package org.apache.commons.bcel6.data;
public enum SimpleEnum { Red,Orange,Yellow,Green,Blue,Indigo,Violet }
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/AnnotationGenTestCase.java Sun Aug 9 21:21:10 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.bcel.generic;
+package org.apache.commons.bcel6.generic;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -25,12 +25,19 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.bcel.AbstractTestCase;
-import org.apache.bcel.Constants;
-import org.apache.bcel.classfile.Annotations;
-import org.apache.bcel.classfile.Attribute;
-import org.apache.bcel.classfile.RuntimeInvisibleAnnotations;
-import org.apache.bcel.classfile.RuntimeVisibleAnnotations;
+import org.apache.commons.bcel6.AbstractTestCase;
+import org.apache.commons.bcel6.Constants;
+import org.apache.commons.bcel6.classfile.Annotations;
+import org.apache.commons.bcel6.classfile.Attribute;
+import org.apache.commons.bcel6.classfile.RuntimeInvisibleAnnotations;
+import org.apache.commons.bcel6.classfile.RuntimeVisibleAnnotations;
+import org.apache.commons.bcel6.generic.AnnotationEntryGen;
+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.ElementValuePairGen;
+import org.apache.commons.bcel6.generic.ObjectType;
+import org.apache.commons.bcel6.generic.SimpleElementValueGen;
public class AnnotationGenTestCase extends AbstractTestCase
{
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/MethodGenTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/MethodGenTestCase.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/MethodGenTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/generic/MethodGenTestCase.java Sun Aug 9 21:21:10 2015
@@ -15,14 +15,19 @@
* limitations under the License.
*/
-package org.apache.bcel.generic;
+package org.apache.commons.bcel6.generic;
import java.util.Arrays;
+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.LocalVariableGen;
+import org.apache.commons.bcel6.generic.MethodGen;
+
import junit.framework.TestCase;
-import org.apache.bcel.Repository;
-import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.classfile.Method;
public class MethodGenTestCase extends TestCase {
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/util/Class2HTMLTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/util/Class2HTMLTestCase.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/util/Class2HTMLTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/util/Class2HTMLTestCase.java Sun Aug 9 21:21:10 2015
@@ -15,13 +15,15 @@
* limitations under the License.
*/
-package org.apache.bcel.util;
+package org.apache.commons.bcel6.util;
import java.io.File;
import java.io.FileInputStream;
+import org.apache.commons.bcel6.classfile.ClassParser;
+import org.apache.commons.bcel6.util.Class2HTML;
+
import junit.framework.TestCase;
-import org.apache.bcel.classfile.ClassParser;
public class Class2HTMLTestCase extends TestCase {
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/util/InstructionFinderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/util/InstructionFinderTest.java?rev=1694911&r1=1694824&r2=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/util/InstructionFinderTest.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/util/InstructionFinderTest.java Sun Aug 9 21:21:10 2015
@@ -16,16 +16,17 @@
*
*/
-package org.apache.bcel.util;
+package org.apache.commons.bcel6.util;
import java.util.Iterator;
-import org.apache.bcel.AbstractTestCase;
-import org.apache.bcel.generic.IADD;
-import org.apache.bcel.generic.ILOAD;
-import org.apache.bcel.generic.ISTORE;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.InstructionList;
+import org.apache.commons.bcel6.AbstractTestCase;
+import org.apache.commons.bcel6.generic.IADD;
+import org.apache.commons.bcel6.generic.ILOAD;
+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.util.InstructionFinder;
public class InstructionFinderTest extends AbstractTestCase {
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/AbstractVerifierTestCase.java (from r1694824, commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java)
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/AbstractVerifierTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/AbstractVerifierTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/AbstractVerifierTestCase.java Sun Aug 9 21:21:10 2015
@@ -16,16 +16,19 @@
*
*/
-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;
+import org.apache.commons.bcel6.verifier.VerificationResult;
+import org.apache.commons.bcel6.verifier.Verifier;
+import org.apache.commons.bcel6.verifier.VerifierFactory;
import junit.framework.TestCase;
public abstract class AbstractVerifierTestCase extends TestCase {
- public static final String TEST_PACKAGE = "org.apache.bcel.verifier.tests.";
+ public static final String TEST_PACKAGE = "org.apache.commons.bcel6.verifier.tests.";
/**
* Asserts that the verification of the given class is OK. If it isn't it throws an AssertionFailedError with the given message.
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/VerifierArrayAccessTestCase.java (from r1694824, commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java)
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/VerifierArrayAccessTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/VerifierArrayAccessTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierArrayAccessTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/VerifierArrayAccessTestCase.java Sun Aug 9 21:21:10 2015
@@ -16,13 +16,13 @@
*
*/
-package org.apache.bcel.verifier;
+package org.apache.commons.bcel6.verifier;
import java.io.IOException;
-import org.apache.bcel.verifier.tests.TestArrayAccess02Creator;
-import org.apache.bcel.verifier.tests.TestArrayAccess03Creator;
-import org.apache.bcel.verifier.tests.TestArrayAccess04Creator;
+import org.apache.commons.bcel6.verifier.tests.TestArrayAccess02Creator;
+import org.apache.commons.bcel6.verifier.tests.TestArrayAccess03Creator;
+import org.apache.commons.bcel6.verifier.tests.TestArrayAccess04Creator;
public class VerifierArrayAccessTestCase extends AbstractVerifierTestCase {
Copied: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/VerifierInvokeTestCase.java (from r1694824, commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierInvokeTestCase.java)
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/VerifierInvokeTestCase.java?p2=commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/VerifierInvokeTestCase.java&p1=commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierInvokeTestCase.java&r1=1694824&r2=1694911&rev=1694911&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/VerifierInvokeTestCase.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/VerifierInvokeTestCase.java Sun Aug 9 21:21:10 2015
@@ -16,7 +16,7 @@
*
*/
-package org.apache.bcel.verifier;
+package org.apache.commons.bcel6.verifier;
public class VerifierInvokeTestCase extends AbstractVerifierTestCase {