Replace path separators ';' by ',' in XML test specs

The goal is for them to be canonicalised to platform standard during
test execution. I am not sure if that will fix any tests, but at least I
hope it will not break any.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

tests/src/test/resources/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml

@@ -141,47 +141,47 @@
         <compile files="Deow.aj" options="-1.5">
         </compile>
         <run class="Deow"/>
-    </ajc-test>          
+    </ajc-test>
 
    <ajc-test dir="java5/ataspectj/annotationGen" title="runtime pointcut resolution referencing compiled pointcuts">
         <compile files="PCLib.aj,RuntimePointcuts.java" options="-1.5">
         </compile>
-        <run class="RuntimePointcuts" classpath=".;../lib/bcel/bcel.jar" ltw=""/>
-    </ajc-test>          
+        <run class="RuntimePointcuts" classpath=".,../lib/bcel/bcel.jar" ltw=""/>
+    </ajc-test>
 
    <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for decp">
         <compile files="DeclareParentsTest.aj" options="-1.5, -outxml">
         </compile>
         <run class="DeclareParentsTest" ltw=""/>
-    </ajc-test>          
-    
+    </ajc-test>
+
       <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for decp 2">
         <compile files="DeclareParentsTestAdvanced.aj" options="-1.5, -outxml">
         </compile>
         <run class="a.b.c.DeclareParentsTestAdvanced" ltw=""/>
     </ajc-test>
-    
+
     <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for decs">
         <compile files="DeclareSoftTest.aj" options="-1.5">
         </compile>
         <run class="DeclareSoftTest"/>
-    </ajc-test>     
-    
+    </ajc-test>
+
     <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for dec precedence">
         <compile files="DeclarePrecedenceTest.aj" options="-1.5">
         </compile>
         <run class="DeclarePrecedenceTest"/>
-    </ajc-test>     
-    
+    </ajc-test>
+
      <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for dec annotation">
         <compile files="DeclareAnnotationTest.aj" options="-1.5">
         </compile>
         <run class="DeclareAnnotationTest"/>
     </ajc-test>
-    
+
     <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for itds">
         <compile files="ITDTest.aj" options="-1.5, -outxml -Xlint:ignore -makeAjReflectable">
         </compile>
         <run class="a.b.c.ITDTest" ltw=""/>
-    </ajc-test>    
-</suite>
+    </ajc-test>
+</suite>

tests/src/test/resources/org/aspectj/systemtest/ajc152/ajc152.xml

@@ -14,7 +14,7 @@
          </stderr>
       </run>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs152/pr122253" title="aspects14 - persingleton">
      <compile files="Singleton.java"/>
      <run class="Singleton">
@@ -43,7 +43,7 @@
        </stderr>
      </run>
     </ajc-test>
-     
+
      <ajc-test dir="bugs152/pr122253" title="aspects14 - perthis">
      <compile files="PerThis.java"/>
      <run class="PerThis">
@@ -60,7 +60,7 @@
        </stderr>
      </run>
     </ajc-test>
-        
+
      <ajc-test dir="bugs152/pr122253" title="aspects14 - pertypewithin">
      <compile files="PerTypeWithin.java"/>
      <run class="PerTypeWithin">
@@ -77,23 +77,23 @@
        </stderr>
      </run>
     </ajc-test>
- 
-    
+
+
 	<ajc-test dir="bugs152/pr148536" title="NPE for unknown annotation">
      <compile files="Bug.java" options="-1.5">
        <message kind="error" line="2" text="SomeAnnotation cannot be resolved to a type"/>
      </compile>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs152/pr148537" title="classcast annotation value">
      <compile files="MyClass.java,MyAspect.java" options="-1.5"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs152/pr148545" title="nosuchmethoderror for privileged aspect">
       <compile files="MyClass.java,MyAspect.java,MyAnnotation.java,MyEnum.java" options="-1.5"/>
       <run class="MyClass"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs152/pr148545" title="nosuchmethoderror for privileged aspect - 2">
       <compile files="MyClass.java,MyAspect2.java,MyAnnotation.java,MyEnum.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="Join point 'method-execution(void MyClass.test())' in Type 'MyClass' (MyClass.java:8) advised by around advice from 'MyAspect2' (MyAspect2.java:5)"/>
@@ -105,12 +105,12 @@
      <compile files="Pair.java" options="-1.5"/>
      <compile files="Test.java" options="-1.5"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs152/pr126355" title="bizarre generic error with itds - 2">
      <compile files="Pair.java" options="-1.5"/>
      <compile files="Test.java" options="-1.5"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs152/pr145950" title="fails to discover Serializable">
      <compile files="Indirect.java" options="-1.5 -XaddSerialVersionUID"/>
      <run class="Indirect">
@@ -124,26 +124,26 @@
      <compile files="TopLevelType.java" options="-1.5"/>
      <run class="TopLevelType"/>
     </ajc-test>
-    
-    
+
+
     <ajc-test dir="bugs152/pr144602" title="atAJ perthis aspect verification error">
      <compile files="MyAspect.aj" options="-1.5"/>
      <run class="MyAspect"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr132349" title="ITD on inner type of generic type - 2">
      <compile files="TopLevelType2.java" options="-1.5">
        <message kind="error" line="12"/> <!-- error message is currently crap - its a parser message -->
      </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr132349" title="ITD on inner type of generic type - 3">
      <compile files="TopLevelType3.java" options="-1.5">
        <message kind="error" line="12" text="Cannot make inter-type declarations on parameterized types"/>
        <message kind="error" line="7" text="The method someMethod() is undefined for the type TopLevelType3.NestedType"/>
      </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr135865" title="misbehaving declare annotation">
       <compile files="B.java,A.java" options="-1.5 -Xlint:ignore">
       	<!--message kind="weave" text="Join point 'method-call(void B.foo())' in Type 'A' (A.java:32) advised by before advice from 'Aspect' (A.java:22) [with runtime test]"/>
@@ -156,7 +156,7 @@
         </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr135865" title="misbehaving declare annotation - 2">
       <compile files="A.java,B.java" options="-1.5 -Xlint:ignore">
       	<!--message kind="weave" text="Join point 'method-call(void B.foo())' in Type 'A' (A.java:32) advised by before advice from 'Aspect' (A.java:22) [with runtime test]"/>
@@ -169,7 +169,7 @@
         </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr129704" title="annotations and generics leading to BCException">
       <compile files="A.java" options="-1.5"/>
       <run class="A">
@@ -178,12 +178,12 @@
         </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr136026" title="verifyerror">
       <compile files="CflowOrder.java" options="-1.5"/>
       <run class="CflowOrder"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr136026" title="verifyerror - 2">
       <compile files="CflowOrderOriginal.java" options="-1.5"/>
       <run class="bugs.CflowOrderOriginal">
@@ -204,42 +204,42 @@
         </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr136258" title="stack overflow">
       <compile files="StatisticsTypeImpl.java" options="-1.5"/>
       <run class="StatisticsTypeImpl"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr138384" title="method too big">
       <compile files="BigMethod.java" options="-1.5"> <!-- will be 67628 bytes in the big method -->
         <message kind="error" line="1" text="problem generating method BigMethod.i_am_a_big_method : Code size too big: 67629"/>
       </compile>
       <!--run class="BigMethod"/-->
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr138798" title="atWithinCodeBug">
       <compile files="ErrorHandling.aj" options="-1.5"/>
       <run class="ErrorHandling">
          <stderr>
            <line text="Caught in foo"/>
          </stderr>
-      </run>      
+      </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr138158" title="not at withincode - 1">
       <compile files="Boo.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="Join point 'method-call(void Boo.m())' in Type 'Boo' (Boo.java:9) advised by before advice from 'X' (Boo.java:19)"/>
       </compile>
       <run class="Boo"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr138158" title="not at within - 3">
       <compile files="Doo.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Soo' (Doo.java:20) advised by before advice from 'X' (Doo.java:25)"/>
       </compile>
       <run class="Doo"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr138158" title="not at withincode - 2">
       <compile files="Foo.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Foo' (Foo.java:14) advised by before advice from 'X' (Foo.java:26)"/>
@@ -247,12 +247,12 @@
       </compile>
       <run class="Foo"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr137568" title="complicated generics declaration">
       <compile files="C.java" options="-emacssym -1.5"/>
       <run class="C"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr138143" title="npe on duplicate method with ataj">
       <compile files="AspectClass.java" options="-1.5">
         <message kind="error" line="7" text="Duplicate method incomingMessage() in type AspectClass"/>
@@ -261,7 +261,7 @@
         <message kind="warning" line="11" text="no match for this type name: Incoming [Xlint:invalidAbsoluteTypeName]"/>
       </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr137496" title="pointcuts and generics - B">
       <compile files="B.java" options="-1.5 -showWeaveInfo">
         <!--message kind="weave" text="Join point 'method-call(java.lang.String C.pm(java.lang.String))' in Type 'B' (B.java:20) advised by before advice from 'X' (B.java:26)"/-->
@@ -275,7 +275,7 @@
         </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr137496" title="pointcuts and generics - D">
       <compile files="D.java" options="-1.5 -showWeaveInfo">
 		<message kind="weave" text="Join point 'method-call(java.lang.String CImpl.pm(java.lang.String))' in Type 'D' (D.java:20) advised by before advice from 'X' (D.java:26)"/>
@@ -290,7 +290,7 @@
         </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr137496" title="pointcuts and generics - E">
       <compile files="E.java" options="-1.5 -showWeaveInfo">
       	<message kind="weave" text="Join point 'method-call(java.lang.Object C.pm(java.lang.Object))' in Type 'E' (E.java:18) advised by before advice from 'X' (E.java:23)"/>
@@ -302,8 +302,8 @@
         </stderr>
       </run>
     </ajc-test>
-    
-    
+
+
     <ajc-test dir="bugs152/pr137496" title="pointcuts and generics - F">
       <compile files="F.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="Join point 'method-call(java.lang.Object C.pm(java.lang.Object))' in Type 'F' (F.java:18) advised by before advice from 'X' (F.java:23)"/>
@@ -315,7 +315,7 @@
         </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr137496" title="pointcuts and generics - G">
       <compile files="G.java" options="-1.5 -showWeaveInfo">
         <message kind="warning" line="23" text="advice defined in X has not been applied [Xlint:adviceDidNotMatch]"/>
@@ -326,7 +326,7 @@
         </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr137496" title="pointcuts and generics - H">
       <compile files="H.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="Join point 'method-call(java.lang.Object C.pm(java.lang.Object))' in Type 'H' (H.java:20) advised by around advice from 'X' (H.java:26)"/>
@@ -337,31 +337,31 @@
         </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/binaryDecp" title="incorrect overrides evaluation - 1.3">
       <compile files="SubClassLoader.java,SubSubClassLoader.java" options="-1.3" outjar="lib.jar"/>
       <compile files="X.aj" inpath="lib.jar" options="-showWeaveInfo">
         <message kind="weave" text="Setting superclass of type 'SubSubClassLoader' (SubSubClassLoader.java) to 'SubClassLoader' (X.aj)"/>
       </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/binaryDecp" title="incorrect overrides evaluation - 1.4">
       <compile files="IsItSynthetic.java" options="-1.5"/>
       <compile files="Top.java" options="-source 1.5 -target 1.5" outjar="a.jar"/>
       <compile files="Bottom.java" classpath="$sandbox/a.jar" options="-source 1.4 -target 1.4" outjar="b.jar"/>
       <compile files="Middle.java" classpath="$sandbox/a.jar" options="-source 1.4 -target 1.4" outjar="c.jar"/>
-      <compile files="X2.aj" classpath="$sandbox/a.jar;$sandbox/b.jar;$sandbox/c.jar" options="-Xlint:ignore" outjar="x.jar"/>
-      <run class="Bottom" classpath="a.jar;b.jar;c.jar;x.jar" ltw="aop.xml"/>
+      <compile files="X2.aj" classpath="$sandbox/a.jar,$sandbox/b.jar,$sandbox/c.jar" options="-Xlint:ignore" outjar="x.jar"/>
+      <run class="Bottom" classpath="a.jar,b.jar,c.jar,x.jar" ltw="aop.xml"/>
         <!--message kind="weave" text="Setting superclass of type 'Bottom' (Bottom.java) to 'Middle' (X2.aj)"/-->
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/binaryDecp" title="incorrect overrides evaluation - 1.5">
       <compile files="SubClassLoader.java,SubSubClassLoader.java" options="-1.5" outjar="lib.jar"/>
       <compile files="X.aj" inpath="lib.jar" options="-showWeaveInfo">
         <message kind="weave" text="Setting superclass of type 'SubSubClassLoader' (SubSubClassLoader.java) to 'SubClassLoader' (X.aj)"/>
       </compile>
     </ajc-test>
-    
+
 
     <ajc-test dir="bugs152/pr129282" title="no unnecessary declaration of thrown exception warning - 1">
       <compile files="MethodExecution.aj" options="-warn:+unusedThrown">
@@ -416,7 +416,7 @@
         <message kind="warning" line="17" text="no foos please"/>
       </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr138219" pr="138219" title="Can't use a FQ Reference pointcut in any pointcut expression referenced by a per-clause">
       <compile files="PerThisWithReference.aj,SomeOtherType.aj,RegularPCWithReference.aj" options="-1.5">
       </compile>
@@ -427,16 +427,16 @@
         </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr130722" pr="130722" title="FQ Reference pointcut from perclause ref pc">
       <compile files="test/Test.java,test/PointcutConsumer.aj,test1/PointcutProvider.aj"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr138220" pr="138220" title="@Aspect with reference pointcut in perclause">
       <compile files="AtAspectWithPerClause.aj" options="-1.5">
       </compile>
     </ajc-test>
-    
+
    <ajc-test dir="bugs152/pr144465" title="ltw with serialversionUID creation">
       <compile files="BigHorribleClass.java"/>
       <compile files="AnAspect.java" options="-1.4"/>
@@ -447,7 +447,7 @@
         </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr125480" title="aop.xml aspect inheriting abstract method ">
         <compile files="HelloWorld.java"/>
         <compile files="AbstractMethods.aj, ConcreteMethods.aj" options="-1.5"/>
@@ -458,7 +458,7 @@
           </stdout>
         </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr125480/case2" title="aop.xml aspect inheriting abstract method - code style">
         <compile files="HelloWorld.java"/>
         <compile files="AbstractMethods.aj, ConcreteMethods.aj" options="-1.5"/>
@@ -469,7 +469,7 @@
           </stdout>
         </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr142466" title="aop.xml aspect inheriting but not concretizing abstract method">
         <compile files="HelloWorld.java"/>
         <compile files="AbstractMethods.aj, ConcreteMethods.aj" options="-1.5"/>
@@ -484,7 +484,7 @@
           </stdout>
         </run>
     </ajc-test>
-     
+
     <ajc-test dir="bugs152/pr142466/case2" title="aop.xml aspect inheriting but not concretizing abstract method - 2">
         <compile files="HelloWorld.java"/>
         <compile files="AbstractMethods.aj, ConcreteMethods.aj" options="-1.5"/>
@@ -498,7 +498,7 @@
             <line text="Hello World!"/>
           </stdout>
         </run>
