[jboss-svn-commits] JBL Code SVN: r14722 - in labs/jbossesb/trunk/product: install and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2007-08-29 05:50:17 -0400 (Wed, 29 Aug 2007)
New Revision: 14722

Modified:
   labs/jbossesb/trunk/product/build.xml
   labs/jbossesb/trunk/product/install/build.xml
Log:
cleanup install of contract.war: JBESB-935

Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml	2007-08-29 09:41:13 UTC (rev 14721)
+++ labs/jbossesb/trunk/product/build.xml	2007-08-29 09:50:17 UTC (rev 14722)
@@ -289,10 +289,6 @@
 		<copy file="tools/configeditor/editor/resources/action-templates.xml" todir="${org.jboss.esb.installationdirectory}/tools/configeditor/resources"/>
 		<copy file="tools/configeditor/editor/README.txt" todir="${org.jboss.esb.installationdirectory}/tools/configeditor"/>
         <copy file="tools/console/contract-web/build/contract.war" todir="${org.jboss.esb.installationdirectory}/tools/contract" failonerror="false" />
-
-        <!-- This is just to satisfy the integration build. See http://jira.jboss.com/jira/browse/JBESB-921 -->
-        <mkdir dir="tools/contract"/>
-        <copy file="tools/console/contract-web/build/contract.war" todir="tools/contract" failonerror="false" />
     </target>
 
 	<!-- produce a product distribution -->
@@ -421,7 +417,6 @@
         <delete>
             <fileset dir="." includes="**/build/**/*,**/target/**/*"/>
         </delete>
-        <delete dir="tools/contract"/>
     </target>
 
 	<!-- Short target names -->

Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2007-08-29 09:41:13 UTC (rev 14721)
+++ labs/jbossesb/trunk/product/install/build.xml	2007-08-29 09:50:17 UTC (rev 14722)
@@ -142,7 +142,7 @@
           </copy>
 
           <!-- contracts app -->
-          <copy file="../tools/contract/contract.war" todir="${deploy.dir}" />
+          <copy file="${org.jboss.esb.dist}/tools/contract/contract.war" todir="${deploy.dir}" />
 
     </target>