remove bad _IDE folder instead of bin/ that leads to odd side effects, add tools.jar to tests .classpath module for LTW tests using AntSpec

2 files changed, 5 insertions, 24 deletions

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java
index edfb056f1..9e5f8cc2d 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java
@@ -52,18 +52,11 @@ public class Ajc {
 		".."+File.separator+"lib"+File.separator+"test"+File.separator+"aspectjrt.jar"+ File.pathSeparator+
 		".."+File.separator+"lib"+File.separator+"test"+File.separator+"testing-client.jar" + File.pathSeparator +
 		".."+File.separator+"aspectj5rt"+File.separator+"bin" + File.pathSeparator
-        //Alex: adding "_IDE" since there is no "bin" output when working within IDEA.
-        // my convention is thus to have a "modules/_IDE" folder where IDEA will write
-        // Since modules/* have circular dependancies, there is no way to have multiple "modules"
-        // (like Eclipse projects in one workspace) in IDEA, so all will be build there.
-        // Note: adding it last means that a change in the IDE aspectj5rt module f.e. without
-        // "ant compile" to rebuild "aspect5rt/bin" will not expose the IDE changes...
-        // but I don't want to have it first to avoid side effects when running from Ant.
-        + File.pathSeparator + ".." + File.separator + "_IDE"
         + File.pathSeparator+ ".."+File.separator+"lib"+File.separator+"junit"+File.separator+"junit.jar"
         + File.pathSeparator+ ".."+File.separator+"bridge"+File.separator+"bin" 
         + File.pathSeparator+ ".."+File.separator+"loadtime"+File.separator+"bin" 
 		;
+
 	private CompilationResult result;
 	private File sandbox;
 	private File baseDir;
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
index 0d41d06c0..c4cace3b3 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
@@ -72,23 +72,11 @@ public class AjcTestCase extends TestCase {
 	protected Ajc ajc;
 	
 	public static final String DEFAULT_CLASSPATH_ENTRIES = 
-        File.pathSeparator + 
-		".." + File.separator + "runtime" + File.separator + "bin" + 
-		File.pathSeparator +
-		".." + File.separator + "testing-client" + File.separator + "bin" +
-		File.pathSeparator +
-		".." + File.separator + "bridge" + File.separator + "bin" +
-		File.pathSeparator +
-		".." + File.separator + "util" + File.separator + "bin" +
+        File.pathSeparator + ".." + File.separator + "runtime" + File.separator + "bin" +
+		File.pathSeparator + ".." + File.separator + "testing-client" + File.separator + "bin" +
+		File.pathSeparator + ".." + File.separator + "bridge" + File.separator + "bin" +
+		File.pathSeparator + ".." + File.separator + "util" + File.separator + "bin" +
 		File.pathSeparator + ".." + File.separator + "aspectj5rt" + File.separator + "bin" +
-        //Alex: adding "_IDE" since there is no "bin" output when working within IDEA.
-        // my convention is thus to have a "modules/_IDE" folder where IDEA will write
-        // Since modules/* have circular dependancies, there is no way to have multiple "modules"
-        // (like Eclipse projects in one workspace) in IDEA, so all will be build there.
-        // Note: adding it last means that a change in the IDE aspectj5rt module f.e. without
-        // "ant compile" to rebuild "aspect5rt/bin" will not expose the IDE changes...
-        // but I don't want to have it first to avoid side effects when running from Ant.
-        File.pathSeparator + ".." + File.separator + "_IDE" +
 		File.pathSeparator+ ".."+File.separator+"lib"+File.separator+"junit"+File.separator+"junit.jar"
         + File.pathSeparator+ ".."+File.separator+"loadtime"+File.separator+"bin" 
         ;