-    </ajc-test>   
+    </ajc-test>
 
     <ajc-test dir="bugs152/pr138223" pr="138223" title="Double at annotation matching (no binding)">
       <compile files="DoubleAnnotationMatching.aj" options="-1.5">
@@ -515,7 +515,7 @@
     </ajc-test>
 
     <ajc-test dir="bugs152/pr138286" pr="138286" title="No ClassCastException with perThis">
-      <compile files="A.aj" options="-1.5 -showWeaveInfo">      
+      <compile files="A.aj" options="-1.5 -showWeaveInfo">
 	    <message kind="weave" text="Join point 'initialization(void A.&lt;init&gt;())' in Type 'A' (A.aj:9) advised by before advice from 'A' (A.aj:13) [with runtime test]"/>
 	    <message kind="weave" text="Join point 'initialization(void Soo.&lt;init&gt;())' in Type 'Soo' (A.aj:31) advised by before advice from 'A' (A.aj:13) [with runtime test]"/>
 	    <message kind="weave" text="Join point 'initialization(void Goo.&lt;init&gt;())' in Type 'Goo' (A.aj:27) advised by before advice from 'A' (A.aj:13) [with runtime test]"/>
@@ -537,7 +537,7 @@
 	  </compile>
 	  <run class="a.b.c.AroundAdvicePassingPjpAsArgToSuper"/>
 	</ajc-test>
-	
+
 	  <ajc-test dir="bugs152/pr137235"  pr="137235"
 		title="directory with .jar extension: source and outjar">
 	    <compile files="directory.jar/Hello.java" outjar="directory.jar/run.custom"/>
@@ -547,7 +547,7 @@
           </stdout>
         </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr137235"  pr="137235"
 		title="directory with .jar extension"  >
 	    <compile files="directory.jar/Before.java" outjar="directory.jar/inOne.custom" options="-1.4"/>
@@ -562,7 +562,7 @@
           </stdout>
         </run>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs152/pr136393" title="NPE in makePreMethod">
 	  <compile files="World.aj" options="-1.5">
   	    <message kind="warning" line="10" text="this affected type is not exposed to the weaver: java.lang.String [Xlint:typeNotExposedToWeaver]"/>
@@ -570,18 +570,18 @@
 	    <message kind="error" line="16" text="Stystems cannot be resolved"/>
 	  </compile>
 	</ajc-test>
-	
+
 	<ajc-test dir="bugs152/pr135068" title="ltw verifyerror">
 	    <compile files="C.java,Ajava.java" options="-1.5 -XnoInline"/>
 	    <run class="C"/>
     </ajc-test>
-    
+
     	<ajc-test dir="bugs152/pr135068" title="ltw verifyerror - 2">
 	    <compile files="C2.java,Ajava2.java" options="-1.5 -XnoInline">
 	      <message kind="error" line="13" text="advice can not be declared static"/>
 	    </compile>
     </ajc-test>
-    
+
     	<ajc-test dir="bugs152/pr135068" title="ltw verifyerror - 3">
 	    <compile files="t/C.java" options="-1.5"/>
         <compile files="t/Ajava.java" options="-1.5">
@@ -589,25 +589,25 @@
         </compile>
         <run class="t.C" ltw="aop.xml"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr135068" title="ltw verifyerror - 4">
 	    <compile files="t/C2.java" options="-1.5"/>
         <compile files="t/Ajava2.java" options="-1.5">
 	      <message kind="error" line="13" text="advice can not be declared static"/>
         </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr142165" title="broken concretization">
       <compile files="C.java" options="-1.5"/>
       <compile files="A.java" options="-1.5"/>
       <run class="C" ltw="aop.xml">
         <stderr>
-          <line text="warning at Type 'AA' (no debug info available)::0 no match for this type name: SomeType [Xlint:invalidAbsoluteTypeName]"/>        
+          <line text="warning at Type 'AA' (no debug info available)::0 no match for this type name: SomeType [Xlint:invalidAbsoluteTypeName]"/>
           <line text="foo running"/>
  	    </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr142165" title="broken concretization - 2">
       <compile files="C.java" options="-1.5"/>
       <compile files="A.java" options="-1.5"/>
@@ -617,7 +617,7 @@
         </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr142165" title="broken concretization - 3">
       <compile files="C.java" options="-1.5"/>
       <compile files="A.java" options="-1.5"/>
@@ -628,26 +628,26 @@
         </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr134425" title="super ITDs">
       <compile files="Derived.aj" options="-1.5"/>
       <run class="Derived"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr128443" title="covariance and decp - 1">
       <compile files="Covariance.java" options="-1.5"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr147701" title="package for exception ignored">
       <compile files="TestBean.java" options="-1.5"/>
       <run class="a.b.c.TestBean"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr147701" title="package for exception ignored - 2">
       <compile files="TestBean2.java" options="-1.5"/>
       <run class="a.b.c.TestBean2"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs152/pr147701" title="package for exception ignored - 3">
       <compile files="TestBean3.java" options="-1.5">
         <message kind="error" text="@DeclareParents: defaultImpl=&quot;a.b.c.Impl&quot; does not implement the interface 'a.b.c.I'"/>
@@ -669,7 +669,7 @@
         <compile
         	files="TestMain.java, Main.java"
         >
-        </compile>	
+        </compile>
         <run class="TestMain" ltw="aop-optionsonly.xml">
         	<stdout>
                 <line text="Main.main"/>
@@ -684,7 +684,7 @@
             </stderr>
         </run>
     </ajc-test>
-    
+
    <ajc-test dir="ltw" title="weaveinfo messages with include and exclude">
       <compile files="EmptyTest1.java, EmptyTest2.java"/>
       <compile files="EmptyAspect.aj"/>
@@ -707,10 +707,10 @@
 	<ajc-test dir="bugs152/pr147845" title="Generic abstract aspect hierarchy with bounds">
       <compile files="GenericAspectHierarchy.aj" options="-1.5">
         <message kind="warning" line="25" text="a match"/>
-        <message kind="warning" line="27" text="a match"/>     
+        <message kind="warning" line="27" text="a match"/>
       </compile>
     </ajc-test>
-    
+
    <ajc-test dir="bugs152/pr147801" title="duplicate bridge methods">
       <compile files="Advisor.aj" inpath="foo.jar" options="-1.5"/>
       <run class="Foo">
@@ -720,7 +720,7 @@
         </stderr>
       </run>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs152/pr148007" title="jrockit boolean fun">
 		<compile files="test/BooleanUnitTest.java, test/LoggingAspect.aj"/>
 		<run class="test.BooleanUnitTest"/>
@@ -730,12 +730,12 @@
 		<compile files="test/BooleanUnitTest.java, test/LoggingAspect.java" options="-inlineJSR"/>
 		<run class="test.BooleanUnitTest"/>
     </ajc-test>
-    
+
     <ajc-test dir="features152/synthetic" title="synthetic ajc$ members">
         <compile files="TheWholeShow.aj" options="-1.5"/>
         <run class="TheWholeShow"/>
-    </ajc-test>    
-    
+    </ajc-test>
+
     <ajc-test dir="bugs152/pr148786" title="freaky new array joinpoint">
         <compile files="A.java" options="-Xjoinpoints:arrayconstruction"/>
         <run class="A">
@@ -743,8 +743,8 @@
             <line text="new array: class [[B"/>
           </stderr>
         </run>
-    </ajc-test>    
-    
+    </ajc-test>
+
     <ajc-test dir="bugs152/pr148727"  pr="148727"
 		title="integrated compilation calling aspectOf and hasAspect"  >
 	    <compile files="Asp.aj, Client.java" options="-source 1.4"/>
@@ -774,4 +774,4 @@
    <ajc-test dir="bugs152" title="new iprogramelement method getParameterSignatures with generics">
       <compile files="pr141730b.java" options="-1.5 -emacssym -Xset:minimalModel=false"/>
     </ajc-test>
-</suite>
+</suite>

tests/src/test/resources/org/aspectj/systemtest/ajc153/ajc153.xml

@@ -10,7 +10,7 @@
     </ajc-test>
 
     <ajc-test dir="bugs153/pr149908" title="ensure no npe due to missing member">
-      <compile files="A.aj,C1.java,Tracing.aj" inpath="simple.jar;stringBuilder.jar">
+      <compile files="A.aj,C1.java,Tracing.aj" inpath="simple.jar,stringBuilder.jar">
 		<message kind="warning" text="can not resolve this member: append [Xlint:unresolvableMember]"/>
 	  </compile>
     </ajc-test>
@@ -31,27 +31,27 @@
     <ajc-test dir="bugs153/pr162657" title="complex pointcut">
       <compile files="TestAspect.aj" options="-1.4"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr164633" title="incompatibleclasschange">
       <compile files="Model.java"/>
       <run class="test.Model"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr162135" title="bcexception in annotation style around advice - 2">
       <compile files="Foo2.java" options="-1.5"/>
       <run class="Foo2"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr162135" title="bcexception in annotation style around advice - 3">
       <compile files="Foo3.java" options="-1.5"/>
       <run class="Foo3"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr162135" title="bcexception in annotation style around advice - 4">
       <compile files="Foo4.java" options="-1.5"/>
       <run class="Foo4"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr162135" title="bcexception in annotation style around advice - 5">
       <compile files="Foo5.java" options="-1.5"/>
       <run class="Foo5"/>
@@ -66,7 +66,7 @@
       </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr162135" title="bcexception in annotation style around advice - 7">
       <compile files="Real.java" options="-1.5"/>
       <run class="a.b.c.Real">
@@ -76,7 +76,7 @@
       </stdout>
       </run>
     </ajc-test>
-    
+
      <ajc-test dir="bugs153/pr159143" title="declare method annotations">
         <compile files="DeclareMethodAnnotation.java" options="-1.5">
             <message line="16" kind="warning" text="all"/>
@@ -96,28 +96,28 @@
             <message line="41" kind="warning" text="all"/>
         </compile>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs153/pr148908" title="ensure getSourceSignature correct with static field">
       <compile files="BadInterface.java" options="-1.5 -emacssym -Xset:minimalModel=false"/>
-    </ajc-test> 
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs153/pr161502" title="generics in pointcuts">
       <compile files="Main.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="Join point 'method-call(java.util.List Main.getElements())' in Type 'Main' (Main.java:31) advised by around advice from 'Main$Concrete' (Main.java:18)"/>
       </compile>
       <run class="Main"/>
-    </ajc-test> 
-        
+    </ajc-test>
+
 	<ajc-test dir="bugs153/pr161502" title="generics in pointcuts - 2">
       <compile files="Main2.java" options="-1.5 -showWeaveInfo">
         <message kind="warning" text="advice defined in Main2$Base has not been applied"/>
       </compile>
       <run class="Main2"/>
-    </ajc-test> 
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs153/pr158624" title="generics and arrays">
       <compile files="ValueChange.java" options="-1.5"/>
-    </ajc-test> 
+    </ajc-test>
 
     <ajc-test dir="bugs153/pr153845" title="IllegalStateException at GenericSignatureParser.java">
       <compile files="GenericType.java,Aspect.java,Aspect2.java,Interface.java" options="-1.5" outjar="blob.jar"/>
@@ -127,7 +127,7 @@
     <ajc-test dir="bugs153/pr158412" title="annotation style pointcut npe">
       <compile files="layering/Layering.aj,layering/SystemArchitektur.java" options="-1.5"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr153464" title="negated annotation matching problem">
       <compile files="Bug.java" options="-1.5">
         <message kind="warning" line="99"/>
@@ -139,7 +139,7 @@
         <message kind="warning" line="3" text="Whatever"/>
       </compile>
     </ajc-test>
-    
+
     <ajc-test dir="features153/ptw" title="basic usage of getWithinTypeName">
       <compile files="CaseOne.java"/>
       <run class="CaseOne">
@@ -149,7 +149,7 @@
  	    </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="features153/ptw" title="basic usage of getWithinTypeName - annotation style">
       <compile files="CaseFive.java" options="-1.5"/>
       <run class="CaseFive">
@@ -159,7 +159,7 @@
  	    </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="features153/ptw" title="basic usage of getWithinTypeName - multiple types">
       <compile files="CaseTwo.java"/>
       <run class="CaseTwo">
@@ -170,7 +170,7 @@
  	    </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="features153/ptw" title="basic usage of getWithinTypeName - non matching types">
       <compile files="CaseThree.java"/>
       <run class="CaseThree">
@@ -181,7 +181,7 @@
  	    </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="features153/ptw" title="basic usage of getWithinTypeName - types in packages">
       <compile files="CaseFour.java"/>
       <run class="a.b.CaseFour">
@@ -192,13 +192,13 @@
  	    </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr158126" title="annotations, call and constructors problem">
       <compile files="A.java,B.java,MyAnnotation.java,MyAspect.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="Join point 'constructor-call(void B.&lt;init&gt;())' in Type 'A' (A.java:5) advised by before advice from 'MyAspect' (MyAspect.java:3)"/>
         <message kind="weave" text="Join point 'constructor-call(void B.&lt;init&gt;(int))' in Type 'A' (A.java:10) advised by before advice from 'MyAspect' (MyAspect.java:3)"/>
         <message kind="weave" text="Join point 'constructor-call(void A.&lt;init&gt;())' in Type 'A' (A.java:14) advised by before advice from 'MyAspect' (MyAspect.java:3)"/>
-        <message kind="weave" text="Join point 'constructor-call(void A.&lt;init&gt;(int))' in Type 'A' (A.java:15) advised by before advice from 'MyAspect' (MyAspect.java:3)"/>      
+        <message kind="weave" text="Join point 'constructor-call(void A.&lt;init&gt;(int))' in Type 'A' (A.java:15) advised by before advice from 'MyAspect' (MyAspect.java:3)"/>
       </compile>
     </ajc-test>
 
@@ -207,14 +207,14 @@
         <message kind="warning" line="2" text="advice defined in MyAspect has not been applied [Xlint:adviceDidNotMatch]"/>
       </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr156058" title="no IllegalStateException with generic inner aspect - 2">
       <compile files="Bug2.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="Join point 'method-call(MyClass Bug2.callit())' in Type 'Bug2' (Bug2.java:15) advised by before advice from 'MyAspect' (Bug2.java:2)"/>
         <message kind="warning" line="24" text="advice defined in MyAspect2 has not been applied [Xlint:adviceDidNotMatch]"/>
       </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr153490" title="no illegal state exception from AsmDelegate - 1">
       <compile files="Foo.java" options="-1.5" classpath="jarForFoo.jar" />
     </ajc-test>
@@ -229,10 +229,10 @@
 
     <ajc-test dir="bugs153/pr156962" title="Test Annot Method">
       <compile files="Sample.java, WarnDeprecatedMethod.aj" options="-1.5">
-        <message kind="warning" line="2" text="deprecated method"/>      
+        <message kind="warning" line="2" text="deprecated method"/>
       </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr156962" title="Test Annot Method Has Member">
       <compile files="Sample.java, LiftDeprecation.aj" options="-1.5 -XhasMember -showWeaveInfo -Xlint:ignore">
         <message kind="weave" text="'Sample' (Sample.java:1) is annotated with @Deprecated type annotation from 'LiftDeprecation' (LiftDeprecation.aj:2)"/>
@@ -243,7 +243,7 @@
       <compile files="PairGeneric.java" options="-1.5" outjar="pair1.jar"/>
       <compile files="BaseType.java" options="-1.5" outjar="basetype.jar" classpath="pair1.jar"/>
       <compile files="PairNormal.java" outjar="pair2.jar"/>
