[jboss-cvs] JBossAS SVN: r60272 - in branches/Branch_4_2/testsuite: imports/sections and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2007-02-04 15:02:56 -0500 (Sun, 04 Feb 2007)
New Revision: 60272

Modified:
   branches/Branch_4_2/testsuite/build.xml
   branches/Branch_4_2/testsuite/imports/sections/cluster.xml
Log:
Reenable aop in cluster jars
Fix webservice classpath

Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml	2007-02-04 19:42:26 UTC (rev 60271)
+++ branches/Branch_4_2/testsuite/build.xml	2007-02-04 20:02:56 UTC (rev 60272)
@@ -85,6 +85,12 @@
   
   &libraries;
   
+  <!-- define jbossws classpath explicitly because jbossws/lib contains other integration layers as well -->
+  <path id="jbossws.integration.classpath">
+    <pathelement path="${jboss.jbossws.lib}/jbossws-jboss42-integration.jar"/>
+    <pathelement path="${jboss.jbossws.lib}/jbossws-client.jar"/>
+  </path>
+  
   <!-- The combined library classpath -->
   <path id="library.classpath">
     <path refid="apache.avalon.classpath"/>
@@ -108,6 +114,7 @@
     <path refid="jboss.profiler.jvmti.classpath"/>
     <path refid="jboss.remoting.classpath"/>
     <path refid="jboss.web.classpath"/>    
+    <path refid="jbossws.integration.classpath"/>
     <path refid="jgroups.jgroups.classpath"/>
     <path refid="joesnmp.joesnmp.classpath"/>
     <path refid="junit.junit.classpath"/>

Modified: branches/Branch_4_2/testsuite/imports/sections/cluster.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/sections/cluster.xml	2007-02-04 19:42:26 UTC (rev 60271)
+++ branches/Branch_4_2/testsuite/imports/sections/cluster.xml	2007-02-04 20:02:56 UTC (rev 60272)
@@ -183,16 +183,16 @@
       </annotationc>
 
       <!-- Temporarily disabled, breaks testsuite build -->
-      <!--aopc compilerclasspathref="aop.task.classpath" verbose="true">
+      <aopc compilerclasspathref="aop.task.classpath" verbose="true">
          <classpath refid="thirdparty.classpath"/>
          <classpath path="${build.classes}"/>
          <classpath refid="jboss.tomcat.classpath"/>
          <src path="${build.classes}"/>
          <include name="org/jboss/test/cluster/web/aop/**"/>
-      	 <!- - 
-           aopc seems to pick up jboss-web-cluster.aop's file, from jboss.tomcat.classpath and fails if we add another
-         <aoppath path="${source.resources}/cluster/http/jboss-aop.xml"/- ->
-      </aopc-->
+      	 <!-- aopc seems to pick up jboss-web-cluster.aop's file, from jboss.tomcat.classpath and fails if we add another
+         <aoppath path="${source.resources}/cluster/http/jboss-aop.xml"/>
+         -->
+      </aopc>
       
 
       <!-- build http-scoped-field.war -->