[Hyperic-hq-discuss] hq r7913 - trunk/build_util

[<rp...@hy...>]

Author: rpack
Date: 2008-02-26 22:04:51 -0800 (Tue, 26 Feb 2008)
New Revision: 7913
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7913

Modified:
   trunk/build_util/jboss-build.xml
Log:
Added delete of the jboss-aop directory. Javaassist version conflicts with tapestry's newer version.

Modified: trunk/build_util/jboss-build.xml
===================================================================
--- trunk/build_util/jboss-build.xml	2008-02-27 05:37:56 UTC (rev 7912)
+++ trunk/build_util/jboss-build.xml	2008-02-27 06:04:51 UTC (rev 7913)
@@ -166,6 +166,9 @@
 
     <!-- Remove jboss bundled hibernate libararies.  We are using version 3.1.3 -->
     <delete failonerror="false" dir="${jboss-deploy-dir}/jboss-hibernate.deployer" />
+    
+    <!-- Remove jboss aop directory. Javaassist conflicts with tapestry's version 3.6.GA. -->
+    <delete verbose="true" dir="${jboss.home}/server/default/deploy/jboss-aop.deployer"/>
 
     <delete dir="${jboss-deploy-dir}/lather-jboss.sar" />
     <unzip src="${lather.lib}/lather-jboss.sar"