-      <compile files="AnAspect.java" options="-1.5 -Xset:runMinimalMemory=true" inpath="basetype.jar;pair2.jar"/>
+      <compile files="AnAspect.java" options="-1.5 -Xset:runMinimalMemory=true" inpath="basetype.jar,pair2.jar"/>
     </ajc-test>
 
     <ajc-test dir="bugs153/pr152871" title="parsing bytecode less">
@@ -258,7 +258,7 @@
  	    </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr160674" title="turning off bcel caching">
       <compile files="MyClass.java" options="-1.5"/>
       <compile files="MyAspect.java" options="-1.5 -Xlint:ignore"/>
@@ -280,7 +280,7 @@
  	    </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr153380/case1" title="pipelining decps">
       <compile files="Ann.java,Base.java,BaseImpl.java,I1.java,Mixin.java,Runner.java,X.aj" options="-1.5">
         <message kind="error" line="1" text="The import java.lang.retention cannot be resolved"/>
@@ -291,7 +291,7 @@
         -->
       </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr154332" title="incorrect deprecated annotation processing">
       <compile files="Annot.java" options="-1.5">
         <message kind="warning" line="5" text="marker"/>
@@ -300,7 +300,7 @@
         <message kind="warning" line="31" text="deprecated"/>
       </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr148381" title="argNames and javac">
       <!--compile files="C.java" options="-1.5"/>
       <compile files="A.java" options="-1.5"/-->
@@ -311,45 +311,45 @@
  	    </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/PR148219" title="unwanted warning for pointcut">
       <compile files="MyMessages.java" options="-1.5 -Xlint:ignore -warn:+unusedArgument"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr148737" title="illegalstateexception for non generic type">
       <compile files="A.java" options="-source 5 -target 5">
         <message kind="warning" line="18" text="advice defined in TestAspect has not been applied"/>
       </compile>
     </ajc-test>
-         
+
     <ajc-test dir="bugs153/pr149096" title="cflow xml concrete aspect">
 		<compile files="SimpleTracing.aj" outjar="out.jar"/>
 		<compile files="TestMain.aj"/>
 		<run class="TestMain" ltw="aop-pr149096.xml"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr149305/case1" title="ataj inheritance - 1">
 		<compile files="AbstractOzonator.java,IdentityOzonator.java,User.java" options="-1.5"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr149305/case2" title="ataj inheritance - 2">
 		<compile files="com/codesrc/ozonator/identity/IdentityOzonator.java,com/codesrc/ozonator/identity/User.java,com/codesrc/ozonator/AbstractOzonator.java" options="-1.5"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr149305/case2" title="ataj inheritance - 3">
 		<compile files="com/codesrc/ozonator/AbstractOzonator.java,com/codesrc/ozonator/identity/IdentityOzonator.java,com/codesrc/ozonator/identity/User.java" options="-1.5"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr148693" title="verification problem">
 		<compile files="MyAspect.java" options="-1.5 -XterminateAfterCompilation=true"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr148537" title="incorrect annotation value">
 		<compile files="MyClass.java" options="-1.5">
 		  <message kind="error" line="5" text="Type mismatch: cannot convert from RetentionPolicy[] to RetentionPolicy"/>
 		</compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr145693" title="verifyErrNoTypeCflowField">
       <compile files="Event.java" outjar="cpath.jar"/>
       <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar" options="-1.4"/>
@@ -361,33 +361,33 @@
           <line text="method running"/>
         </stderr>
       </run>
-    </ajc-test>    
+    </ajc-test>
 
     <ajc-test dir="bugs153/pr145693" title="verifyErrInpathNoTypeCflowField">
       <compile files="Event.java" outjar="cpath.jar"/>
       <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar" options="-1.4"/>
       <compile files="Sample.java" options="-Xlint:ignore" inpath="cpath.jar" aspectpath="apath.jar" outjar="run.jar"/>
       <run class="Sample" classpath="run.jar,apath.jar"/>
-    </ajc-test>    
+    </ajc-test>
 
     <ajc-test dir="bugs153/pr145693" title="cpathNoTypeCflowField">
       <compile files="Event.java" outjar="cpath.jar"/>
       <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar" options="-1.4"/>
       <compile files="Sample.java" options="-Xlint:ignore" classpath="cpath.jar" aspectpath="apath.jar" outjar="run.jar"/>
       <run class="Sample" classpath="run.jar,apath.jar"/>
-    </ajc-test>    
-    
+    </ajc-test>
+
      <ajc-test dir="bugs153/pr148409" title="generic signature problem">
       <compile files="Blurgh.java" options="-1.5"/>
       <compile files="X.java" options="-1.5 -Xlint:ignore"/>
       <run class="Blurgh" options="-1.5" ltw="aop.xml"/>
-    </ajc-test>    
-    
+    </ajc-test>
+
     <ajc-test dir="bugs153/pr149071" title="visibility problem">
       <compile files="AspectItd.java"/>
       <run class="AspectItd"/>
-    </ajc-test>    
-    
+    </ajc-test>
+
     <ajc-test dir="bugs153/pr147841" title="advice not woven on aspectpath">
       <compile files="A.java" options="-Xlint:ignore" outjar="apath.jar"/>
       <!--compile files="C.java" outjar="cpa.jar" classpath="cpath.jar"/-->
@@ -399,16 +399,16 @@
           <line text="foo"/>
         </stderr>
       </run>
-    </ajc-test>   
-        
+    </ajc-test>
+
 	<ajc-test dir="bugs153/pr150095" title="generics, inheritance and decp">
      <compile files="Foo.java" options="-1.5"/>
-    </ajc-test> 
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs153/pr121805" title="ambiguous binding">
      <compile files="Complex.java"/>
-    </ajc-test> 
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs153/pr145442" title="missing line numbers in stacktrace before">
      <compile files="hello/HelloWorld.java hello/ThrowExceptionBefore.aj"/>
      <run class="hello.HelloWorld">
@@ -418,8 +418,8 @@
 	    	<line text="hello.HelloWorld.main(HelloWorld.java:41)"/>
 		</stderr>
      </run>
-    </ajc-test> 
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs153/pr145442" title="missing line numbers in stacktrace before - binary">
      <compile inpath="helloworld.jar" files="hello/ThrowExceptionBefore.aj"/>
      <run class="hello.HelloWorld">
@@ -429,8 +429,8 @@
 	    	<line text="hello.HelloWorld.main(HelloWorld.java:41)"/>
 		</stderr>
      </run>
-    </ajc-test> 
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs153/pr145442" title="missing line numbers in stacktrace after">
      <compile files="hello/HelloWorld.java hello/ThrowExceptionAfter.aj"/>
      <run class="hello.HelloWorld">
@@ -440,8 +440,8 @@
 	    	<line text="hello.HelloWorld.main(HelloWorld.java:41)"/>
 		</stderr>
      </run>
-    </ajc-test> 
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs153/pr145442" title="missing line numbers in stacktrace around">
      <compile files="hello/HelloWorld.java hello/ThrowExceptionAround.aj" options="-XnoInline"/>
      <run class="hello.HelloWorld">
@@ -451,8 +451,8 @@
 	    	<line text="hello.HelloWorld.main(HelloWorld.java:41)"/>
 		</stderr>
      </run>
-    </ajc-test> 
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs153/pr149322" title="can't find type on interface call 1">
 		<compile files="Interface.java"/>
         <compile
@@ -463,25 +463,25 @@
       	<compile files="Aspect1.aj" options="-showWeaveInfo -inpath ." classpath="missing.jar">
 	        <message kind="weave" text="void Interface.interfaceMethod()"/>
 	        <message kind="weave" text="void Missing.interfaceMethod()"/>
-		</compile>	        
+		</compile>
       	<compile files="Aspect1.aj" options="-Xlint:warning -showWeaveInfo -inpath .">
 	        <message kind="weave" text="void Interface.interfaceMethod()"/>
 	        <!--
 	        <message kind="warning" text="can't determine superclass of missing type Missing"/>
 	        -->
-		</compile>	        
+		</compile>
       	<run class="TestWithMissing">
 			<stdout>
 	        	<line text="Aspect1.before() interfaceMethod"/>
 	        	<line text="Missing.interfaceMethod()"/>
-<!--	        	
+<!--
 	        	<line text="Aspect1.before() interfaceMethod"/>
 -->
 	        	<line text="Missing.interfaceMethod()"/>
 	        	<line text="Missing.missingMethod()"/>
     		</stdout>
     	</run>
-    </ajc-test>    
+    </ajc-test>
 	<ajc-test dir="bugs153/pr149322" title="can't find type on interface call 2">
 		<compile files="Interface.java"/>
         <compile
@@ -492,24 +492,24 @@
       	<compile files="Aspect2.aj" options="-showWeaveInfo -inpath ." classpath="missing.jar">
 	        <message kind="weave" text="void Interface.interfaceMethod()"/>
 	        <message kind="weave" text="void Missing.interfaceMethod()"/>
-		</compile>	        
+		</compile>
       	<compile files="Aspect2.aj" options="-Xlint:warning -showWeaveInfo -inpath .">
 	        <message kind="weave" text="void Interface.interfaceMethod()"/>
 	        <message kind="warning" text="can't determine whether missing type Missing is an instance of Interface"/>
 	        <message kind="warning" text="can't determine superclass of missing type Missing"/>
-		</compile>	        
+		</compile>
       	<run class="TestWithMissing">
 			<stdout>
 	        	<line text="Aspect2.before() interfaceMethod"/>
 	        	<line text="Missing.interfaceMethod()"/>
-<!--	        	
+<!--
 	        	<line text="Aspect2.before() interfaceMethod"/>
 -->
 	        	<line text="Missing.interfaceMethod()"/>
 	        	<line text="Missing.missingMethod()"/>
     		</stdout>
     	</run>
-    </ajc-test>    
+    </ajc-test>
 	<ajc-test dir="bugs153/pr149322" title="can't find type on interface call 3">
 		<compile files="Interface.java"/>
         <compile
@@ -520,25 +520,25 @@
       	<compile files="Aspect3.aj" options="-showWeaveInfo -inpath ." classpath="missing.jar">
 	        <message kind="weave" text="void Interface.interfaceMethod()"/>
 	        <message kind="weave" text="void Missing.interfaceMethod()"/>
-		</compile>	        
+		</compile>
       	<compile files="Aspect3.aj" options="-Xlint:warning -showWeaveInfo -inpath .">
 	        <message kind="weave" text="void Interface.interfaceMethod()"/>
 	        <message kind="warning" text="can't determine whether missing type Missing is an instance of Interface"/>
 	        <message kind="warning" text="can't determine superclass of missing type Missing"/>
-		</compile>	        
+		</compile>
       	<run class="TestWithMissing">
 			<stdout>
 	        	<line text="Aspect3.before() interfaceMethod"/>
 	        	<line text="Missing.interfaceMethod()"/>
-<!--	        	
+<!--
 	        	<line text="Aspect3.before() interfaceMethod"/>
 -->
 	        	<line text="Missing.interfaceMethod()"/>
 	        	<line text="Missing.missingMethod()"/>
     		</stdout>
     	</run>
-    </ajc-test>    
-  
+    </ajc-test>
+
     <ajc-test dir="bugs153" title="match volatile field">
       <compile files="pr150671.aj" options="-Xset:activateLightweightDelegates=false">
         <message kind="error" line="7" text="Changing state"/>
@@ -553,19 +553,19 @@
         <compile files="Aspect.aj" options="-outxml -outjar aspects.jar -1.4"/>
         <ant file="ajc-ant.xml" target="Duplicate JVMTI agents" verbose="true"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr151978" title="generics problem">
       <compile files="IMessage.java" options="-1.5">
       </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr152631" title="decp and cflowadder munger clash">
       <compile files="EMA.java" options="-1.5"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr153572" title="LTWWorld with annotation matching">
-    	<compile 
-    		files="Configurable.java, AnnotationMatcher.aj" 
+    	<compile
+    		files="Configurable.java, AnnotationMatcher.aj"
     		options="-1.5"
     		outjar="aspectlib.jar"
     		outxmlfile="META-INF/aop.xml"/>
@@ -576,7 +576,7 @@
     		</stdout>
     	</run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr149560" title="incorrect staticinitialization weaving - codestyle">
       <compile files="CodeStyle.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="Join point 'staticinitialization(void MyAspect.&lt;clinit&gt;())' in Type 'MyAspect' (CodeStyle.java:3) advised by after advice from 'MyAspect' (CodeStyle.java:4)"/>
@@ -590,7 +590,7 @@
         </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr149560" title="incorrect staticinitialization weaving - annstyle">
       <compile files="AnnStyle.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="Join point 'staticinitialization(void MyAspect.&lt;clinit&gt;())' in Type 'MyAspect' (AnnStyle.java:5) advised by after advice from 'MyAspect' (AnnStyle.java:7)"/>
@@ -604,7 +604,7 @@
         </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="ltw" title="reweavableAspectNotRegistered error">
       <compile files="HelloWorldWithException.java, ExceptionHandler.aj" options="-showWeaveInfo">
         <message kind="weave" text="Join point 'method-execution(void HelloWorldWithException.main(java.lang.String[]))' in Type 'HelloWorldWithException' (HelloWorldWithException.java:3) advised by around advice from 'ExceptionHandler' (ExceptionHandler.aj:2)"/>
@@ -620,7 +620,7 @@
         </stderr>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr155972" title="NPE in ConstructorSignatureImpl">
       <compile files="ConstructorTest.java, SignatureImplAspect.aj" options="-Xlint:ignore"/>
       <run class="ConstructorTest">
@@ -629,7 +629,7 @@
         </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr155972" title="NPE in FieldSignatureImpl">
       <compile files="FieldTest.java, SignatureImplAspect.aj" options="-Xlint:ignore"/>
       <run class="FieldTest">
@@ -638,7 +638,7 @@
         </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr155972" title="NPE in InitializerSignatureImpl">
       <compile files="InitializerTest.java, SignatureImplAspect.aj" options="-Xlint:ignore"/>
       <run class="InitializerTest">
@@ -647,13 +647,13 @@
         </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs153/pr155763" title="ensure LineNumberTable correct with generics, for each and continue">
       <compile files="Test.java" options="-1.5">
 		<message kind="warning" line="27" text="adviceDidNotMatch"/>
-	  </compile>	
+	  </compile>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs153/pr157474" title="TestServer with duplicate configuration" keywords="ltw,server">
         <compile files="AbstractTracing.aj" options="-outjar library.jar -outxml"/>
         <compile files="HelloWorld.java" options="-outjar application.jar"/>
@@ -675,7 +675,7 @@
     <ajc-test dir="bugs153/pr151772" title="ensure declare soft doesn't allow undeclared exception in anonymous inner class - 2">
       <compile files="Softener2.aj">
 		<message kind="error" line="18" text="Unhandled exception type SQLException"/>
-	  </compile>	
+	  </compile>
     </ajc-test>
 
     <ajc-test dir="bugs153/pr125981" title="declare soft and inner classes">
