From fe3e4e542930d7ea4b516823c4258ca7df782c6d Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Thu, 7 Jan 2010 03:27:33 +0000
Subject: [PATCH] remove aspectjrt dependency

---
 loadtime/.classpath                           |   1 -
 loadtime/testdata/anaspect.jar                | Bin 0 -> 992 bytes
 .../ClassLoaderWeavingAdaptorTest.java        |  30 ++++++++++--------
 3 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 loadtime/testdata/anaspect.jar

diff --git a/loadtime/.classpath b/loadtime/.classpath
index c4d795a66..2d821b9df 100644
--- a/loadtime/.classpath
+++ b/loadtime/.classpath
@@ -14,6 +14,5 @@
 	<classpathentry kind="lib" path="/lib/bcel/bcel.jar" sourcepath="/lib/bcel/bcel-src.zip"/>
 	<classpathentry kind="lib" path="/lib/ext/jrockit/jrockit.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.aspectj.matcher"/>
-	<classpathentry kind="lib" path="/lib/aspectj/lib/aspectjrt.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/loadtime/testdata/anaspect.jar b/loadtime/testdata/anaspect.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5fae3393aedfd4b37f976c628f0d5261c2910f4e
GIT binary patch
literal 992
zcmWIWW@Zs#-~d9gCN&!dB*4wU!r++aSX_{rT%wnl_3sn|gSLk6sgpio9y)p+zIuTL
zXNp@4R%KW2WC-wP=XmDj`&I&|T^fi3;D*Ye8OjHgg&UfjlUQ7QH#pW`*ippx^80C`
zTJlU?9Z^d|a-B^kaTu=bRXMgy!aK{r_e_cPrM0QsZ_Z`<Cs5z4Z^L1epmNdN_mA?v
zU))!$F9&r`doh{+opbuLGkc%UtA6+8^Y-%hjAxXE+xitJZQUFfJj1Am!FkU)^U7rh
z-+n#gwbW1Ju*Uk?oTs-vG1@Mr8~&u?v@lQd&-n{in_j>9Xlh$T%8Y=Az7NH8tM@7{
zNw(i$dop)&P}0xEQ6l1zM$%nh^_uN1!;?6k%vsgZ_;5<2;}Hoq)5(ud&f)916ne)&
zV4*>qq}#74=@O@+w`puK(>fHJt9-cf_>*3ta^2E*4GUFct=R03@%F6DVvO8uGwJBo
z15=;#xD~An|FGrpy5+aGfBiD;!R$l6>93DY-?oM`bEen5O6EkDLpu%_cwe09R}!6i
zFf;gWaa7sYf7>)?T`GFRQDf-ycv4W|OvR~hHg463H7eY={^F^P8NJoHes3QJr{1%;
z8B-FqPIH>>)t3hX*)!wPXVl!;v~;VY*R*s&?`zv+Pfq1|Wi#==uhIK^>ATF%eA)Q0
zGtTSKSB)vFz7(%oyg9xqI{)0pr8lPi?ad3<m?Y8IeP!AFxDEPp!Rr}2{Iza#a$d?8
zIn~B!6}x=u#jHK8AEhR?udL;Hn{~uLa(Sk?)9(pxAx|RAjW3_%S;kk87C!aR3Z<;(
z85fRLO<p|XNMx54`&Z2_R+cYyHT=Qz1?-P}x%J_UTpM4(M`p)-lT7`iE8HAHIAbi`
zrd|?s==o%)Byr>8`#Dp5`!2*kkN9SK*6X+PhONvocaL9r*Ll==#_I)|QR$|$RJg8I
zdu-g$61c)fDce)y_r0G5&3%zNBJZYbm-*g${mHTqr{;2=yI)tf`A$Ja=-%C%MCPq2
zI(gdme2_N7&*{s~USAZ({moUjcKyGqTidNn)O~l?AFiMAYrW?2_yhlqz9y7k+I#uG
zd+>ioP}&!q!tm?>69Yp(8z}8FGKnxCvJ`T@0A(pu0M84M42G;3ly#5|24x)t2n90X
Yn!y<<z?&6lJp%(15LN=|KxPmR03xNCi~s-t

literal 0
HcmV?d00001

diff --git a/loadtime/testsrc/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java b/loadtime/testsrc/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java
index d222d0140..9565e8ce1 100644
--- a/loadtime/testsrc/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java
+++ b/loadtime/testsrc/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptorTest.java
@@ -23,7 +23,6 @@ import junit.framework.TestCase;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.util.ClassPath;
 import org.aspectj.apache.bcel.util.SyntheticRepository;
-import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.weaver.World;
 import org.aspectj.weaver.World.TypeMap;
 import org.aspectj.weaver.bcel.BcelWorld;
@@ -466,7 +465,8 @@ public class ClassLoaderWeavingAdaptorTest extends TestCase {
 	// }
 
 	public void testAcceptanceSpeedStarDotDotStar() throws Exception {
-		URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL() }, null);
+		URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL(),
+				new File("../loadtime/testdata/anaspect.jar").toURI().toURL() }, null);
 
 		JavaClass jc = getClassFrom("../loadtime/bin", "org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOne");
 		byte[] bs = jc.getBytes();
@@ -477,7 +477,7 @@ public class ClassLoaderWeavingAdaptorTest extends TestCase {
 		TestWeavingContext wc = new TestWeavingContext(loader);
 		Definition d = new Definition();
 		d.getExcludePatterns().add("*..*CGLIB*");
-		d.getAspectClassNames().add("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$AnAspect");
+		d.getAspectClassNames().add("AnAspect");
 		wc.addDefinition(d);
 		ClassLoaderWeavingAdaptor adaptor = new ClassLoaderWeavingAdaptor();
 		adaptor.initialize(loader, wc);
@@ -516,7 +516,8 @@ public class ClassLoaderWeavingAdaptorTest extends TestCase {
 	// excludes="!xxxx" should also be fast matched...
 
 	public void testAcceptanceSpeedExactName() throws Exception {
-		URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL() }, null);
+		URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL(),
+				new File("../loadtime/testdata/anaspect.jar").toURI().toURL() }, null);
 
 		JavaClass jc = getClassFrom("../loadtime/bin", "org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOne");
 		byte[] bs = jc.getBytes();
