[Jboss-cvs] JBossAS SVN: r57020 - trunk/aop

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

Author: kabir.khan at jboss.com
Date: 2006-09-20 12:30:46 -0400 (Wed, 20 Sep 2006)
New Revision: 57020

Modified:
   trunk/aop/build.xml
Log:
[JBAOP-286] Weaken dependencies on unreleased MC 2.0

Modified: trunk/aop/build.xml
===================================================================
--- trunk/aop/build.xml	2006-09-20 16:30:11 UTC (rev 57019)
+++ trunk/aop/build.xml	2006-09-20 16:30:46 UTC (rev 57020)
@@ -86,7 +86,7 @@
          <path refid="oswego.concurrent.classpath"/>
          <path refid="junit.junit.classpath"/>
          <path refid="jboss.profiler.jvmti.classpath"/>
-         <path refid="jboss.microcontainer.classpath"/>
+         <!--<path refid="jboss.microcontainer.classpath"/>-->
       </path>
 
       <!-- Defines jrockit.home -->
@@ -150,6 +150,7 @@
 
       <!-- The classpath required to build classes. -->
       <path id="javac.classpath">
+         <path refid="jboss.microcontainer.classpath"/>
          <pathelement path="${classpath}"/>
          <pathelement path="${local.classpath}"/>
          <path refid="thirdparty.classpath"/>
@@ -615,6 +616,7 @@
          <include name="**/*.java"/>
          <exclude name="org/jboss/test/aop/jdk15*/**/*.java"/>
          <exclude name="org/jboss/test/aop/memoryleaks/**/*.java"/>
+         <exclude name="**/methodhashing/*"/>
       </javac>
    </target>
 
@@ -751,7 +753,7 @@
       </antcall>
       <antcall target="_run-bootclasspath-test" inheritRefs="true">
          <param name="test" value="reflection"/>
-      </antcall>      
+      </antcall>
       <antcall target="_run-bootclasspath-test" inheritRefs="true">
          <param name="test" value="regression"/>
       </antcall>
@@ -822,7 +824,7 @@
 	         <isset property="aop.xml"/>
 	      </not>
 	   </condition>
-   	
+
       <!-- Get -Djboss.aop.class.path from passed in parameters -->
       <condition property="jboss.aop.class.path" value="-Djboss.aop.class.path=${build.tests.classes}">
          <isset property="use.annotations"/>
@@ -1220,7 +1222,7 @@
       		   <include name="org/jboss/test/aop/annotationc/AnnotationTester.class"/>
 		      </fileset>
 		   </batchtest>
-      	
+
       </junit>
    </target>