@@ -716,14 +716,14 @@
         <compile files="HelloWorld.java" options="-outjar hello.jar"/>
         <compile files="Missing.java" options="-outjar missing.jar"/>
         <compile files="Tracing.aj, PointcutLibrary.aj" options="-Xlint:ignore -1.5 -outxml -outjar tracing.jar" classpath="hello.jar,missing.jar"/>
-<!--        
+<!--
 		<run class="HelloWorld" ltw="aop.xml">
 	        <stdout>
     	      <line text="? main"/>
     	      <line text="Hello World!"/>
         	</stdout>
         </run>
--->        
+-->
 		<ant file="ant.xml" target="NPE with LTW, pointcut library and missing aspect dependency" verbose="true">
 	        <stdout>
     	      <line text="? main"/>
@@ -739,7 +739,7 @@
         <compile
         	files="HelloWorld.java"
         >
-        </compile>	
+        </compile>
         <compile files="AbstractSuperAspect.aj" options="-1.4"/>
         <compile files="TestAdvice.aj" options="-1.4"/>
         <run class="HelloWorld" ltw="aop-advice.xml">
@@ -755,7 +755,7 @@
 	<ajc-test dir="bugs153/pr132080"
       title="Weave concrete sub-aspect with ITD"
       keywords="aop.xml">
-<!--      
+<!--
         <compile files="AbstractSuperAspectWithInterface.aj, TestInterface.java" options="-verbose"/>
         <compile files="HelloWorld.java, TestITD.aj, ConcreteAspectWithITD.aj" options="-verbose">
             <message line="3" kind="warning" text="this affected type is not exposed to the weaver: AbstractSuperAspectWithInterface"/>
@@ -767,7 +767,7 @@
                 <line text="Hello World!"/>
             </stdout>
         </run>
--->        
+-->
         <compile files="HelloWorld.java"/>
         <compile files="AbstractSuperAspectWithInterface.aj, TestInterface.java"/>
         <compile files="TestITD.aj">
@@ -783,7 +783,7 @@
 
     </ajc-test>
 
-	<ajc-test dir="bugs153/pr132080" title="Weave concrete sub-aspect with around closure" 
+	<ajc-test dir="bugs153/pr132080" title="Weave concrete sub-aspect with around closure"
 		keywords="aop.xml">
 
         <compile files="HelloWorld.java"/>
@@ -806,19 +806,19 @@
 		<compile files="TestMain.aj"/>
 		<run class="TestMain" ltw="aop-pr149096.xml"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs153/pr158957" title="NPE with LTW, pointcut library and missing aspect dependency" keywords="ltw">
         <compile files="HelloWorld.java" options="-outjar hello.jar"/>
         <compile files="Missing.java" options="-outjar missing.jar"/>
         <compile files="Tracing.aj, PointcutLibrary.aj" options="-Xlint:ignore -1.5 -outxml -outjar tracing.jar" classpath="hello.jar,missing.jar"/>
-<!--        
+<!--
 		<run class="HelloWorld" ltw="aop.xml">
 	        <stdout>
     	      <line text="? main"/>
     	      <line text="Hello World!"/>
         	</stdout>
         </run>
--->        
+-->
 		<ant file="ant.xml" target="NPE with LTW, pointcut library and missing aspect dependency" verbose="true">
 	        <stdout>
     	      <line text="? println"/>
@@ -836,15 +836,15 @@
      <compile files="MainClass.java, WorldAspect.aj" inpath="library.jar" options="-1.5 -showWeaveInfo">
 		<message kind="weave" text="Join point 'method-execution(void pkg.Hello.sayHello())' in Type 'pkg.Hello' (Hello.java:7) advised by afterReturning advice from 'pack.WorldAspect' (WorldAspect.aj:9)"/>
 	 </compile>
-    </ajc-test> 
+    </ajc-test>
 
     <ajc-test dir="bugs153/pr164356" title="javadoc comments are set if have normal comments">
       <compile files="C.java" options="-emacssym -XjavadocsInModel -Xset:minimalModel=false"/>
     </ajc-test>
-    
+
    <ajc-test dir="bugs153/pr164384" title="compliance java 6 throws usage error">
       <compile files="MainClass.java,Hello.java,MyAnnotation.java" options="-1.6">
- 	  <!--        
+ 	  <!--
 		<message kind="error" text="-1.6"/>
 		<message kind="error" text="no sources specified"/>
 		<message kind="abort" text="AspectJ Compiler"/>
@@ -854,17 +854,17 @@
 
    <ajc-test dir="bugs153/pr164384" title="source level java 6 throws usage error">
       <compile files="MainClass.java,Hello.java,MyAnnotation.java" options="-1.6">
-	  <!-- 
+	  <!--
 	    <message kind="error" text="-1.6"/>
 		<message kind="error" text="no sources specified"/>
 		<message kind="abort" text="AspectJ Compiler"/>
 	  -->
-	  </compile>	  
+	  </compile>
     </ajc-test>
 
    <ajc-test dir="bugs153/pr164384" title="target level java 6 throws usage error">
       <compile files="MainClass.java,Hello.java,MyAnnotation.java" options="-1.6">
-	  <!-- 
+	  <!--
 		<message kind="error" text="-1.6"/>
 		<message kind="error" text="no sources specified"/>
 		<message kind="abort" text="AspectJ Compiler"/>
@@ -874,13 +874,13 @@
 
 	<ajc-test dir="bugs153/StaticImport" title="ensure static import reference have static modifier set">
       <compile files="StaticImport.java,C.java" options="-1.5 -emacssym -Xset:minimalModel=false"/>
-    </ajc-test> 
-    
+    </ajc-test>
+
     <ajc-test dir="bugs153/GenericMethod" title="ensure getSourceSignature correct with generic method">
       <compile files="C.java" options="-1.5 -emacssym -Xset:minimalModel=false"/>
-    </ajc-test> 
-    
+    </ajc-test>
+
     <ajc-test dir="bugs153/Annotation" title="ensure Annotations are added to import list">
       <compile files="C.java, Anno.aj, A.java" options="-1.5 -emacssym"/>
-    </ajc-test> 
-</suite>
+    </ajc-test>
+</suite>

tests/src/test/resources/org/aspectj/systemtest/ajc154/ajc154.xml

@@ -6,7 +6,7 @@
    <ajc-test dir="bugs154/pr166647" title="ltw and cflow problem">
      <compile options="-1.5" files="ClassToAdvise.java,ClassWithMain.java" outjar="code.jar"/>
      <compile options="-1.5 -Xlint:ignore" files="Aspect.java" outjar="aspects.jar"/>
-     <run class="a.ClassWithMain" classpath="aspects.jar;code.jar" ltw="aop1.xml">
+     <run class="a.ClassWithMain" classpath="aspects.jar,code.jar" ltw="aop1.xml">
        <stdout>
          <line text="advice fired"/>
        </stdout>
@@ -14,12 +14,12 @@
        </stderr>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr211052" title="declare atType problems - 1">
      <compile options="-1.5" files="MyPojo.java"/>
      <run class="MyPojo"/>
    </ajc-test>
-   
+
    <!--  DistantResource is explicitly mentioned as c.d.DistantResource -->
    <ajc-test dir="bugs154/pr211052" title="declare atType problems - 2">
      <compile options="-1.5 -showWeaveInfo" files="SimpleAnnotation.java,SimpleAspect1.java,DistantResource.java">
@@ -39,22 +39,22 @@
        <message kind="weave" text="'c.d.DistantResource' (DistantResource.java:5) is annotated with @SimpleAnnotation(classname = &quot;oranges&quot;)"/>
      </compile>
       <run class="c.d.DistantResource">
-     <stdout>       
+     <stdout>
        <line text="Annotation is @a.b.SimpleAnnotation(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
        <line text="Annotation is @a.b.SimpleAnnotation(classname=&quot;oranges&quot;)" vm="9+"/>
      </stdout>
      </run>
    </ajc-test>
-   
+
    <!--  Annotation is in a different package to the aspect and explicitly referenced with a fully qualified name -->
    <ajc-test dir="bugs154/pr211052" title="declare atType problems - 4">
      <compile options="-1.5 -showWeaveInfo" files="SimpleAnnotation2.java,SimpleAspect3.java,DistantResource.java">
        <message kind="weave" text="'c.d.DistantResource' (DistantResource.java:5) is annotated with @e.f.SimpleAnnotation2(classname = &quot;oranges&quot;)"/>
-     </compile>     
+     </compile>
      <run class="c.d.DistantResource">
      <stdout>
        <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>       
+       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>
      </stdout>
      </run>
    </ajc-test>
@@ -67,11 +67,11 @@
      <run class="c.d.DistantResource">
      <stdout>
        <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>       
+       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>
      </stdout>
      </run>
    </ajc-test>
-   
+
    <!-- target for annotation is from a jar -->
    <ajc-test dir="bugs154/pr211052" title="declare atType problems - 6">
      <compile options="-1.5" files="DistantResource.java" outjar="target.jar"/>
@@ -81,7 +81,7 @@
      <run class="c.d.DistantResource">
      <stdout>
        <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>       
+       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>
      </stdout>
      </run>
    </ajc-test>
@@ -96,11 +96,11 @@
      <run class="c.d.DistantResource">
      <stdout>
        <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/>
-       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>              
+       <line text="Annotation is @e.f.SimpleAnnotation2(classname=&quot;oranges&quot;)" vm="9+"/>
      </stdout>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr211674" title="after throwing annotation style problem - 1">
      <compile options="-1.5" files="Test.java"/>
      <run class="Test"/>
@@ -149,7 +149,7 @@
        <stdout/>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr148381/error3" title="argNames does not work - error3">
      <!-- this compile is just to get code.jar into the sandbox, all the code is already precompiled in code.jar -->
      <compile options="-1.5" files="PerformanceMonitor.java" classpath="code.jar"/>
@@ -182,7 +182,7 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
    <!-- switch from code style sub-aspect to annotation style sub aspect -->
    <ajc-test dir="bugs154/pr209019/case2" title="various issues with ltw and around advice - 2">
      <compile options="-1.5 -XnoInline" files="A.java,AtDurationMethod.java,AbstractDurationMethod.java,Runner.java"/>
@@ -195,7 +195,7 @@
        </stderr>
      </run>
    </ajc-test>
-   
+
    <!-- same as case2 but without -XnoInline -->
    <ajc-test dir="bugs154/pr209019/case2" title="various issues with ltw and around advice - 3">
      <compile options="-1.5" files="A.java,AtDurationMethod.java,AbstractDurationMethod.java,Runner.java"/>
@@ -208,7 +208,7 @@
        </stderr>
      </run>
    </ajc-test>
-   
+
    <!-- now loadtime weaving -->
    <ajc-test dir="bugs154/pr209019/case3" title="various issues with ltw and around advice - 4">
      <compile options="-1.5" files="A.java,AbstractDurationMethod.java,Runner.java"/>
@@ -221,12 +221,12 @@
        </stderr>
      </run>
    </ajc-test>
-   
+
    <!-- just checking the new syntax compiles OK -->
    <ajc-test dir="bugs154/pr169432/case1" title="declare parents problem when target already implements interface - 1">
      <compile options="-1.5" files="NonMarkerInterface.java,ClassThatAlreadyIncludesRequiredMethods.java,DeclareParentsForNonMarkerInterfaceToAClassThatAlreadyIncludeRequiredMethods.java"/>
    </ajc-test>
-   
+
    <!-- now violate the rules, the types matching the pattern do not implement the interface -->
    <ajc-test dir="bugs154/pr169432/case2" title="declare parents problem when target already implements interface - 2">
     <compile options="-1.5" files="A.java">
@@ -235,7 +235,7 @@
      </compile>
    </ajc-test>
 
-   <!-- now they do, lets check they behave as expected -->   
+   <!-- now they do, lets check they behave as expected -->
    <ajc-test dir="bugs154/pr169432/case3" title="declare parents problem when target already implements interface - 3">
      <compile options="-1.5" files="A.java"/>
      <run class="A">
@@ -269,15 +269,15 @@
    <ajc-test dir="bugs154/pr162539" title="NPE with missing @aspect annotation in pointcut library - 1">
    	 <compile files="test/ataspectj/pointcutlibrary/HelloWorld.java, test/ataspectj/pointcutlibrary/AtAspect.java" classpath="lib.jar" options="-1.5"/>
    </ajc-test>
-    
+
    <ajc-test dir="bugs154/pr162539" title="NPE with missing @aspect annotation in pointcut library - 2">
    	<compile files="test/ataspectj/pointcutlibrary/PointcutLibrary.java, test/ataspectj/pointcutlibrary/HelloWorld.java, test/ataspectj/pointcutlibrary/AtAspect.java" options="-1.5"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr176991" title="wrong number of type parameters">
      <compile options="-1.5" files="AspectJBugTestCase.java"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr186673" title="jars and zips with non-standard suffix">
      <compile options="-1.5" files="Apple.java" outjar="apple.jar.0"/>
      <compile options="-1.5" files="Orange.java" outjar="orange.zipfoo"/>
@@ -289,51 +289,51 @@
      </ant-->
      <compile options="-1.5" files="Main.java" classpath="orange.zipfoo,apple.jar.0"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface">
      <compile options="-1.5" files="Bang.java"/>
      <!--compile options="-1.5 -emacssym" files="Bang.java"/-->
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - emacssym">
      <compile options="-1.5 -emacssym" files="Bang.java"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleA">
      <compile options="-1.5" files="ExampleA.java"/>
      <run class="ExampleA"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleB">
      <compile options="-1.5" files="ExampleB.java">
        <message kind="error" line="20" text="The method intro(String) in the type I.J&lt;String&gt; is not applicable for the arguments (int)"/>
      </compile>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleC">
      <compile options="-1.5" files="ExampleC.java"/>
      <run class="ExampleC"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleD">
      <compile options="-1.5" files="ExampleD.java"/>
      <run class="ExampleD"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleE">
      <compile options="-1.5" files="ExampleE.java"/>
      <run class="ExampleE"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleF">
      <compile options="-1.5" files="ExampleF.java"/>
      <run class="ExampleF"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr203646" title="npe with itd on inner generic interface - exampleG">
      <compile options="-1.5" files="ExampleG.java"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr206732" title="itd clash for types from aspectpath">
      <compile outjar="foo.jar" files="Advised.aj"/>
      <compile files="Ref.aj" aspectpath="foo.jar"/>
@@ -342,7 +342,7 @@
    <ajc-test dir="bugs154/pr175806" title="coping with bad tables">
      <compile options="-1.5" files="A.java"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr174449" title="problem with generic aspect and generic pointcut">
      <compile options="-1.5" files="Foo.java"/>
      <run class="Foo">
@@ -352,7 +352,7 @@
        </stderr>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr174449" title="problem with generic aspect and generic pointcut - noinline">
      <compile options="-1.5 -XnoInline" files="Foo.java"/>
      <run class="Foo">
@@ -362,12 +362,12 @@
        </stderr>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr171953_2" title="problem with generic methods and ordering - ok">
 	 <compile options="-1.5" files="test/ListFactoryAspect.aj, test/AbstractProcessor.java,test/ListFactory.java,test/ListFactoryConsumer.java,test/Processor.java,test/SimpleListFactoryConsumer.java">
 	 </compile>
    </ajc-test>