@@ -527,7 +528,7 @@ public class ClassLoaderWeavingAdaptorTest extends TestCase {
 		TestWeavingContext wc = new TestWeavingContext(loader);
 		Definition d = new Definition();
 		d.getExcludePatterns().add("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest.TestOneCGLIB");
-		d.getAspectClassNames().add("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$AnAspect");
+		d.getAspectClassNames().add("AnAspect");
 		wc.addDefinition(d);
 		TestClassLoaderWeavingAdaptor adaptor = new TestClassLoaderWeavingAdaptor();
 		adaptor.initialize(loader, wc);
@@ -580,11 +581,12 @@ public class ClassLoaderWeavingAdaptorTest extends TestCase {
 
 	public TestClassLoaderWeavingAdaptor getAdaptor(Definition... definitions) {
 		try {
-			URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL() }, null);
+			URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL(),
+					new File("../loadtime/testdata/anaspect.jar").toURI().toURL() }, null);
 			TestWeavingContext wc = new TestWeavingContext(loader);
 			for (Definition definition : definitions) {
 				// need some random aspect or the weaver will shut down!
-				definition.getAspectClassNames().add("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$AnAspect");
+				definition.getAspectClassNames().add("AnAspect");
 				wc.addDefinition(definition);
 			}
 			TestClassLoaderWeavingAdaptor adaptor = new TestClassLoaderWeavingAdaptor();
@@ -597,7 +599,8 @@ public class ClassLoaderWeavingAdaptorTest extends TestCase {
 
 	public TestClassLoaderWeavingAdaptor getAdaptor(String[] includePatterns, String[] excludePatterns) {
 		try {
-			URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL() }, null);
+			URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL(),
+					new File("../loadtime/testdata/anaspect.jar").toURI().toURL() }, null);
 			TestWeavingContext wc = new TestWeavingContext(loader);
 			Definition d = new Definition();
 			if (includePatterns != null) {
@@ -611,7 +614,7 @@ public class ClassLoaderWeavingAdaptorTest extends TestCase {
 				}
 			}
 			// need some random aspect or the weaver will shut down!
-			d.getAspectClassNames().add("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$AnAspect");
+			d.getAspectClassNames().add("AnAspect");
 			wc.addDefinition(d);
 			TestClassLoaderWeavingAdaptor adaptor = new TestClassLoaderWeavingAdaptor();
 			adaptor.initialize(loader, wc);
@@ -661,10 +664,11 @@ public class ClassLoaderWeavingAdaptorTest extends TestCase {
 		return SyntheticRepository.getInstance(cp);
 	}
 
-	@Aspect
-	static class AnAspect {
-
-	}
+	//
+	// @Aspect
+	// static class AnAspect {
+	//
+	// }
 
 	class TestOne {
 
-- 
2.39.5