moved testingutil to avoid duplicate class

more build.xml in testing-* modules

ajde/build.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<project name="ajde" default="all" basedir=".">
+
+    <import file="../build-common.xml"/>
+    <import file="../runtime/build.xml"/>
+    <import file="../org.aspectj.ajdt.core/build.xml"/>
+
+    <path id="ajde.test.src.path">
+        <path refid="ajde.src.path"/>
+        <pathelement path="../org.aspectj.ajdt.core/bintest"/>
+        <pathelement path="../weaver/bin"/>
+        <pathelement path="../runtime/bin"/>
+        <fileset dir="${basedir}/../lib">
+            <include name="bcel/*.jar"/>
+            <include name="junit/*.jar"/>
+        </fileset>
+    </path>
+
+    <path id="ajde.src.path">
+        <fileset dir="${basedir}/../org.eclipse.jdt.core">
+            <include name="*.jar"/>
+        </fileset>
+        <pathelement path="../asm/bin"/>
+        <pathelement path="../bridge/bin"/>
+        <pathelement path="../org.aspectj.ajdt.core/bin"/>
+        <pathelement path="../util/bin"/>
+    </path>
+
+    <target name="compile" depends="init,
+                                    asm.compile,
+                                    bridge.compile,
+                                    org.aspectj.ajdt.core.compile,
+                                    util.compile">
+        <srccompile project="ajde" path="ajde.src.path"/>
+        <!-- copy resources -->
+        <copy todir="../ajde/bin">
+            <fileset dir="../ajde/src" includes="**/*.gif"/>
+        </copy>
+    </target>
+
+    <target name="test:compile" depends="compile,
+                                         org.aspectj.ajdt.core.test:compile,
+                                         weaver.test:compile">
+        <testcompile project="ajde" path="ajde.test.src.path"/>
+    </target>
+
+    <target name="test" depends="test:compile,
+                                 runtime.compile">
+        <testrun project="ajde" path="ajde.test.src.path" suite="AjdeModuleTests"/>
+    </target>
+
+</project>
+

asm/build.xml

@@ -2,7 +2,7 @@
 <project name="asm" default="all" basedir=".">
 
     <import file="../build-common.xml"/>
-    <import file="../bridge/build.xml"/>
+    <import file="../bridge/build.xml"/> 
 
     <path id="asm.test.src.path">
         <fileset dir="${basedir}/../lib">
@@ -15,8 +15,8 @@
         <pathelement path="../bridge/bin"/>
     </path>
 
-    <target name="compile" depends="init">
-        <antcall target="bridge.compile"/>
+    <target name="compile" depends="init,
+                                    bridge.compile">
         <srccompile project="asm" path="asm.src.path"/>
     </target>
 

aspectj5rt/build.xml

@@ -15,8 +15,8 @@
         <pathelement path="../runtime/bin"/>
     </path>
 
-    <target name="compile" depends="init" if="jdk15">
-        <antcall target="runtime.compile"/>
+    <target name="compile" if="jdk15" depends="init,
+                                               runtime.compile">
         <!-- FIXME: we override compile due to use of java5-src instead of src.. and source/target attrs -->
         <mkdir dir="${basedir}/bin"/>
         <javac debug="on" destdir="${basedir}/bin" source="1.5" target="1.5">

bridge/build.xml

@@ -2,7 +2,7 @@
 <project name="bridge" default="all" basedir=".">
 
     <import file="../build-common.xml"/>
-    <import file="../util/build.xml"/>
+    <import file="../util/build.xml"/> 
 
     <path id="bridge.test.src.path">
         <fileset dir="${basedir}/../lib">
@@ -15,8 +15,8 @@
         <pathelement path="../util/bin"/>
     </path>
 
-    <target name="compile" depends="init">
-        <antcall target="util.compile"/>
+    <target name="compile" depends="init,
+                                    util.compile">
         <srccompile project="bridge" path="bridge.src.path"/>
     </target>
 

build-common.xml

@@ -12,9 +12,7 @@
         <property name="test.build.dir" value="bintest"/>
     </target>
 
-    <target name="clean" depends="init">
-        <delete dir="${build.dir}"/>
-        <delete dir="${test.build.dir}"/>
+    <target name="clean" depends="init, cleanall">
         <mkdir dir="${build.dir}"/>
         <mkdir dir="${test.build.dir}"/>
     </target>