-   
+
    <ajc-test dir="bugs154/pr171953_2" title="problem with generic methods and ordering - bad">
 	 <compile options="-1.5" files="test/ListFactory.java,test/ListFactoryConsumer.java,test/SimpleListFactoryConsumer.java,test/Processor.java,test/ListFactoryAspect.aj,test/AbstractProcessor.java">
 	 </compile>
@@ -379,7 +379,7 @@
        <message kind="weave" text="Extending interface set for type 'test.AbstractExecutable' (AbstractExecutable.java) to include 'java.io.Serializable' (ExecutionAspect.aj)"/>
        <message kind="weave" text="Join point 'method-execution(void test.SubTestExecutable.execute())' in Type 'test.SubTestExecutable' (SubTestExecutable.java:6) advised by around advice from 'test.ExecutionAspect' (ExecutionAspect.aj:9)"/>
        <message kind="weave" text="Join point 'method-execution(void test.TestExecutable.execute())' in Type 'test.TestExecutable' (TestExecutable.java:5) advised by around advice from 'test.ExecutionAspect' (ExecutionAspect.aj:9)"/>
-     </compile>       
+     </compile>
      <run class="test.SecondTestExecutable"/>
    </ajc-test>
 
@@ -389,42 +389,42 @@
        <message kind="weave" text="Extending interface set for type 'test.AbstractExecutable' (AbstractExecutable.java) to include 'java.io.Serializable' (ExecutionAspect.aj)"/>
        <message kind="weave" text="Join point 'method-execution(void test.SubTestExecutable.execute())' in Type 'test.SubTestExecutable' (SubTestExecutable.java:6) advised by around advice from 'test.ExecutionAspect' (ExecutionAspect.aj:9)"/>
        <message kind="weave" text="Join point 'method-execution(void test.TestExecutable.execute())' in Type 'test.TestExecutable' (TestExecutable.java:5) advised by around advice from 'test.ExecutionAspect' (ExecutionAspect.aj:9)"/>
-     </compile>       
+     </compile>
      <run class="test.SecondTestExecutable"/>
    </ajc-test>
 
     <ajc-test dir="bugs154/pr171952" title="generic methods and ITDs">
       <compile files="Foo.java,FooAspect.java" options="-1.5"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs154/pr169428" title="using decp annotation without aspect annotation">
       <compile files="AnAspect.java" options="-1.5">
         <message kind="error" text="Found @AspectJ annotations in a non @Aspect type 'AnAspect'"/>
       </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs154/pr170467" title="itds and parameterized parameters">
       <compile files="Bug.aj" options="-1.5"/>
       <compile files="Bug2.aj" options="-1.5"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs154/pr169706" title="inherited annotations">
       <compile files="A.java,B.java,C.java,MyAspect.java,MyAnnotation.java,Test.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="Join point 'method-call(void C.foo())' in Type 'Test' (Test.java:5) advised by before advice from 'MyAspect' (MyAspect.java:4)"/>
 	  </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs154/pr165885" title="generic field npe">
       <compile files="Concrete.java,Abstract.java,Aspect.java" options="-1.5">
         <message kind="warning" line="8" text="foo"/>
 	  </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs154/pr168044" title="complex generics - 1">
       <compile files="AbstractNode.java" options="-1.5">
 	  </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs154/pr168063" title="incorrectly marking field transient">
       <compile files="A.java"/>
       <run class="A">
@@ -433,12 +433,12 @@
         </stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs154/pr166084" title="incorrect optimization of istore">
       <compile files="X.java" inpath="simple.jar"/>
 	  <run class="Simple"/>
     </ajc-test>
-       
+
     <ajc-test dir="bugs154/pr165631" title="dual parameterizations not allowed">
       <!-- two variations of the same situation, should fail in the same way -->
       <compile files="Bug.java" options="-1.5">
@@ -455,10 +455,10 @@
         <compile
             files="Main.java"
         >
-        </compile>    
+        </compile>
         <run class="Main" ltw="aop-noxlintfile-nowarn.xml">
             <stderr/> <!-- no warnings from missing xlint file: they are suppressed -->
-        </run>        
+        </run>
     </ajc-test>
 
     <ajc-test dir="ltw"
@@ -467,25 +467,25 @@
         <compile
             files="Main.java"
         >
-        </compile>    
+        </compile>
         <run class="Main" ltw="aop-noxlintfile-warnnone.xml">
             <stderr/> <!-- no warnings from missing xlint file: they are suppressed -->
         </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs154/pr172107" title="null returned from getField()"
 		keywords="pr172107">
         <compile files="ReadWriteAJBug172107.java,Instrumentation.aj"/>
 		<run class="ReadWriteAJBug172107"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs154/pr197719" title="annotation style syntax and cross package extension">
       <compile files="test/aspects/C1.java,test/aspects/C3.java,test/aspects/MyAnn.java,test/aspects/MyAnnAspect.java,test/aspects2/C2.java" options="-1.5"/>
       <run class="test.aspects2.C2"/>
     </ajc-test>
-    
+
     <ajc-test dir="bugs154/pr205907" title="new pointcut designators in a reference pointcut">
       <compile files="Test.aj"/>
     </ajc-test>
 
-</suite>
+</suite>

tests/src/test/resources/org/aspectj/systemtest/ajc1612/ajc1612.xml

@@ -10,7 +10,7 @@
      <line text="@AspectWithConstant$Loggable()"/>
      </stdout></run>
    </ajc-test>
-   
+
  <ajc-test dir="bugs1612/xmldefs" title="xml defined advice">
      <compile files="Hello.java JavaHelper.java"/>
      <run class="Hello" ltw="aop.xml">
@@ -21,7 +21,7 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
  <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 2">
      <compile files="Hello.java JavaHelper.java"/>
      <run class="Hello" ltw="aop2.xml">
@@ -39,7 +39,7 @@
        </stderr>
      </run>
    </ajc-test>
-   
+
  <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 3">
      <compile files="Hello.java JavaHelper.java"/>
      <run class="Hello" ltw="aop3.xml">
@@ -57,7 +57,7 @@
        </stderr>
      </run>
    </ajc-test>
-   
+
  <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 4">
      <compile files="Hello.java JavaHelper.java"/>
      <run class="Hello" ltw="aop4.xml">
@@ -75,8 +75,8 @@
        </stderr>
      </run>
    </ajc-test>
-   
-   
+
+
  <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 5">
      <compile files="Hello2.java JavaHelper.java"/>
      <run class="Hello2" ltw="aop5.xml">
@@ -87,8 +87,8 @@
        </stdout>
      </run>
    </ajc-test>
-   
-   
+
+
  <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 6">
      <compile files="Hello2.java JavaHelper.java"/>
      <run class="Hello2" ltw="aop6.xml">
@@ -100,7 +100,7 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
  <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 7">
      <compile files="Hello2.java JavaHelper.java"/>
      <run class="Hello2" ltw="aop7.xml">
@@ -124,7 +124,7 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
  <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 9">
      <compile files="Hello2.java JavaHelper.java"/>
      <run class="Hello2" ltw="aop9.xml">
@@ -133,7 +133,7 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
  <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 10">
      <compile files="Hello2.java JavaHelper.java"/>
      <run class="Hello2" ltw="aop10.xml">
@@ -143,7 +143,7 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
  <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 11">
      <compile files="Hello2.java JavaHelper.java"/>
      <run class="Hello2" ltw="aop11.xml">
@@ -153,7 +153,7 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
  <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 12">
      <compile files="Hello3.java JavaHelper.java"/>
      <run class="Hello3" ltw="aop12.xml">
@@ -165,7 +165,7 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
  <ajc-test dir="bugs1612/xmldefs" title="xml defined advice 13">
      <compile files="Hello2.java JavaHelper2.java"/>
      <run class="Hello2" ltw="aop13.xml">
@@ -455,7 +455,7 @@
 </ajc-test>
 
 <ajc-test dir="bugs1612/verify" title="verify perthis">
-<compile files="Runner.aj" inpath="code.jar" classpath="groovy-1.8.0.jar;asm-3.2.jar" options="-1.6 -Xset:generateStackMaps=true"/>
+<compile files="Runner.aj" inpath="code.jar" classpath="groovy-1.8.0.jar,asm-3.2.jar" options="-1.6 -Xset:generateStackMaps=true"/>
 <run class="Runner">
   <stdout>
   <line text="AA"/>
@@ -599,7 +599,7 @@
 <ajc-test dir="bugs1612/pr345172" title="incorrect annos">
 <compile files="InterType.java" options="-1.5 -showWeaveInfo">
 <message kind="weave" text="Join point 'method-execution(void InterType$InterTypeIfc.m1(int))' in Type 'InterType' (InterType.java:21) advised by around advice from 'InterType$AroundMethod' (InterType.java:12)"/>
-<!-- 
+<!--
 <message kind="weave" text="Join point 'method-execution(void InterType$InterTypeIfc.m1(int, int))' in Type 'InterType' (InterType.java:24) advised by around advice from 'InterType$AroundMethod' (InterType.java:12)"/>
 <message kind="weave" text="Join point 'method-execution(void InterType.m1(int))' in Type 'InterType' (InterType.java:28) advised by around advice from 'InterType$AroundMethod' (InterType.java:12)"/>
 -->
@@ -722,7 +722,7 @@
   	</stdout>
   	</run>
   </ajc-test>
-  
+
   <ajc-test dir="bugs1612/pr292239" title="throws clause - 2">
   	<compile files="Code2.java" options="-1.5 -showWeaveInfo">
   	  <message kind="weave" text="Join point 'method-execution(void mypackage.Code2.n2())' in Type 'mypackage.Code2' (Code2.java:17) advised by afterThrowing advice from 'mypackage.Azpect' (Code2.java:7)"/>
@@ -734,9 +734,9 @@
   	</stdout>
   	</run>
   </ajc-test>
-<!--  
+<!--
+
 
-  
   <ajc-test dir="bugs1611/pr336136" title="itit">
     <compile files="Country_Roo_Op4j.java">
     <message kind="error" text="The import com.foo cannot be resolved" line="1"/>
@@ -748,8 +748,8 @@
     <message kind="error" text="can't determine modifiers of missing type Country_Roo_Op4j$Keys"/>
     </compile>"
   </ajc-test>
-  
+
   -->
-  
-  
-</suite>
+
+
+</suite>

tests/src/test/resources/org/aspectj/systemtest/ajc162/ajc162.xml

@@ -2,51 +2,51 @@
 
 <!-- AspectJ v1.6.2 Tests -->
 <suite>
-	
-	
+
+
    <ajc-test dir="bugs162/pr247683" title="null delegate for array">
      <compile options="-1.5" files="A.java"/>
    </ajc-test>
-	
+
    <ajc-test dir="bugs162/IntoBinary" title="binary aspects model">
      <compile options="-1.5 -emacssym" files="Clazz.java" aspectpath="binaryaspect.jar"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs162/pr246918" title="ltw perclause">
      <compile options="-1.5" files="Code.java Dode.java" outjar="code.jar"/>
      <compile options="-1.5 -Xlint:ignore" files="Base.java" outjar="aspects.jar"/>
-     <run class="Code" classpath="aspects.jar;code.jar" ltw="aop1.xml">
+     <run class="Code" classpath="aspects.jar,code.jar" ltw="aop1.xml">
        <stderr>
          <line text="advice fired class Code"/>
          <line text="advice fired class Dode"/>
        </stderr>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="bugs162/pr246918" title="ltw perclause - 2">
      <compile options="-1.5" files="Code.java Dode.java" outjar="code.jar"/>
      <compile options="-1.5 -Xlint:ignore" files="Base.java" outjar="aspects.jar"/>
-     <run class="Code" classpath="aspects.jar;code.jar" ltw="aop2.xml">
+     <run class="Code" classpath="aspects.jar,code.jar" ltw="aop2.xml">
        <stderr>
          <line text="advice fired class Dode"/>
        </stderr>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="bugs162/pr246918" title="ltw perclause - 3">
      <compile options="-1.5" files="Code.java Dode.java" outjar="code.jar"/>
      <compile options="-1.5 -Xlint:ignore" files="Base2.java" outjar="aspects.jar"/>
-     <run class="Code" classpath="aspects.jar;code.jar" ltw="aop3.xml">
+     <run class="Code" classpath="aspects.jar,code.jar" ltw="aop3.xml">
        <stderr>
          <line text="advice fired class Dode"/>
        </stderr>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="bugs162/pr246918" title="ltw perclause - 4">
      <compile options="-1.5" files="Code.java Dode.java" outjar="code.jar"/>
      <compile options="-1.5 -Xlint:ignore" files="Base2.java" outjar="aspects.jar"/>
-     <run class="Code" classpath="aspects.jar;code.jar" ltw="aop4.xml">
+     <run class="Code" classpath="aspects.jar,code.jar" ltw="aop4.xml">
        <stderr>
          <line text="Unrecognized per clause specified"/>
          <line text="Concrete-aspect 'SubAspect' could not be registered"/>
@@ -54,17 +54,17 @@
        </stderr>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="bugs162/pr246264" title="anno value binding">
      <compile options="-1.5" files="A.java"/>
      <run class="A"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs162/pr211607" title="around advice proceed">
      <compile options="-1.5" files="Bug.java"/>
      <run class="Bug"/>
    </ajc-test>
-	
+
 	<ajc-test dir="bugs162/pr163005" title="advising joinpoints in interfaces">
 	  <compile files="SomeClass.java SomeInterface.java ProblemAspect.java" options="-1.4">
 	    <message kind="warning" text="Cannot advise join point 'method-call(java.lang.Class java.lang.Class.forName(java.lang.String))' in interface 'SomeInterface' with around advice from 'ProblemAspect.java' line '7' as it will lead to creation of code in an interface (compiler limitation, bug 163005)"/>
@@ -74,7 +74,7 @@
 
     <ajc-test dir="bugs162/pr176905" title="chained itds">
         <compile options="-1.5" files="ChainedItd.aj">
-        </compile>    
+        </compile>
         <run class="ChainedItd">
             <stderr/> <!-- no errors-->
         </run>
@@ -101,46 +101,46 @@
 	    <message kind="weave" text="Join point 'method-call(void test.aspects.C1.aMethod())' in Type 'test.aspects.C3' (C3.java:32) advised by around advice from 'test.aspects.MyAnnAspect' (MyAnnAspect.java:16)"/>
 	  </compile>
 	</ajc-test>
-	
+
 	<ajc-test dir="bugs162/pr211146" title="lost generic sig on itd">
 	  <compile files="GenericsLost.java" options="-1.5"/>
 	  <run class="GenericsLost"/>
 	</ajc-test>
-	
+
 	<ajc-test dir="bugs162/pr211146" title="lost generic sig on itd - 2">
 	  <compile files="GenericsLost2.java" outjar="code.jar" options="-1.5"/>
 	  <compile files="GenericsLost2Dep.java" classpath="$sandbox/code.jar" options="-1.5"/>
 	</ajc-test>
-	
+
 	<ajc-test dir="bugs162/pr211146" title="lost generic sig on itd - 3">
 	  <compile files="GenericsLost3.java" options="-1.5"/>
 	  <run class="GenericsLost3"/>
 	</ajc-test>
-	
+
 	<ajc-test dir="bugs162/pr211146" title="lost generic sig on itd - 4">
 	  <compile files="GenericsLost4.java" options="-1.5"/>
 	  <run class="GenericsLost4"/>
 	</ajc-test>
