Bug 158205 "NullPointerException when weaving with bootstrap agent" (remove use of -Daj5.def)

1 files changed, 41 insertions, 16 deletions

diff --git a/tests/java5/ataspectj/ajc-ant.xml b/tests/java5/ataspectj/ajc-ant.xml
index 12df7d64c..99697cc56 100644
--- a/tests/java5/ataspectj/ajc-ant.xml
+++ b/tests/java5/ataspectj/ajc-ant.xml
@@ -29,28 +29,31 @@
     </target>
 
     <target name="ltw.PerClauseTest">
+        <copy file="ataspectj/aop-perclausetest.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"/>
         <java fork="yes" classname="ataspectj.PerClauseTest" failonerror="yes">
             <classpath refid="aj.path"/>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/aop-perclausetest.xml"/>
 <!--            <jvmarg line="${jdwp}"/>            -->
         </java>
     </target>
 
     <target name="ltw.AroundInlineMungerTest">
+        <copy file="${aj.root}/tests/java5/ataspectj/ataspectj/aop-aroundinlinemungertest.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"/>
         <java fork="yes" classname="ataspectj.AroundInlineMungerTest" failonerror="yes">
             <classpath refid="aj.path"/>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/aop-aroundinlinemungertest.xml"/>
             <!--<jvmarg line="${jdwp}"/>--><!-- uncomment to debug with JDWP -->
         </java>
     </target>
 
     <target name="ltw.AroundInlineMungerTest2">
+        <copy file="${aj.root}/tests/java5/ataspectj/ataspectj/aop-aroundinlinemungertest2.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"/>
         <java fork="yes" classname="ataspectj.AroundInlineMungerTest2" failonerror="yes">
             <classpath refid="aj.path"/>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/aop-aroundinlinemungertest2.xml"/>
         </java>
     </target>
 
@@ -58,15 +61,15 @@
         <java fork="yes" classname="ataspectj.DumpTest" failonerror="yes">
             <classpath refid="aj.path"/>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/aop-dump.xml"/>
         </java>
     </target>
 
     <target name="ltw.DumpProxyTest">
+        <copy file="ataspectj/aop-dumpproxy.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"/>
         <java fork="yes" classname="ataspectj.TestProxyGenerator" failonerror="yes">
             <classpath refid="aj.path"/>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/aop-dumpproxy.xml"/>
         </java>
     </target>
 
@@ -78,13 +81,14 @@
             debug="true">
         </javac>
         <delete dir="${aj.sandbox}" includes="**/Aspect1.class, **/Main.class"/>
+        <copy file="ataspectj/ltwreweavable/aop-ltwreweavable.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"/>
         <java fork="yes" classname="ataspectj.ltwreweavable.Main" failonerror="yes">
             <classpath refid="aj.path"/>
             <classpath>
                 <pathelement path="${aj.sandbox}/main1.jar"/>
             </classpath>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/ltwreweavable/aop-ltwreweavable.xml"/>
         </java>
     </target>
 
@@ -94,20 +98,29 @@
             includes="ataspectj/ltwlog/*"
             debug="true">
         </javac>
+        <copy file="ataspectj/ltwlog/aop-silent.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"
+        	  overwrite="yes"	
+        />
         <java fork="yes" classname="ataspectj.ltwlog.MainSilent" failonerror="yes">
             <classpath refid="aj.path"/>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/ltwlog/aop-silent.xml"/>
         </java>
+        <copy file="ataspectj/ltwlog/aop-verbsoe.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"
+        	  overwrite="yes"	
+        />
         <java fork="yes" classname="ataspectj.ltwlog.MainVerbose" failonerror="yes">
             <classpath refid="aj.path"/>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/ltwlog/aop-verbose.xml"/>
         </java>
+        <copy file="ataspectj/ltwlog/aop-verboseandshow.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"
+		  	  overwrite="yes"	
+		/>
         <java fork="yes" classname="ataspectj.ltwlog.MainVerboseAndShow" failonerror="yes">
             <classpath refid="aj.path"/>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/ltwlog/aop-verboseandshow.xml"/>
         </java>
     </target>
 
@@ -121,30 +134,38 @@
                 <pathelement path="${aj.root}/lib/asm/asm-2.0.jar"/>
             </classpath>
         </javac>
+        <copy file="ataspectj/aop-unweavabletest.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"/>
         <java fork="yes" classname="ataspectj.UnweavableTest" failonerror="yes">
             <classpath>
                 <path refid="aj.path"/>
                 <pathelement path="${aj.root}/lib/asm/asm-2.0.jar"/>
             </classpath>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/aop-unweavabletest.xml"/>
         </java>
     </target>
 
     <target name="ltw.Decp">
+        <copy file="ataspectj/aop-decptest.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"
+        	  overwrite="yes"	
+        />
         <java fork="yes" classname="ataspectj.DeclareParentsInterfaceTest" failonerror="yes">
             <classpath>
                 <path refid="aj.path"/>
             </classpath>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/aop-decptest.xml"/>
         </java>
-        <java fork="yes" classname="ataspectj.DeclareParentsImplementsTest" failonerror="yes">
+
+        <copy file="ataspectj/aop-decptest.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"
+        	  overwrite="yes"	
+        />
+    	<java fork="yes" classname="ataspectj.DeclareParentsImplementsTest" failonerror="yes">
             <classpath>
                 <path refid="aj.path"/>
             </classpath>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/aop-decptest.xml"/>
         </java>
     </target>
 
@@ -159,12 +180,13 @@
             </classpath>
         </javac>
 
+        <copy file="ataspectj/aop-decptest2.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"/>
         <java fork="yes" classname="ataspectj.DeclareParentsImplementsReweavableTest" failonerror="yes">
             <classpath>
                 <path refid="aj.path"/>
             </classpath>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/aop-decptest2.xml"/>
         </java>
     </target>
 
@@ -173,23 +195,26 @@
         If they are not declared, then they will be lost during reweaving-->
 
         <!--First test that the error is produced if the declaration is not made-->
+        <copy file="ataspectj/ltwreweavable/aop-ltwreweavable-declared.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"/>
         <java fork="yes" classname="ataspectj.ltwreweavable.MainReweavableLogging" failonerror="yes">
             <classpath refid="aj.path"/>
             <classpath>
                 <pathelement path="${aj.sandbox}/main1.jar"/>
             </classpath>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/ltwreweavable/aop-ltwreweavable-declared.xml"/>
             <jvmarg value="-DaspectDeclared=true"/>
         </java>
         <!--Now ensure that the error is not produced when the declaration is made.-->
+        <copy file="ataspectj/ltwreweavable/aop-ltwreweavable-omitted.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"
+        	  overwrite="yes"/>
         <java fork="yes" classname="ataspectj.ltwreweavable.MainReweavableLogging" failonerror="yes">
             <classpath refid="aj.path"/>
             <classpath>
                 <pathelement path="${aj.sandbox}/main1.jar"/>
             </classpath>
             <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
-            <jvmarg value="-Daj5.def=ataspectj/ltwreweavable/aop-ltwreweavable-omitted.xml"/>
             <jvmarg value="-DaspectDeclared=false"/>
         </java>
     </target>