svn commit: rev 46312 - forrest/trunk/src/core/targets

[cr...@apache.org]

Author: crossley
Date: Sat Sep 18 19:19:42 2004
New Revision: 46312

Modified:
   forrest/trunk/src/core/targets/context.xml
   forrest/trunk/src/core/targets/webapp.xml
Log:
Removed the copying of project-specific *.xmap files by the "copy-sitemap"
target. Since the change to copyless, doing 'forrest war' was causing
the project sitemap.xmap to clobber the main forrest sitemap.
Submitted by: Rick Tessner
Issue: FOR-295


Modified: forrest/trunk/src/core/targets/context.xml
==============================================================================
--- forrest/trunk/src/core/targets/context.xml	(original)
+++ forrest/trunk/src/core/targets/context.xml	Sat Sep 18 19:19:42 2004
@@ -88,8 +88,6 @@
   <target name="copy-sitemap" if="sitemap.present">
     <copy toDir="${project.webapp}" filtering="false" overwrite="true" failonerror="false">
       <fileset dir="${sitemap-dir}">
-        <exclude name="*-${version}.xmap"/>
-        <include name="*.xmap"/>
         <include name="jtidy.properties"/>
       </fileset>
     </copy>

Modified: forrest/trunk/src/core/targets/webapp.xml
==============================================================================
--- forrest/trunk/src/core/targets/webapp.xml	(original)
+++ forrest/trunk/src/core/targets/webapp.xml	Sat Sep 18 19:19:42 2004
@@ -130,15 +130,6 @@
     <copy toDir="${project.webapp}/project/build/tmp"
       file="${project.temp-dir}/build-info.xml"/>
 
-    <!-- copy custom xmaps -->
-    <copy toDir="${project.webapp}" 
-      overwrite="true"
-      failonerror="false">
-      <fileset dir="${project.content-dir}">
-        <include name="*.xmap"/>
-      </fileset>
-    </copy>
-      
     <loadfile  property="webapp-generated-message" 
       srcFile="${forrest.home}/var/webapp-generated-message.txt">
         <filterchain><expandproperties/></filterchain>