-	
+
 	<ajc-test dir="bugs162/pr211146" title="lost generic sig on itd - 5">
 	  <compile files="GenericsLost5.java" options="-1.5"/>
 	  <run class="GenericsLost5"/>
 	</ajc-test>
-	
+
 	<ajc-test dir="bugs162/pr194429" title="missing context">
 	  <compile files="A.java" options="-1.5">
 	    <message kind="error" line="14" text="incompatible type, expected java.util.Set found BindingTypePattern("/>
 	  </compile>
 	</ajc-test>
-	
+
 	<ajc-test dir="bugs162/pr210114" title="warnings for limitations">
 	  <compile files="TestAspect.java" options="-1.5">
 	  	<message kind="warning" text="Only before advice is supported on handler join points (compiler limitation)"/>
 	  	<message kind="warning" text="around on initialization not supported (compiler limitation)"/>
-	  	<message kind="warning" text="around on pre-initialization not supported (compiler limitation)"/>	  
+	  	<message kind="warning" text="around on pre-initialization not supported (compiler limitation)"/>
 	  </compile>
 	</ajc-test>
-	
+
 	<ajc-test dir="bugs162/pr244830" title="ptw initFailureCause">
 	  <compile files="PTW.java" options="-1.5"/>
 	  <run class="PTW"/>
@@ -153,7 +153,7 @@
 	<ajc-test dir="bugs162/pr222648" title="generic itds - overrides - 2">
 	  <compile files="X.java" options="-1.5"/>
 	</ajc-test>
-	
+
  	<ajc-test dir="bugs162/pr145391" title="itd calling generic method">
      <compile files="GenericType.java" options="-1.5"/>
      <run class="GenericType"/>
@@ -164,7 +164,7 @@
        <message kind="error" text="The method getValue(V) in the type GenericType2&lt;V&gt; is not applicable for the arguments"/>
      </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs162/pr241047" title="generic decp">
         <compile files="SomeAspect.java SomeBaseClass.java SomeSubClass.java SomeSubClass2.java SomeSubClass3.java SomeInterface.java SomeBaseClass2.java SomeBaseClass3.java" options=" -Xlint:ignore -1.5">
         </compile>
@@ -184,8 +184,8 @@
               <line text="some sub method3"/>
           </stdout>
         </run>
-    </ajc-test> 
-    
+    </ajc-test>
+
     <ajc-test dir="bugs162/pr241047/case2" title="generic decp - 2">
         <compile files="SomeAspect.java SomeBaseClass.java SomeSubClass.java SomeInterface.java" options=" -Xlint:ignore -1.5">
         </compile>
@@ -197,120 +197,120 @@
               <line text="some sub method"/>
           </stdout>
         </run>
-    </ajc-test> 
+    </ajc-test>
 
     <ajc-test dir="bugs162/pr239539" title="public pointcut">
         <compile files="PrintAround.java PrintAroundFoo.java Foo.java" options="-1.5">
 	        <message kind="error" line="7" text="pointcut 'bar.PrintAround.method()' is not visible from type "/>
         </compile>
-    </ajc-test> 
+    </ajc-test>
 
     <ajc-test dir="bugs162/pr242797/case1" title="generic itds - 1">
         <compile files="ClassUtils.java CMEFinder.java Finder.java H2Deployment.java Localized.java LocalizedFinder.java OnetElement.java OnetFinder.java Partitioned.java PartitionedFinder.java" options="-1.5">
         </compile>
-    </ajc-test> 
-    
+    </ajc-test>
+
     <ajc-test dir="bugs162/pr242797/case2" title="generic itds - 2">
         <compile files="GenericMethodAspect.aj GenericMethodInterface.java GenericMethodImpl.java" options="-1.5">
         </compile>
-    </ajc-test> 
+    </ajc-test>
 
     <ajc-test dir="bugs162/pr242797/case3" title="generic itds - 3">
         <compile files="GenericMethodAspect.aj GenericMethodInterface.java GenericMethodImpl.java GenericMethodImpl2.java Type1.java Type2.java" options="-1.5">
         </compile>
-    </ajc-test> 
- 
+    </ajc-test>
+
   	<ajc-test dir="bugs162/pr241847" title="param annos pipelining">
     	<compile files="Asp.aj Ann.java CC.java II.java LongLong.java" options="-1.5 -showWeaveInfo">
     		<message kind="weave" text="Join point 'method-execution(void LongLong.m1(java.lang.String))' in Type 'LongLong' (LongLong.java:2) advised by before advice from 'Asp' (Asp.aj:5)"/>
     		<message kind="weave" line="3"/>
     	</compile>
-    </ajc-test>    
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs162/pr239441" title="annotation decp">
     	<compile files="Test3.java SampleAspect.java" options="-1.5 -showWeaveInfo -XhasMember">
     	</compile>
-    </ajc-test>    
+    </ajc-test>
 
     <ajc-test dir="bugs162/pr241861" title="param annotation inner class">
      <compile files="Outer.java Ann.java Asp.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Join point 'constructor-execution(void Outer$Inner.&lt;init&gt;(Outer, java.lang.String))' in Type 'Outer$Inner' (Outer.java:5) advised by before advice from 'Asp' (Asp.java:2)"/>
      </compile>
-    </ajc-test>    
-    
+    </ajc-test>
+
     <ajc-test dir="bugs162/pr241861" title="param annotation inner class - 2">
         <compile files="X.java" options="-1.5 -showWeaveInfo">
           <message kind="weave" text="Join point 'constructor-execution(void Outer$Inner.&lt;init&gt;(Outer, java.lang.Integer))' in Type 'Outer$Inner' (X.java:7) advised by before advice from 'Asp' (X.java:2)"/>
         </compile>
-    </ajc-test>    
-    
+    </ajc-test>
+
     <ajc-test dir="bugs162/pr241861" title="param annotation inner class - 3">
         <compile files="Y.java" options="-1.5 -showWeaveInfo">
           <message kind="weave" text="Join point 'constructor-execution(void Outer$Inner.&lt;init&gt;(Outer, java.lang.String))' in Type 'Outer$Inner' (Y.java:7) advised by before advice from 'Asp' (Y.java:2)"/>
         </compile>
-    </ajc-test>    
-    
+    </ajc-test>
+
     <ajc-test dir="bugs162/pr240693" title="privileged generics">
         <compile files="PayloadClass.java SomeInterface.java GenericClassInAdvice.java" options="-1.5">
         </compile>
-    </ajc-test>    
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs162/pr238992" title="annotation value decp">
     	<compile files="Foo.java" options="-1.5 -showWeaveInfo">
     	  <message kind="weave" text="Extending interface set for type 'Goo'"/>
     	</compile>
     	<run class="Foo"/>
-    </ajc-test>    
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs162/pr238992" title="annotation value decp - 2">
     	<compile files="Foo2.java" options="-1.5 -showWeaveInfo">
     	  <message kind="weave" text="Extending interface set for type 'Goo'"/>
     	  <message kind="weave" text="Extending interface set for type 'Hoo'"/>
     	</compile>
     	<run class="Foo2"/>
-    </ajc-test>    
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs162/pr238992" title="annotation value decp - 3">
     	<compile files="Foo3.java" options="-1.5 -showWeaveInfo">
     	  <message kind="weave" text="Extending interface set for type 'Goo'"/>
     	</compile>
     	<run class="Foo3"/>
-    </ajc-test>    
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs162/pr238992" title="annotation value decp - 4">
     	<compile files="Foo4.java" options="-1.5 -showWeaveInfo">
     	  <message kind="weave" text="Extending interface set for type 'Goo'"/>
     	  <message kind="weave" text="Extending interface set for type 'Hoo'"/>
     	</compile>
     	<run class="Foo4"/>
-    </ajc-test>    
-    
+    </ajc-test>
+
 	<ajc-test dir="bugs162/pr238992" title="annotation value decp - 5">
     	<compile files="Foo5.java" options="-1.5 -showWeaveInfo">
     	  <message kind="weave" text="Extending interface set for type 'Goo'"/>
     	  <message kind="weave" text="Extending interface set for type 'Hoo'"/>
     	</compile>
     	<run class="Foo5"/>
-    </ajc-test>    
-    
+    </ajc-test>
+
     <ajc-test dir="bugs162/pr233718" title="parameter subsetting - matching">
         <compile files="Matching.java" options="-1.5 -showWeaveInfo">
           <message kind="weave" text="Join point 'method-execution(void Matching.m(java.lang.String))' in Type 'Matching' (Matching.java:3) advised by before advice from 'Matching' (Matching.java:8)"/>
           <message kind="weave" text="'method-execution(void Matching.m(java.lang.String, java.lang.String))' in Type 'Matching' (Matching.java:4) advised by before advice from 'Matching' (Matching.java:8)"/>
-          <message kind="weave" text="'method-execution(void Matching.m(int, java.lang.String))' in Type 'Matching' (Matching.java:5) advised by before advice from 'Matching' (Matching.java:8)"/>        
+          <message kind="weave" text="'method-execution(void Matching.m(int, java.lang.String))' in Type 'Matching' (Matching.java:5) advised by before advice from 'Matching' (Matching.java:8)"/>
         </compile>
-    </ajc-test>    
+    </ajc-test>
 
     <ajc-test dir="bugs162/pr233718" title="parameter subsetting - args matching">
         <compile files="ArgsMatching.java" options="-1.5 -showWeaveInfo">
  <!--
           <message kind="weave" text="Join point 'method-execution(void Matching.m(java.lang.String))' in Type 'Matching' (Matching.java:3) advised by before advice from 'Matching' (Matching.java:8)"/>
           <message kind="weave" text="'method-execution(void Matching.m(java.lang.String, java.lang.String))' in Type 'Matching' (Matching.java:4) advised by before advice from 'Matching' (Matching.java:8)"/>
-          <message kind="weave" text="'method-execution(void Matching.m(int, java.lang.String))' in Type 'Matching' (Matching.java:5) advised by before advice from 'Matching' (Matching.java:8)"/>        
+          <message kind="weave" text="'method-execution(void Matching.m(int, java.lang.String))' in Type 'Matching' (Matching.java:5) advised by before advice from 'Matching' (Matching.java:8)"/>
  -->
         </compile>
-    </ajc-test>    
-    
+    </ajc-test>
+
     <ajc-test dir="bugs162/pr233718" title="parameter subsetting - args binding">
         <compile files="ArgsBinding.java" options="-1.5"/>
         <run class="ArgsBinding">
@@ -319,8 +319,8 @@
             <line text="0) b"/>
           </stdout>
         </run>
-    </ajc-test>    
-    
+    </ajc-test>
+
     <ajc-test dir="bugs162/pr198181" title="ataspectj ltw pertarget">
       <compile files="M.java" outjar="code.jar"/>
       <compile files="A.java" classpath="code.jar" options="-1.5 -Xlint:ignore"/>
@@ -333,4 +333,4 @@
       </run>
     </ajc-test>
 
-</suite>
+</suite>

tests/src/test/resources/org/aspectj/systemtest/ajc167/ajc167.xml

@@ -21,17 +21,17 @@
        </stdout>
      </run>
   </ajc-test>
-  
+
   <ajc-test dir="bugs167/pr296484" title="optimizing annotation binding">
      <compile files="AnnoBinding.java" options="-1.5"/>
      <run class="AnnoBinding"/>
   </ajc-test>
-  
+
   <ajc-test dir="bugs167/pr296484" title="optimizing annotation binding - 2">
      <compile files="Perf.java" options="-1.5"/>
      <run class="Perf"/>
   </ajc-test>
-  
+
   <ajc-test dir="bugs167/pr295092" title="perthis ltw">
      <compile files="AbstractAspect.aj" options="-1.5" outjar="aspects.jar"/>
      <compile files="Wibble.java"/>
@@ -44,12 +44,12 @@
        <message kind="error" text="cannot convert"/>
      </compile>
   </ajc-test>
-  
+
   <ajc-test dir="bugs167/pr296040" title="broken generated code">
      <compile files="ErrorClass.java" options="-1.5" classpath="gc10rc4.jar"/>
      <run class="ErrorClass"/>
   </ajc-test>
-  
+
   <ajc-test dir="bugs167/pr293457" title="hierarchy builder npe">
      <compile files="com/citi/gdos/smart/applib/service/cache/CachingIntroduction.aj org/springmodules/cache/annotations/Cacheable.java" options="-1.5 -emacssym">
      <message kind="warning" text="no match for this type name: Setter"/>
@@ -57,11 +57,11 @@
      <message kind="error" text="The attribute modelId is undefined for the"/>
      </compile>
   </ajc-test>
-  
+
   <ajc-test dir="features167/timers/one" title="timers - 1">
     <compile files="Code.java Code2.java" outjar="code.jar" options="-1.5 -Xlint:ignore"/>
     <compile files="Asp.java" options="-1.5 -Xlint:ignore" outjar="asp.jar"/>
-    <run class="Code2" ltw="aop.xml" classpath="code.jar;asp.jar">
+    <run class="Code2" ltw="aop.xml" classpath="code.jar,asp.jar">
       <stderr>
         <line text="info AspectJ"/>
         <line text="info register"/>
@@ -77,7 +77,7 @@
       </stderr>
     </run>
   </ajc-test>
-  
+
   <ajc-test dir="features167/timers/one" title="timers - 2">
     <compile files="Code.java Code2.java Asp.java" options="-1.5 -timers -Xset:timersPerJoinpoint=8,timersPerFastMatchCall=3">
 <!--        <line text="info AspectJ"/>
@@ -101,13 +101,13 @@
        <message kind="weave" text="Join point 'method-execution(void pkg.C.m())' in Type 'pkg.C' (CaseOne.java:10) advised by before advice from 'pkg.X' (CaseOne.java:14)"/>
      </compile>
   </ajc-test>
-  
+
   <ajc-test dir="bugs167/pr293510" title="execution fastmatch - 2">
      <compile files="CaseTwo.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Join point 'method-execution(void pkg.C.m())' in Type 'pkg.C' (CaseTwo.java:9) advised by before advice from 'pkg.X' (CaseTwo.java:13)"/>
      </compile>
   </ajc-test>
-  
+
   <ajc-test dir="bugs167/pr293203" title="anno matching">
      <compile files="Foo.java" options="-1.5"/>
      <run class="Foo">
@@ -118,7 +118,7 @@
        </stdout>
      </run>
   </ajc-test>
-  
+
   <ajc-test dir="bugs167/pr288064" title="outer class names - scala">
      <compile files="Main.java Outer.java Aspect.java" options="-1.5"/>
      <run class="test.Main">
@@ -128,16 +128,16 @@
        </stdout>
      </run>
   </ajc-test>
-  
+
   <ajc-test dir="bugs167/pr288064" title="outer class names - scala - ltw">
      <compile files="Main.java Outer.java" outjar="app.jar" options="-1.5"/>
      <compile files="Aspect.java" outjar="asp.jar" options="-Xlint:ignore -1.5"/>
-     <run class="test.Main" classpath="app.jar;asp.jar" ltw="aop.xml">
+     <run class="test.Main" classpath="app.jar,asp.jar" ltw="aop.xml">
        <stdout>
          <line text="advice"/>
          <line text="method"/>
        </stdout>
      </run>
   </ajc-test>
