forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r419415 - /forrest/trunk/main/targets/site.xml
Date Thu, 06 Jul 2006 02:45:11 GMT
Author: crossley
Date: Wed Jul  5 19:45:11 2006
New Revision: 419415

URL: http://svn.apache.org/viewvc?rev=419415&view=rev
Log:
Doing 'forrest site' was erroneously copying *.xslt to the generated site.
Issue: FOR-237

Modified:
    forrest/trunk/main/targets/site.xml

Modified: forrest/trunk/main/targets/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/site.xml?rev=419415&r1=419414&r2=419415&view=diff
==============================================================================
--- forrest/trunk/main/targets/site.xml (original)
+++ forrest/trunk/main/targets/site.xml Wed Jul  5 19:45:11 2006
@@ -81,7 +81,6 @@
           </copy>
   
           <!-- Copy skin images -->
-          <!-- The following lines are causing FOR-237 -->
           <echo message="Copying main skin images to site ..."/>
           <mkdir dir="${project.site-dir}/skin/images"/>
            <!-- FIXME: we will only be using either project skins or forrest skins - only
copy those necessary (don't forget common) -->
@@ -89,11 +88,15 @@
            <!-- Do the common ones first followed by those for the skin. -->
           <copy toDir="${project.site-dir}/skin/images" overwrite="true"
             failonerror="false">
-             <fileset dir="${forrest.skins-dir}/common/images"/>
+             <fileset dir="${forrest.skins-dir}/common/images">
+               <exclude name="**/*.xslt"/>
+             </fileset>
           </copy>
           <copy toDir="${project.site-dir}/skin/images" overwrite="true"
             failonerror="false">
-             <fileset dir="${forrest.skins-dir}/${project.skin}/images"/>
+             <fileset dir="${forrest.skins-dir}/${project.skin}/images">
+               <exclude name="**/*.xslt"/>
+             </fileset>
           </copy>
   
           <!-- Copy project skin images -->
@@ -105,7 +108,9 @@
           </copy>
           <copy toDir="${project.site-dir}/skin/images" overwrite="true"
             failonerror="false">
-            <fileset dir="${project.skins-dir}/${project.skin}/images"/>
+            <fileset dir="${project.skins-dir}/${project.skin}/images">
+              <exclude name="**/*.xslt"/>
+            </fileset>
           </copy>
   
           <!-- Copy all other non-resource files -->
@@ -118,6 +123,8 @@
             <fileset dir="${forrest.skins-dir}/common">
               <exclude name="images/**"/>
               <exclude name="xslt/**"/>
+              <exclude name="**/*.xslt"/>
+              <exclude name="skinconf.xsl"/>
             </fileset>
           </copy>
           <copy toDir="${project.site-dir}/skin" 
@@ -127,6 +134,8 @@
             <fileset dir="${forrest.skins-dir}/${project.skin}">
               <exclude name="images/**"/>
               <exclude name="xslt/**"/>
+              <exclude name="**/*.xslt"/>
+              <exclude name="skinconf.xsl"/>
             </fileset>
           </copy>
           
@@ -141,6 +150,7 @@
             <fileset dir="${project.skins-dir}/common">
               <exclude name="images/**"/>
               <exclude name="xslt/**"/>
+              <exclude name="**/*.xslt"/>
             </fileset>
           </copy>
           <copy toDir="${project.site-dir}/skin" 
@@ -150,6 +160,7 @@
             <fileset dir="${project.skins-dir}/${project.skin}">
               <exclude name="images/**"/>
               <exclude name="xslt/**"/>
+              <exclude name="**/*.xslt"/>
             </fileset>
           </copy>
           <echo>



Mime
View raw message