@@ -22,6 +20,10 @@
     <target name="cleanall" depends="init">
         <delete dir="${build.dir}"/>
         <delete dir="${test.build.dir}"/>
+        <!-- rather common to have ajcore files produced after a test run -->
+        <delete>
+            <fileset dir="${basedir}" includes="ajcore.*.txt"/>
+        </delete>
     </target>
 
     <macrodef name="srccompile">
@@ -56,8 +58,8 @@
         <attribute name="path"/>
         <attribute name="suite"/>
         <sequential>
-            <!--   showoutput="true" -->
-            <junit fork="on" haltonfailure="on" haltonerror="on" printsummary="on">
+            <!--   showoutput="on" -->
+            <junit showoutput="on" fork="on" haltonfailure="on" haltonerror="on" printsummary="on">
                 <classpath>
                     <pathelement path="../@{project}/${build.dir}"/>
                     <pathelement path="../@{project}/${test.build.dir}"/>

build.xml

@@ -14,7 +14,13 @@
                                  bcel-builder/build.xml,
                                  testing-util/build.xml,
                                  asm/build.xml,
-                                 weaver/build.xml"/>
+                                 weaver/build.xml,
+                                 org.aspectj.ajdt.core/build.xml,
+                                 ajde/build.xml,
+                                 testing-client/build.xml,
+                                 taskdefs/build.xml,
+                                 testing/build.xml,
+                                 testing-drivers/build.xml"/>
             </subant>
         </sequential>
     </macrodef>

org.aspectj.ajdt.core/build.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<project name="org.aspectj.ajdt.core" default="all" basedir=".">
+
+    <import file="../build-common.xml"/>
+    <import file="../runtime/build.xml"/>
+    <import file="../asm/build.xml"/>
+    <import file="../bridge/build.xml"/>
+    <import file="../util/build.xml"/>
+    <import file="../weaver/build.xml"/>
+    <import file="../testing-util/build.xml"/>
+
+    <path id="org.aspectj.ajdt.core.test.src.path">
+        <path refid="org.aspectj.ajdt.core.src.path"/>
+        <pathelement path="../testing-util/bin"/>
+        <pathelement path="../weaver/bintest"/>
+        <fileset dir="${basedir}/../lib">
+            <include name="junit/*.jar"/>
+            <include name="jdiff/*.jar"/>
+        </fileset>
+    </path>
+
+    <path id="org.aspectj.ajdt.core.src.path">
+        <fileset dir="${basedir}/../org.eclipse.jdt.core">
+            <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${basedir}/../lib">
+            <include name="bcel/*.jar"/>
+        </fileset>
+        <pathelement path="../asm/bin"/>
+        <pathelement path="../bridge/bin"/>
+        <pathelement path="../runtime/bin"/>
+        <pathelement path="../util/bin"/>
+        <pathelement path="../weaver/bin"/>
+    </path>
+
+    <target name="compile" depends="init,
+                                    asm.compile,
+                                    bridge.compile,
+                                    runtime.compile,
+                                    util.compile,
+                                    weaver.compile">
+        <srccompile project="org.aspectj.ajdt.core" path="org.aspectj.ajdt.core.src.path"/>
+        <!-- copy resources -->
+        <copy todir="../org.aspectj.ajdt.core/bin">
+            <fileset dir="../org.aspectj.ajdt.core/src" includes="**/*.properties"/>
+        </copy>
+    </target>
+
+    <target name="test:compile" depends="compile,
+                                         testing-util.compile,
+                                         weaver.test:compile">
+        <testcompile project="org.aspectj.ajdt.core" path="org.aspectj.ajdt.core.test.src.path"/>
+    </target>
+
+    <target name="test" depends="test:compile">
+        <testrun project="org.aspectj.ajdt.core" path="org.aspectj.ajdt.core.test.src.path" suite="EajcModuleTests"/>
+    </target>
+
+</project>
+

org.aspectj.ajdt.core/testsrc/AroundAMain.java

@@ -15,6 +15,7 @@ import junit.framework.TestCase;
 import org.aspectj.runtime.internal.AroundClosure;
 import org.aspectj.util.Reflection;
 