-   
-</suite>
+
+</suite>

tests/src/test/resources/org/aspectj/systemtest/ajc169/ajc169.xml

@@ -16,14 +16,14 @@
   	 	<message kind="weave" text="'public void Person.getin()' (DAMethod2.java:21) is annotated with @Annot method annotation from 'DAMethod2' (DAMethod2.java:28)"/>
   	 </compile>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr287613" title="compound declare patterns - method - 1">
   	 <compile files="DAMethod1.java" options="-1.5 -showWeaveInfo">
   	 	<message kind="weave" text="'public java.lang.String Person.getString()' (DAMethod1.java:9) is annotated with @Annot method annotation from 'DAMethod1' (DAMethod1.java:15)"/>
   	 	<message kind="weave" text="'public boolean Person.isSet()' (DAMethod1.java:10) is annotated with @Annot method annotation from 'DAMethod1' (DAMethod1.java:15)"/>
   	 </compile>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr315820" title="multiple annos running - 1">
   	 <compile files="MultiAnno2.java" options="-1.5"/>
   	 <run class="MultiAnno2">
@@ -32,11 +32,11 @@
   	 </stdout>
   	 </run>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr315820" title="multiple annos parsing">
   	 <compile files="MultiAnno.java" options="-1.5"/>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr287613" title="compound declare patterns - fields - 2">
   	 <compile files="Target.java" options="-1.5"/>
   	 <run class="Target">
@@ -52,29 +52,29 @@
   	 <line text="@Annot3()"/>
   	 </stdout></run>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr287613" title="compound declare patterns - fields - 1">
   	 <compile files="DeclareAnnot.java" options="-1.5"/>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr287613" title="compound declare patterns - methodctor - 1">
   	 <compile files="DeclareAnnotMethodCtor.java" options="-1.5"/>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr310506" title="optional aspects">
      <compile files="Anno.java" outjar="anno.jar" options="-1.5"/>
      <compile files="AspectA.java" classpath="anno.jar" outjar="aspect.jar" options="-Xlint:ignore -1.5"/>
      <compile files="AspectB.java" outjar="aspect2.jar" options="-Xlint:ignore -1.5"/>
-     <compile files="Code.java" classpath="aspect.jar;aspect2.jar" options="-1.5"/>
+     <compile files="Code.java" classpath="aspect.jar,aspect2.jar" options="-1.5"/>
      <file deletefile="anno.jar"/>
-     <run class="Code" ltw="META-INF/aop.xml" classpath=".;aspect.jar;aspect2.jar">
+     <run class="Code" ltw="META-INF/aop.xml" classpath=".,aspect.jar,aspect2.jar">
      <stderr>
      <line text="AspectJ Weaver Version"/>
      <line text="register classloader"/>
      <line text="using configuration"/>
      <line text="register aspect"/>
      <line text="deactivating aspect"/>
-     <line text="register aspect"/>     
+     <line text="register aspect"/>
      <line text="processing reweavable"/>
      </stderr>
      <stdout>
@@ -83,19 +83,19 @@
      </stdout>
      </run>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr310506" title="optional aspects 2">
      <compile files="Anno.java" outjar="anno.jar" options="-1.5"/>
      <compile files="AspectA.java" classpath="anno.jar" outjar="aspect.jar" options="-Xlint:ignore -1.5"/>
      <compile files="AspectB.java" outjar="aspect2.jar" options="-Xlint:ignore -1.5"/>
-     <compile files="Code.java Code2.java" classpath="anno.jar;aspect.jar;aspect2.jar" options="-1.5"/>
-     <run class="Code2" ltw="META-INF/aop.xml" classpath=".;aspect.jar;aspect2.jar">
+     <compile files="Code.java Code2.java" classpath="anno.jar,aspect.jar,aspect2.jar" options="-1.5"/>
+     <run class="Code2" ltw="META-INF/aop.xml" classpath=".,aspect.jar,aspect2.jar">
      <stderr>
      <line text="AspectJ Weaver Version"/>
      <line text="register classloader"/>
      <line text="using configuration"/>
      <line text="register aspect"/>
-     <line text="register aspect"/>     
+     <line text="register aspect"/>
      <line text="processing reweavable"/>
      <line text="processing reweavable"/>
      </stderr>
@@ -117,11 +117,11 @@
        <message kind="warning" text="no match for this type name: AnnotationWithParamAndTypo [Xlint:invalidAbsoluteTypeName]"/>
      </compile>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr314840" title="validate branch recursion">
      <compile files="Arguments.aj Test1.java Test2.java Test.java" options="-1.5"/>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr313026/one" title="clashing declare annos">
      <compile files="Target.java Asp.java Bsp.java Wibble.java Precedence1.java" options="-1.5 -Xlint:ignore"/>
      <run class="Target">
@@ -130,7 +130,7 @@
        </stdout>
      </run>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr312839/one" title="class file size - 1">
      <compile files="Class.java X.aj" options="-1.5"/>
      <run class="com.wibble.foo.Class">
@@ -139,7 +139,7 @@
        </stdout>
      </run>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr122460/one" title="scoping ltw - 3">
      <compile files="A.java" options="-1.5 -Xlint:ignore" outjar="aspects.jar"/>
      <compile files="Code.java Runner.java"/>
@@ -149,7 +149,7 @@
      </stdout>
      </run>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr122460/one" title="scoping ltw - 1">
      <compile files="A.java" options="-1.5 -Xlint:ignore" outjar="aspects.jar"/>
      <compile files="Code.java Runner.java"/>
@@ -161,7 +161,7 @@
      </stdout>
      </run>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr122460/one" title="scoping ltw - 2">
      <compile files="A.java" options="-1.5 -Xlint:ignore" outjar="aspects.jar"/>
      <compile files="Code.java Runner.java"/>
@@ -172,7 +172,7 @@
      </stdout>
      </run>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr307009" title="declare soft and call - 1">
    	<compile files="Test.java Test2.java Ann.java Bug.aj" options="-1.5 -showWeaveInfo">
    		<message kind="weave" text="Softening exceptions in type 'Test' (Test.java:4) as defined by aspect 'Bug' (Bug.aj:3)"/>
@@ -184,11 +184,11 @@
    		<message kind="weave" text="Softening exceptions in type 'Test' (Test.java:4) as defined by aspect 'Bug' (Bug.aj:3)"/>
    	</compile>
    </ajc-test>
-   
+
    <ajc-test dir="bugs169/pr310043" title="rogue error">
    	<compile files="B.java" classpath="code.jar" aspectpath="code.jar"/>
    </ajc-test>
-   
+
    <ajc-test dir="bugs169/pr309743" title="itd marker annotations - 1">
      <compile files="A.java" options="-1.5"/>
      <run class="A">
@@ -197,7 +197,7 @@
        </stdout>
      </run>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr309743" title="itd marker annotations - 2">
      <compile files="B.java" options="-1.5"/>
      <run class="B">
@@ -206,24 +206,24 @@
        </stdout>
      </run>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr309336" title="pipelining and generics">
      <compile files="NoSystemStreams.aj UseOperators.java Operators.java" options="-1.5">
        <message kind="warning" text="No system.out"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr308773" title="subtle generics problem">
      <compile files="Aspy.aj Zzz.java Top.java Middle.java" options="-1.5"/>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr307147" title="advising privileged access method">
      <compile files="B.java Test2.java" options="-showWeaveInfo">
        <message kind="weave" text="Type 'B' (B.java) has intertyped method from 'Test'"/>
        <message kind="weave" text="Join point 'field-get(int A.goo)' in Type 'Test'"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr307120" title="advising privileged access member">
      <compile files="A.java Test.java" options="-showWeaveInfo">
        <message kind="weave" text="Type 'A' (A.java) has intertyped method from 'Test'"/> <!-- getFoo and getGoo -->
@@ -231,12 +231,12 @@
        <message kind="weave" text="Join point 'field-get(int A.foo)' in Type 'Test'"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr309440" title="crash param annos">
      <compile files="foobar/ExportMode.java" classpath="jsr305.jar" options="-1.6"/>
      <compile files="foobar/CrashAspectJCompiler.java" classpath="jsr305.jar" options="-1.6"/>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr307120" title="advising privileged access member - 2">
      <compile files="Test.java A.java" options="-showWeaveInfo">
        <message kind="weave" text="Type 'A' (A.java) has intertyped method from 'Test'"/> <!-- getFoo and getGoo -->
@@ -244,81 +244,81 @@
        <message kind="weave" text="Join point 'field-get(int A.foo)' in Type 'Test'"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr292262" title="if with statically recognizable code">
      <compile files="A.java">
        <message kind="weave" text="Join point 'staticinitialization(void SimpleClass.&lt;clinit&gt;())' in Type 'SimpleClass'"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr44365" title="type category type patterns - class">
      <compile files="SimpleClass.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Join point 'staticinitialization(void SimpleClass.&lt;clinit&gt;())' in Type 'SimpleClass'"/>
        <message kind="weave" text="Join point 'staticinitialization(void Bar.&lt;clinit&gt;())' in Type 'Bar'"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr44365" title="type category type patterns - interface">
      <compile files="SimpleInterface.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Join point 'staticinitialization(void Foo.&lt;clinit&gt;())' in Type 'Foo'"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr44365" title="type category type patterns - enum">
      <compile files="SimpleEnum.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Join point 'staticinitialization(void Foo.&lt;clinit&gt;())' in Type 'Foo'"/>
      </compile>
   </ajc-test>
-   
+
    <ajc-test dir="bugs169/pr44365" title="type category type patterns - annotation">
      <compile files="SimpleAnnotation.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Join point 'staticinitialization(void WibbleAnno.&lt;clinit&gt;())' in Type 'WibbleAnno'"/>
      </compile>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr44365" title="type category type patterns - anonymous">
      <compile files="SimpleAnonymous.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Join point 'staticinitialization(void Bar$1.&lt;clinit&gt;())' in Type 'Bar$1'"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr44365" title="type category type patterns - inner">
      <compile files="SimpleInner.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Join point 'staticinitialization(void Bar$Inner.&lt;clinit&gt;())' in Type 'Bar$Inner'"/>
        <message kind="weave" text="Join point 'staticinitialization(void Bar$1.&lt;clinit&gt;())' in Type 'Bar$1'"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr44365" title="type category type patterns - inner - 2">
      <compile files="SimpleInner2.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Join point 'staticinitialization(void Bar$Inner.&lt;clinit&gt;())' in Type 'Bar$Inner'"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr44365" title="type category type patterns - inner - 3">
      <compile files="SimpleInner3.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Join point 'method-execution(void Bar$Inner.foo())' in Type 'Bar$Inner' (SimpleInner3.java:12) advised"/>
      </compile>
   </ajc-test>
-   
+
    <ajc-test dir="bugs169/pr44365" title="type category type patterns - aspect">
      <compile files="SimpleAspect.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Join point 'staticinitialization(void X.&lt;clinit&gt;())' in Type 'X'"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr44365" title="type category type patterns - e1">
      <compile files="Errors1.java" options="-1.5 -showWeaveInfo">
        <message kind="error" text="Syntax error on token &quot;(&quot;, &quot;)"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr44365" title="type category type patterns - e2">
      <compile files="Errors5.java" options="-1.5 -showWeaveInfo">
        <message kind="error" text="Syntax error on token &quot;)&quot;, &quot;(&quot; expected"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr44365" title="type category type patterns - e3">
      <compile files="Errors2.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Join point 'method-execution(void Errors2.is(java.lang.String))' in Type"/>
@@ -344,19 +344,19 @@
        <message kind="warning" text="test 18{}23"/>
      </compile>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr299062" title="verifyerror on atAj">
      <compile files="Test.java Work.java SmartAspect.java Idempotent.java" options="-1.5"/>
      <run class="Test">
      </run>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr298665" title="ambiguous method">
      <compile files="Main.java" options="-1.5"/>
      <run class="Main">
      </run>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr298388" title="declare mixin and generics">
      <compile files="PR298388.java" options="-1.5"/>
      <run class="PR298388">
@@ -365,11 +365,11 @@
        </stdout>
      </run>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr295491" title="model annotation npe">
      <compile files="SpringConfigurableMixin.java" options="-1.5 -emacssym"/>
   </ajc-test>
-  
+
    <ajc-test dir="bugs169/pr292584" title="annotation around advice verifyerror">
      <compile files="AbstractAspect.java,ClassWithJoinPoint.java,ConcreteAspect.java" options="-1.5"/>
      <run class="ClassWithJoinPoint">
@@ -379,22 +379,22 @@
        </stdout>
      </run>
   </ajc-test>
-  
+
   <!-- declare type warning -->
-  
+
   <ajc-test dir="bugs169/pr291206" title="declare type warning - 1">
      <compile files="One.java" options="-1.5">
        <message kind="warning" line="8" text="Nothing should be"/>
      </compile>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr291206" title="declare type warning - 2">
      <compile files="Two.java" options="-1.5">
        <message kind="warning" line="7" text="Missing foo()"/>
        <message kind="warning" line="13" text="Missing foo()"/>
      </compile>
   </ajc-test>
-  
+
   <!-- testing build of model with one of these in -->
   <ajc-test dir="bugs169/pr291206" title="declare type warning - 3">
      <compile files="Two.java" options="-1.5 -emacssym">
@@ -402,12 +402,12 @@
        <message kind="warning" line="13" text="Missing foo()"/>
      </compile>
   </ajc-test>
-  
+
   <ajc-test dir="bugs169/pr291206" title="declare type error - 1">
      <compile files="Three.java" options="-1.5">
        <message kind="error" line="7" text="Missing foo()"/>
        <message kind="error" line="13" text="Missing foo()"/>
      </compile>
   </ajc-test>
-  
-</suite>
+
+</suite>

tests/src/test/resources/org/aspectj/systemtest/ajc172/ajc172.xml

@@ -7,61 +7,61 @@
       	<message kind="error" text="Compiler limitation: annotation value support not implemented for type java.lang.String[]"/>
       </compile>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr394535" title="signatures">
       <compile files="Bug.java" options="-1.5"/>
       <compile files="Bug2.java" options="-1.5"/>
       <run class="Bug2"/>
       <run class="Bug"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr399590" title="p signatures 1">
       <compile files="Cage.java" options="-1.5"/>
       <compile files="Cage2.java" options="-1.5"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr399590/two" title="p signatures 2">
       <compile files="Cage.java" options="-1.5"/>
       <compile files="Cage2.java" options="-1.5"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr399590/three" title="p signatures 3">
       <compile files="Cage.java" options="-1.5"/>
       <compile files="Cage2.java" options="-1.5"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr399590/four" title="p signatures 4">
       <compile files="Cage.java" options="-1.5"/>
       <compile files="Cage2.java" options="-1.5"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr399590/five" title="p signatures 5">
       <compile files="Cage.java" options="-1.5"/>
       <compile files="Cage2.java" options="-1.5"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr398588" title="optional aspects">
 	     <compile files="Anno.java Anno2.java" outjar="anno.jar" options="-1.5"/>
 	     <compile files="AspectA.java" classpath="anno.jar" outjar="aspect.jar" options="-Xlint:ignore -1.5"/>
 	     <compile files="AspectB.java" outjar="aspect2.jar" options="-Xlint:ignore -1.5"/>
