[jboss-cvs] JBossAS SVN: r57561 - trunk/testsuite

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2006-10-11 08:32:38 -0400 (Wed, 11 Oct 2006)
New Revision: 57561

Modified:
   trunk/testsuite/.classpath
   trunk/testsuite/build.xml
Log:
Make jboss-aop-jdk50.jar come before jboss-aop.jar so that we can have tests with JDK 5 annotations

Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath	2006-10-11 09:22:07 UTC (rev 57560)
+++ trunk/testsuite/.classpath	2006-10-11 12:32:38 UTC (rev 57561)
@@ -73,8 +73,8 @@
 	<classpathentry kind="lib" path="/thirdparty/sun-opends/lib/OpenDS.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jdk14-pluggable-instrumentor.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/pluggable-instrumentor.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2006-10-11 09:22:07 UTC (rev 57560)
+++ trunk/testsuite/build.xml	2006-10-11 12:32:38 UTC (rev 57561)
@@ -362,11 +362,12 @@
    <target name="compile-annotated-classes-50" if="HAVE_JDK_1.5">
      <mkdir dir="${build.classes}"/>
 
-     <!-- Make sure that jdk 50 aspect library comes first, since that contains the
+     <!-- Make sure that jdk 50 aspect library and jboss aop comes first, since these contains the
          JDK 5 version of the annotation types
      -->
      <path id="annotations.classpath">
-       <pathelement path="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/>
+      <pathelement path="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/>
+      <pathelement path="${jboss.aop.lib}/jboss-aop-jdk50.jar"/>
        <path refid="tests.classpath"/>
      </path>
      <javac destdir="${build.classes}"