Return-Path: 
 <svn-return-5847-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 91616 invoked from network); 6 Jul 2006 02:45:34 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 6 Jul 2006 02:45:34 -0000
Received: (qmail 94667 invoked by uid 500); 6 Jul 2006 02:45:33 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 94604 invoked by uid 500); 6 Jul 2006 02:45:33 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 94593 invoked by uid 99); 6 Jul 2006 02:45:33 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jul 2006 19:45:33 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jul 2006 19:45:32 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0F1BF1A981A; Wed,  5 Jul 2006 19:45:12 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r419415 - /forrest/trunk/main/targets/site.xml
Date: Thu, 06 Jul 2006 02:45:11 -0000
To: svn@forrest.apache.org
From: crossley@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060706024512.0F1BF1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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>