[jboss-cvs] JBossAS SVN: r59144 - projects/aop/trunk/aop

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

Author: kabir.khan at jboss.com
Date: 2006-12-19 08:42:42 -0500 (Tue, 19 Dec 2006)
New Revision: 59144

Modified:
   projects/aop/trunk/aop/.classpath
   projects/aop/trunk/aop/build-tests-jdk50.xml
Log:
[JBAOP-287] include the microcontainer jars in the test classpath again since the metadata is more tightly integrated now

Modified: projects/aop/trunk/aop/.classpath
===================================================================
--- projects/aop/trunk/aop/.classpath	2006-12-19 13:40:42 UTC (rev 59143)
+++ projects/aop/trunk/aop/.classpath	2006-12-19 13:42:42 UTC (rev 59144)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="org/jboss/aop/AnnotationIntroductionDef.java|org/jboss/aop/Aspect.java|org/jboss/aop/Bind.java|org/jboss/aop/CFlowDef.java|org/jboss/aop/CFlowStackDef.java|org/jboss/aop/DeclareError.java|org/jboss/aop/DeclareWarning.java|org/jboss/aop/DynamicCFlowDef.java|org/jboss/aop/InterceptorDef.java|org/jboss/aop/Introduction.java|org/jboss/aop/Mixin.java|org/jboss/aop/PointcutDef.java|org/jboss/aop/Precedence.java|org/jboss/aop/PrecedenceAdvice.java|org/jboss/aop/PrecedenceInterceptor.java|org/jboss/aop/Prepare.java|org/jboss/aop/TypeDef.java|org/jboss/aop/advice/Scope.java|org/jboss/aop/annotation/AnnotationElement.java|org/jboss/aop/hook/JRockitClassPreProcessor.java|org/jboss/aop/hook/JRockitPluggableClassPreProcessor.java|org/jboss/aspects/Threadbased.java" kind="src" path="src/main"/>
-	<classpathentry kind="src" path="src/jdk15"/>
+	<classpathentry excluding="org/jboss/aop/hook/JRockitClassPreProcessor.java|org/jboss/aop/hook/JRockitPluggableClassPreProcessor.java" kind="src" path="src/main"/>
 	<classpathentry kind="src" path="src/test"/>
 	<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
@@ -14,7 +13,7 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
-	<classpathentry sourcepath="/javassist" kind="lib" path="/thirdparty/javassist/lib/javassist.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar" sourcepath="/javassist"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>

Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml	2006-12-19 13:40:42 UTC (rev 59143)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml	2006-12-19 13:42:42 UTC (rev 59144)
@@ -86,9 +86,9 @@
          <path refid="jboss/common.logging.log4j.classpath"/>
          <path refid="jboss/common.logging.jdk.classpath"/>
          <path refid="jboss/common.logging.spi.classpath"/>
-         <!--<path refid="jboss.microcontainer.classpath"/>-->
+         <path refid="jboss.microcontainer.classpath"/>
          <path refid="jboss.test.classpath"/>
-          <path refid="junit.junit.classpath"/>
+         <path refid="junit.junit.classpath"/>
          <path refid="oswego.concurrent.classpath"/>
          <path refid="qdox.classpath"/>
          <path refid="trove.classpath"/>
@@ -211,7 +211,6 @@
          <classpath refid="test.classpath"/>
          <include name="**/*.java"/>
          <exclude name="org/jboss/test/aop/memoryleaks/**/*.java"/>
-         <exclude name="**/methodhashing/*"/>
       </javac>
    </target>
 
@@ -405,6 +404,7 @@
          <sysproperty key="jboss.aop.class.path" value="${jboss.aop.class.path}"/>
          <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
          <sysproperty key="jboss.aop.debug.classes" value="true"/>
+         <!--sysproperty key="jboss.aop.verbose" value="true"/-->
          <sysproperty key="jboss-junit-configuration" value="${caller}"/>
       	<formatter type="plain" extension="-${caller}.txt"/>
       	<classpath refid="test.classpath"/>
@@ -667,8 +667,6 @@
          <src path="${source.tests.java}/org/jboss/test/aop/annotationc"/>
       </annotationc>
 
-      <echo>org/jboss/test/aop/methodhashing/MethodHashingTestCase will fail until the microcontainer has been updated in the repository</echo>
-
       <junit printsummary="yes" fork="no" haltonfailure="no" >
          <sysproperty key="jboss.aop.debug.classes" value="false"/>
          <classpath>