-	     <compile files="Code.java Blah.java" classpath="aspect.jar;aspect2.jar" options="-1.5"/>
-		 <compile files="AspectC.java" classpath="$sandbox" outjar="aspect3.jar" options="-Xlint:ignore -1.5"/>	     
+	     <compile files="Code.java Blah.java" classpath="aspect.jar,aspect2.jar" options="-1.5"/>
+		 <compile files="AspectC.java" classpath="$sandbox" outjar="aspect3.jar" options="-Xlint:ignore -1.5"/>
 	     <compile files="AspectD.java" classpath="anno.jar" outjar="aspect4.jar" options="-Xlint:ignore -1.5"/>
-	     
+
 	     <file deletefile="anno.jar"/>
-	     <run class="Code" ltw="META-INF/aop.xml" classpath=".;aspect.jar;aspect2.jar;aspectj3.jar;aspect4.jar">
+	     <run class="Code" ltw="META-INF/aop.xml" classpath=".,aspect.jar,aspect2.jar,aspectj3.jar,aspect4.jar">
 	     <stderr>
 	     <line text="AspectJ Weaver Version"/>
 	     <line text="register classloader"/>
 	     <line text="using configuration"/>
 	     <line text="register aspect AspectA"/>
 	     <line text="deactivating aspect"/>
-	     <line text="register aspect AspectB"/>     
-	     <line text="register aspect AspectC"/>   
+	     <line text="register aspect AspectB"/>
+	     <line text="register aspect AspectC"/>
 	     <line text="register aspect AspectD"/>
 	     <line text="deactivating aspect 'AspectD' as it requires type 'a.b.c.Anno2' which cannot be found on the classpath"/>
 	     <line text="Join point 'method-execution(void Code.main(java.lang.String[]))' in Type 'Code' (Code.java:7) advised by before advice from 'AspectC'"/>
-	     <line text="Join point 'staticinitialization(void Code.&lt;clinit&gt;())' in Type 'Code' (Code.java) advised by before advice from 'AspectB'"/>  
+	     <line text="Join point 'staticinitialization(void Code.&lt;clinit&gt;())' in Type 'Code' (Code.java) advised by before advice from 'AspectB'"/>
 	     <line text="processing reweavable"/>
 	     <line text="processing reweavable"/>
 	     </stderr>
@@ -72,7 +72,7 @@
 	     </stdout>
 	     </run>
 	</ajc-test>
-	
+
 	<ajc-test dir="bugs172/pr398246" title="if pointcut names">
       <compile files="Code.java" options="-1.5">
       </compile>
@@ -83,7 +83,7 @@
       	</stdout>
       </run>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr398246" title="if pointcut names 2">
       <compile files="Code2.java" options="-1.5">
       </compile>
@@ -94,10 +94,10 @@
       	</stdout>
       </run>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr398246" title="if pointcut names 3">
       <compile files="Code3.java" options="-1.5">
-      </compile> 
+      </compile>
       <run class="Code3" options="-1.5">
       	<stdout>
       	<line text="advice"/>
@@ -105,11 +105,11 @@
       	</stdout>
       </run>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr398246" title="if pointcut names 4">
-      <compile files="Code4.java" options="-1.5"></compile> 
+      <compile files="Code4.java" options="-1.5"></compile>
       <compile files="Code4.java" options="-1.5" outjar="aspects.jar"/>
-      <run class="Code4" options="-1.5"> 
+      <run class="Code4" options="-1.5">
       	<stdout>
       	<line text="advice"/>
       	<line text="advice"/>
@@ -123,7 +123,7 @@
       	</stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs172/pr398246" title="if pointcut names 5">
       <compile files="Code5.java Code5a.java" options="-1.5">
       </compile>
@@ -136,18 +136,18 @@
       	</stdout>
       </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs172/pr398246" title="if pointcut names 6">
       <compile files="Code6.java" options="-1.5">
       </compile>
       <run class="Code6" options="-1.5">
-      	<stdout>      	
+      	<stdout>
       	<line text="advice"/>
       	<line text="advice"/>
       	</stdout>
       </run>
     </ajc-test>
-    
+
      <ajc-test dir="bugs172/pr398246" title="if pointcut names 7">
       <compile files="Code7.java" options="-1.5">
       </compile>
@@ -158,43 +158,43 @@
       	</stdout>
       </run>
     </ajc-test>
-  
+
 	<ajc-test dir="bugs172/pr389750" title="inconsistent class file">
       <compile files="Code.aj" options="-1.5">
       </compile>
       <compile files="Clazz.java" options="-1.5"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr389750" title="inconsistent class file 2">
       <compile files="Code2.aj" outjar="azpect.jar" options="-1.5">
       </compile>
       <compile files="Clazz2.java" aspectpath="azpect.jar" options="-1.5"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr389750" title="inconsistent class file 3">
       <compile files="Code3.aj" outjar="azpect.jar" options="-1.5">
       </compile>
       <compile files="Clazz3.java" aspectpath="azpect.jar" options="-1.5"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr389750" title="inconsistent class file 4">
       <compile files="Code4.aj" outjar="azpect.jar" options="-1.5">
       </compile>
       <compile files="Clazz4.java" aspectpath="azpect.jar" options="-1.5"/>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr389752" title="annotation value error 1">
       <compile files="Code.java" options="-1.5">
       	<message kind="error" text="Invalid annotation value 'AA', expected enum value"/>
       </compile>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr389752" title="annotation value error 2">
       <compile files="Code2.java" options="-1.5">
       	<message kind="error" text="Invalid annotation value 'AA', expected enum value"/>
       </compile>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs172/pr389752" title="annotation value error 3">
       <compile files="Code3.java" options="-1.5">
       	<message kind="error" text="Invalid annotation value 'AA', expected enum value"/>

tests/src/test/resources/org/aspectj/systemtest/ajc190/ajc190.xml

@@ -78,7 +78,7 @@
 
   <ajc-test dir="bugs190/modules/fff" title="compile module including aspects">
     <compile files="module-info.java pkg/Demo.java otherpkg/Azpect.java" modulepath="$runtimemodule" outjar="demomodule.jar" options="-1.9"/>
-    <run modulepath="$runtimemodule;demomodule.jar" module="demo/pkg.Demo">
+    <run modulepath="$runtimemodule,demomodule.jar" module="demo/pkg.Demo">
       <stdout>
       <line text="Azpect running"/>
       <line text="Demo running"/>
@@ -95,7 +95,7 @@
     		<message kind="weave" text="Join point 'method-execution(void aaa.bbb.A.main(java.lang.String[]))' in Type 'aaa.bbb.A' (A.java:4) advised by before advice from 'aspects.Azpect' (azpects.jar!Azpect.class:4(from Azpect.java))"/>
     </compile>
     <file deletefile="my.module.jar"/>
-    <run classpath="my.module.woven.jar;azpects.jar" class="aaa.bbb.A">
+    <run classpath="my.module.woven.jar,azpects.jar" class="aaa.bbb.A">
       <stdout>
       <line text="Azpect running"/>
       <line text="A running"/>
@@ -179,7 +179,7 @@
     		<message kind="weave" text="Join point 'method-execution(void aaa.bbb.A.main(java.lang.String[]))' in Type 'aaa.bbb.A' (A.java:4) advised by before advice from 'aspects.Azpect' (azpects.jar!Azpect.class:4(from Azpect.java))"/>
     </compile>
     <file deletefile="my.module.jar"/>
-    <run classpath="my.module.woven.jar;azpects.jar" class="aaa.bbb.A">
+    <run classpath="my.module.woven.jar,azpects.jar" class="aaa.bbb.A">
       <stdout>
       <line text="Azpect running"/>
       <line text="A running"/>

tests/src/test/resources/org/aspectj/systemtest/ajc193/ajc193.xml

@@ -8,7 +8,7 @@
 	        <message kind="weave" text="Join point 'method-execution(int ma.Main$Dummy.retryTranslateAndTimeLimited())' in Type 'ma.Main$Dummy' (Main.java:16) advised by around advice from 'ma.aspect2.Aspect2' (Aspect2.java:11)"/>
 	        <message kind="weave" text="Join point 'method-execution(int ma.Main$Dummy.retryTranslateAndTimeLimited())' in Type 'ma.Main$Dummy' (Main.java:16) advised by around advice from 'ma.aspect1.Aspect1' (Aspect1.java:12)"/>
         </compile>
-        <!-- 
+        <!--
         >In Aspect1
 >In Aspect2
 >In Aspect3
@@ -50,7 +50,7 @@ Method call
 	        </stdout>
         </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs193/543657" vm="1.8" title="overweaving decm - reweaving">
         <compile files="MoodIndicator.java,Code1.java" options="-showWeaveInfo -1.8" outjar="one.jar">
 	        <message kind="weave" text="Mixing interface 'MoodIndicator$Moody' (MoodIndicator.java) into type 'Code1' (Code1.java)"/>
@@ -68,7 +68,7 @@ Method call
 	        </stdout>
         </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs193/543657" vm="1.8" title="overweaving decm - 1">
         <compile files="MoodIndicator.java,Code1.java" options="-showWeaveInfo -1.8" outjar="one.jar">
 	        <message kind="weave" text="Mixing interface 'MoodIndicator$Moody' (MoodIndicator.java) into type 'Code1' (Code1.java)"/>
@@ -88,7 +88,7 @@ Method call
 	        </stdout>
         </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs193/543657" vm="1.8" title="overweaving decm - 2">
         <compile files="MoodIndicator.java,Code1.java" options="-showWeaveInfo -1.8" outjar="one.jar">
 	        <message kind="weave" text="Mixing interface 'MoodIndicator$Moody' (MoodIndicator.java) into type 'Code1' (Code1.java)"/>
@@ -108,7 +108,7 @@ Method call
 	        </stdout>
         </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs193/543657" vm="1.8" title="mood indicator 4">
         <compile files="MoodIndicator4.java" options="-1.8" outjar="one.jar">
         </compile>
@@ -146,7 +146,7 @@ Method call
 	        </stdout>
         </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs193/543657" vm="1.8" title="overweaving atdecp">
         <compile files="Basic3b.java" options="-showWeaveInfo -1.8" outjar="ow1.jar">
 	        <message kind="weave" text="Extending interface set for type 'Basic3b' (Basic3b.java) to include 'X$I' (Basic3b.java)"/>
@@ -161,7 +161,7 @@ Method call
 	        <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Basic3b' (Basic3b.java:11) advised by before advice from 'X' (Basic3b.java:33)"/>
         </compile>
         <compile files="Y.java" inpath="ow1.jar" options="-showWeaveInfo -1.8 -Xset:overWeaving=true">
-        
+
 	        <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Y$IIimpl' (Y.java:10) advised by before advice from 'Y' (Y.java:17)"/>
 	        <message kind="weave" text="Join point 'method-call(void java.io.PrintStream.println(java.lang.String))' in Type 'Y$IIimpl' (Y.java:10) advised by before advice from 'X' (ow1.jar!X.class(from Basic3b.java))"/>
 	        <message kind="weave" text="Join point 'method-call(void X.advice1())' in Type 'X$IIimpl' (Basic3b.java:23) advised by before advice from 'Y' (Y.java:17)"/>
@@ -246,7 +246,7 @@ Method call
 	        </stdout>
         </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs193/389678" vm="1.8" title="overweaving 3">
         <compile files="OverWeave_1/src/Application.java,OverWeave_1/src/MyAspect.aj" options="-showWeaveInfo -1.8" outjar="ow1.jar">
 	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect' (MyAspect.aj:2)"/>
@@ -284,7 +284,7 @@ Method call
 	        </stdout>
         </run>
     </ajc-test>
-    
+
     <ajc-test dir="bugs193/389678" vm="1.8" title="overweaving 4">
         <compile files="OverWeave_1/src/Application.java,OverWeave_1/src/MyAspect.aj" options="-showWeaveInfo -1.8" outjar="ow1.jar">
 	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect' (MyAspect.aj:2)"/>
@@ -303,19 +303,19 @@ Method call
 	        <message kind="weave" text="Join point 'method-execution(void Application.main(java.lang.String[]))' in Type 'Application' (Application.java:2) advised by before advice from 'MyAspect2' (ow2.jar!MyAspect2.class:2(from MyAspect2.aj))"/>
  	        <message kind="weave" text="Join point 'method-execution(void Application.sayHelloTo(java.lang.String))' in Type 'Application' (Application.java:6) advised by before advice from 'MyAspect2' (ow2.jar!MyAspect2.class:2(from MyAspect2.aj))"/>
         </compile>
-         <compile inpath="ow3.jar" aspectpath="ow4.jar:ow2.jar" options="-1.8">
+         <compile inpath="ow3.jar" aspectpath="ow4.jar,ow2.jar" options="-1.8">
 	        <message kind="error" text="the type Application was previously subject to overweaving and after that can only be woven again in overweaving mode"/>
  	        <message kind="error" text="the type MyAspect was previously subject to overweaving and after that can only be woven again in overweaving mode"/>
         </compile>
     </ajc-test>
-    
+
     <ajc-test dir="bugs193/542682" vm="1.5" title="wildcard enum match in itd">
         <compile files="SimpleEnum.java,SimpleEnum2.java,EnumAspect04.aj" options="-1.5">
             <message kind="warning" line="8" text="enum type SimpleEnum2 matches a declare parents type pattern but is being ignored"/>
             <message kind="warning" line="8" text="enum type SimpleEnum matches a declare parents type pattern but is being ignored"/>
         </compile>
     </ajc-test>
-    
+
 	<ajc-test dir="bugs193/542682" title="declare mixin a">
 		<compile files="CaseA.java" options="-1.8">
 	        <message kind="warning" line="1" text="enum type Color matches a declare parents type pattern but is being ignored"/>
@@ -327,7 +327,7 @@ Method call
 		  </stdout>
 		</run>
 	</ajc-test>
-	
+
 	<ajc-test dir="bugs193/isAbstractType" title="is abstract">
 	<compile files="Code.java" options="-1.8"/>
 	<run class="Code">
@@ -336,7 +336,7 @@ Method call
 	  </stdout>
 	</run>
 	</ajc-test>
-	
+
 	<ajc-test dir="bugs193/isAbstractType" title="is abstract - 2">
 	<compile files="Code2.java" options="-1.8"/>
 	<run class="Code2">
@@ -346,7 +346,7 @@ Method call
 	</run>
 	</ajc-test>
 
-<!-- 
+<!--
   <ajc-test dir="bugs191/var" title="var 3">
     <compile files="Code3.java" options="-10">
 	</compile>

tests/src/test/resources/org/aspectj/systemtest/apt/apt-spec.xml

@@ -50,7 +50,7 @@
 
         <!--apt_service_description.jar contains only SPI description file - META-INF/services/javax.annotation.processing.Processor-->
         <compile options="-1.8 -s generated -showWeaveInfo" files="Some.java"
-                 classpath="annotation_processor.jar;apt_service_description.jar" outjar="code.jar">
+                 classpath="annotation_processor.jar,apt_service_description.jar" outjar="code.jar">
             <message kind="weave"
                      text="Type 'test.Some' (Some.java) has intertyped field from 'test.SomeEventsAspect' (SomeEventsAspect.aj:'test.SomeEventsAspect$SomeOnMethod1Event test.Some.OnMethod1Event')"/>
             <message kind="weave"