+// FIXME: who is using this class ?
 public class AroundAMain extends TestCase {
 
 	public AroundAMain(String name) {

org.aspectj.ajdt.core/testsrc/RunWeaveTests.java

@@ -19,6 +19,8 @@ import java.util.List;
 import java.util.StringTokenizer;
 
 /**
+ * FIXME: who is using this class ?
+ * 
  * @author Noel Markham
  */
 public class RunWeaveTests {

org.aspectj.ajdt.core/testsrc/WeaveTests.java

@@ -17,6 +17,8 @@ import java.io.IOException;
 
 
 /**
+ * FIXME: who is using this class ?
+ * 
  * @author Noel Markham
  */
 public class WeaveTests {

org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/CompilerDumpTestCase.java

@@ -16,6 +16,7 @@ import org.aspectj.bridge.IMessage;
 import org.aspectj.tools.ajc.AjcTestCase;
 import org.aspectj.tools.ajc.CompilationResult;
 import org.aspectj.weaver.Dump;
+import org.aspectj.weaver.DumpTestCase;
 
 public class CompilerDumpTestCase extends AjcTestCase {
 
@@ -76,8 +77,7 @@ public class CompilerDumpTestCase extends AjcTestCase {
 		CompilationResult result = ajc(baseDir,args);
 		String fileName = Dump.dump("DumpTestCase.testDumpWithWarnings()");
 		dumpFile = new File(fileName);
-		// ALEX Andy. Alex commented out this line?
-		org.aspectj.weaver.DumpTestCase.assertContents(dumpFile,"Compiler Messages","warning");
+		DumpTestCase.assertContents(dumpFile,"Compiler Messages","warning");
 	}
 	
 	/**
@@ -96,8 +96,7 @@ public class CompilerDumpTestCase extends AjcTestCase {
 		String fileName = Dump.getLastDumpFileName();
 		assertTrue("Dump file should be created",!fileName.equals(previousFileName));
 		dumpFile = new File(fileName);
-		//ALEX Andy. Alex commented out this line?
-		org.aspectj.weaver.DumpTestCase.assertContents(dumpFile,"Compiler Messages","error");
+		DumpTestCase.assertContents(dumpFile,"Compiler Messages","error");
 	}
 
 }

taskdefs/build.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<project name="taskdefs" default="all" basedir=".">
+
+    <import file="../build-common.xml"/>
+    <import file="../bridge/build.xml"/>
+    <import file="../org.aspectj.ajdt.core/build.xml"/>
+
+    <path id="taskdefs.test.src.path">
+        <path refid="taskdefs.src.path"/>
+        <fileset dir="${basedir}/../lib">
+            <include name="junit/*.jar"/>
+        </fileset>
+        <!-- below: needed for test run but not test:compile -->
+        <pathelement path="../weaver/bin"/>
+        <pathelement path="../asm/bin"/>
+        <pathelement path="../runtime/bin"/>
+        <fileset dir="${basedir}/../org.eclipse.jdt.core">
+            <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${basedir}/../lib">
+            <include name="bcel/*.jar"/>
+        </fileset>
+    </path>
+
+    <path id="taskdefs.src.path">
+        <pathelement path="../bridge/bin"/>
+        <pathelement path="../org.aspectj.ajdt.core/bin"/>
+        <pathelement path="../util/bin"/>
+    </path>
+
+    <target name="compile" depends="init,
+                                    bridge.compile,
+                                    org.aspectj.ajdt.core.compile,
+                                    util.compile">
+        <srccompile project="taskdefs" path="taskdefs.src.path"/>
+    </target>
+
+    <target name="test:compile" depends="compile">
+        <testcompile project="taskdefs" path="taskdefs.test.src.path"/>
+    </target>
+
+    <target name="test" depends="test:compile,
+                                 asm.compile,
+                                 org.aspectj.ajdt.core.compile,
+                                 runtime.compile,
+                                 weaver.compile">
+        <testrun project="taskdefs" path="taskdefs.test.src.path" suite="TaskdefsModuleTests"/>
+    </target>
+
+
+</project>
+

testing-client/build.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<project name="testing-client" default="all" basedir=".">
+
+    <import file="../build-common.xml"/>
+    <import file="../bridge/build.xml"/>
+
+    <path id="testing-client.test.src.path">
+        <fileset dir="${basedir}/../lib">
+            <include name="junit/*.jar"/>
+        </fileset>
+        <path refid="testing-client.src.path"/>
+    </path>
+
+    <path id="testing-client.src.path">
+        <pathelement path="../bridge/bin"/>
+        <pathelement path="../util/bin"/>
+    </path>
+
+    <target name="compile" depends="init,
+                                    bridge.compile,
+                                    util.compile">
+        <srccompile project="testing-client" path="testing-client.src.path"/>
+    </target>
+
+    <target name="test:compile" depends="compile">
+        <testcompile project="testing-client" path="testing-client.test.src.path"/>
+    </target>
+
+    <target name="test" depends="test:compile">
+        <testrun project="testing-client" path="testing-client.test.src.path" suite="TestingClientModuleTests"/>
+    </target>
+
+
+</project>
+

testing-drivers/build.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<project name="testing-drivers" default="all" basedir=".">
+
+    <import file="../build-common.xml"/>
+    <import file="../ajde/build.xml"/>
+    <import file="../bridge/build.xml"/>
+    <import file="../taskdefs/build.xml"/>
+    <import file="../testing/build.xml"/>
+
+    <path id="testing-drivers.test.src.path">
+        <path refid="testing-drivers.src.path"/>
+        <fileset dir="${basedir}/../lib">
+            <include name="junit/*.jar"/>
+            <include name="commons/*.jar"/>
+        </fileset>
+        <!-- test run -->
+        <pathelement path="../ajde/bin"/>
+        <pathelement path="../asm/bin"/>
+        <pathelement path="../org.aspectj.ajdt.core/bin"/>
+        <pathelement path="../runtime/bin"/>
+        <pathelement path="../taskdefs/bin"/>
+        <pathelement path="../weaver/bin"/>
+        <fileset dir="${basedir}/../org.eclipse.jdt.core">
+            <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${basedir}/../lib">
+            <include name="bcel/*.jar"/>
+        </fileset>
+    </path>
+
+    <path id="testing-drivers.src.path">
+        <pathelement path="../bridge/bin"/>
+        <pathelement path="../testing/bin"/>
+        <pathelement path="../util/bin"/>
+    </path>
+
+    <target name="compile" depends="init,
+                                    bridge.compile,
+                                    testing.compile,
+                                    util.compile">
+        <srccompile project="testing-drivers" path="testing-drivers.src.path"/>
+    </target>
+
+    <target name="test:compile" depends="compile">
+        <testcompile project="testing-drivers" path="testing-drivers.test.src.path"/>
+    </target>
+
+    <target name="test" depends="test:compile,
+                                 ajde.compile,
+                                 asm.compile,
+                                 org.aspectj.ajdt.core.compile,
+                                 runtime.compile,
+                                 taskdefs.compile,
+                                 weaver.compile">
+        <testrun project="testing-drivers" path="testing-drivers.test.src.path" suite="TestingDriversModuleTests"/>
+    </target>
+
+
+</project>
+

testing-drivers/testsrc/org/aspectj/testing/drivers/DriversTests.java

@@ -24,8 +24,8 @@ public class DriversTests extends TestCase {
         TestSuite suite = new TestSuite(DriversTests.class.getName());
         // AjcTestsUsingJUnit takes too long to include by default
         //$JUnit-BEGIN$
-        suite.addTestSuite(HarnessSelectionTest.class); 
-        suite.addTest(AjcHarnessTestsUsingJUnit.suite()); 
+        suite.addTestSuite(HarnessSelectionTest.class);
+        suite.addTest(AjcHarnessTestsUsingJUnit.suite());
         //$JUnit-END$
         return suite;
     }

testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java

@@ -55,8 +55,8 @@ public class HarnessSelectionTest extends TestCase {
     private static final String TITLE_LIST_PLURAL 
         = INC_HARNESS_DIR + "/titleListPlural.txt";
     
-    private static Hashtable SPECS = new Hashtable();    
-    
+    private static Hashtable SPECS = new Hashtable();
+
     private static AjcTest.Suite.Spec getSpec(String suiteFile) {
         AjcTest.Suite.Spec result = (AjcTest.Suite.Spec) SPECS.get(suiteFile);
         if (null == result) {
@@ -75,11 +75,12 @@ public class HarnessSelectionTest extends TestCase {
             return null; // keep compiler happy
         }
     }
-    
-    private boolean verbose;
+
+    //FIXME: change to true to debug the test failure. Should be easier to configure
+    private boolean verbose = false;
 
 	public HarnessSelectionTest(String name) {
-		super(name);
+        super(name);
 	}
     
     public void testFilesAvailable() {

testing-util/build.xml

@@ -20,9 +20,9 @@
         <pathelement path="../util/bin"/>
     </path>
 
-    <target name="compile" depends="init">
-        <antcall target="bridge.compile"/>
-        <antcall target="util.compile"/>
+    <target name="compile" depends="init,
+                                    bridge.compile,
+                                    util.compile">
         <srccompile project="testing-util" path="testing-util.src.path"/>
     </target>
 

testing-util/testsrc/TestingUtilModuleTests.java

@@ -14,7 +14,7 @@
 
 // default package
 
-import org.aspectj.testing.util.UtilTests;
+import org.aspectj.testingutil.UtilTests;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

testing/build.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<project name="testing" default="all" basedir=".">
+
+    <import file="../build-common.xml"/>
+    <import file="../ajde/build.xml"/>
+    <import file="../bridge/build.xml"/>
+    <import file="../taskdefs/build.xml"/>
+
+    <path id="testing.test.src.path">
+        <path refid="testing.src.path"/>
+        <fileset dir="${basedir}/../lib">
+            <include name="junit/*.jar"/>
+        </fileset>
+        <!-- for test run -->
+        <pathelement path="../org.aspectj.ajdt.core/bin"/>
+        <pathelement path="../weaver/bin"/>
+        <pathelement path="../runtime/bin"/>
+        <fileset dir="${basedir}/../org.eclipse.jdt.core">
+            <include name="*.jar"/>
+        </fileset>
+        <fileset dir="${basedir}/../lib">
+            <include name="bcel/*.jar"/>
+        </fileset>
+    </path>
+
+    <path id="testing.src.path">
+        <pathelement path="../ajde/bin"/>
+        <pathelement path="../asm/bin"/>
+        <pathelement path="../bridge/bin"/>
+        <pathelement path="../taskdefs/bin"/>
+        <pathelement path="../testing-util/bin"/>
+        <pathelement path="../util/bin"/>
+        <fileset dir="${basedir}/../lib">
+            <include name="commons/*.jar"/>
+        </fileset>
+        <!-- for newsrc -->
+        <pathelement path="../org.aspectj.ajdt.core/bintest"/>
+    </path>
+
+    <target name="compile" depends="init,
+                                    ajde.compile,
+                                    asm.compile,
+                                    bridge.compile,
+                                    taskdefs.compile,
+                                    testing-util.compile,
+                                    util.compile">
+        <srccompile project="testing" path="testing.src.path"/>
+        <!-- TODO : what for ?? compile newsrc... (Alex don't know what for ... ) -->
+        <!-- TODO: + leads to circular deps since reli on ajdt testsrc (*test*src !!) -->
+<!--        <javac debug="on" destdir="../testing/bin" source="1.2" target="1.1">-->
+<!--            <src path="../testing/newsrc"/>-->
+<!--            <classpath refid="testing.src.path"/>-->
+<!--        </javac>-->
+    </target>
+
+    <target name="test:compile" depends="compile">
+        <testcompile project="testing" path="testing.test.src.path"/>
+    </target>
+
+    <target name="test" depends="test:compile,
+                                 org.aspectj.ajdt.core.compile,
+                                 weaver.compile,
+                                 runtime.compile">
+        <testrun project="testing" path="testing.test.src.path" suite="TestingModuleTests"/>
+    </target>
+
+</project>
+

testing/testsrc/TestingModuleTests.java

@@ -20,13 +20,13 @@ import junit.framework.TestSuite;
 
 public class TestingModuleTests extends TestCase {
 
-    public static Test suite() { 
+    public static Test suite() {
         TestSuite suite = new TestSuite(TestingModuleTests.class.getName());
-        suite.addTest(org.aspectj.testing.harness.bridge.TestingBridgeTests.suite()); 
-        suite.addTest(org.aspectj.testing.taskdefs.TaskdefTests.suite()); 
-        suite.addTest(org.aspectj.testing.util.UtilTests.suite()); 
-        suite.addTest(org.aspectj.testing.util.options.OptionsTests.suite()); 
-        suite.addTest(org.aspectj.testing.xml.TestingXmlTests.suite()); 
+        suite.addTest(org.aspectj.testing.harness.bridge.TestingBridgeTests.suite());
+        suite.addTest(org.aspectj.testing.taskdefs.TaskdefTests.suite());
+        suite.addTest(org.aspectj.testing.util.UtilTests.suite());
+        suite.addTest(org.aspectj.testing.util.options.OptionsTests.suite());
+        suite.addTest(org.aspectj.testing.xml.TestingXmlTests.suite());
         return suite;
     }
 

testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java

@@ -126,6 +126,15 @@ public class AjcTaskCompileCommandTest extends TestCase {
         AjcTaskCompileCommand command =
             new AjcTaskCompileCommand();
         MessageHandler handler = new MessageHandler();
+        handler.setInterceptor(new IMessageHandler() {
+            public boolean handleMessage(IMessage message) throws AbortException {
+                System.out.println("[message] "+ message);
+                return false;
+            }
+            public boolean isIgnoring(IMessage.Kind kind) {
+                return false;
+            }
+        });
         String[] parms = (String[]) args.toArray(new String[0]);
         boolean result = command.runCommand(parms, handler);
         boolean expectPass = (0 == expectedErrors);

tests/java5/ataspectj/SimpleAfter.java

@@ -13,15 +13,18 @@ public class SimpleAfter {
   public void m() {
   	X.s.append("2");
   }
-}
 
-@Aspect("issingleton")
-class X {
-	
-	public static StringBuffer s = new StringBuffer("");
 
-    @After("execution(* SimpleAfter.m())")
-    public void before() {
-      s.append("a");
+    @Aspect("issingleton")
+    public static class X {
+
+        public static StringBuffer s = new StringBuffer("");
+
+        @After("execution(* SimpleAfter.m())")
+        public void before() {
+          s.append("a");
+        }
     }
+
 }
+

tests/java5/ataspectj/SimpleBefore.java

@@ -13,15 +13,17 @@ public class SimpleBefore {
   public void m() {
   	X.s.append("2");
   }
-}
 
-@Aspect("issingleton")
-class X {
-	
-	public static StringBuffer s = new StringBuffer("");
+    @Aspect("issingleton")
+    public static class X {
+
+        public static StringBuffer s = new StringBuffer("");
 
-    @Before("execution(* SimpleBefore.m())")
-    public void before() {
-      s.append("b");
+        @Before("execution(* SimpleBefore.m())")
+        public void before() {
+          s.append("b");
+        }
     }
+
 }
+

weaver/build.xml

@@ -3,10 +3,9 @@
 
     <import file="../build-common.xml"/>
     <import file="../asm/build.xml"/>
-    <import file="../bridge/build.xml"/>
     <import file="../runtime/build.xml"/>
-    <import file="../testing-util/build.xml"/>
     <import file="../util/build.xml"/>
+    <import file="../testing-util/build.xml"/>
 
     <path id="weaver.test.src.path">
         <pathelement path="../testing-util/bin"/>
@@ -27,20 +26,20 @@
         </fileset>
     </path>
 
-    <target name="compile" depends="init">
-        <antcall target="asm.compile"/>
-        <antcall target="bridge.compile"/>
-        <antcall target="runtime.compile"/>
-        <antcall target="util.compile"/>
+    <target name="compile" depends="init,
+                                    asm.compile,
+                                    bridge.compile,
+                                    runtime.compile,
+                                    util.compile">
         <srccompile project="weaver" path="weaver.src.path"/>
-        <!-- copy properties file for bundles -->
-        <copy todir="${basedir}/bin">
-            <fileset dir="${basedir}/src" includes="**/*.properties"/>
+        <!-- copy resources -->
+        <copy todir="../weaver/bin">
+            <fileset dir="../weaver/src" includes="**/*.properties"/>
         </copy>
     </target>
 
-    <target name="test:compile" depends="compile">
-        <antcall target="testing-util.compile"/>
+    <target name="test:compile" depends="compile,
+                                         testing-util.compile">
         <testcompile project="weaver" path="weaver.test.src.path"/>
     </target>