Return-Path: 
 <cvs-return-26857-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 46322 invoked from network); 7 Apr 2006 14:33:15 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 7 Apr 2006 14:33:15 -0000
Received: (qmail 9800 invoked by uid 500); 7 Apr 2006 14:33:07 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 9722 invoked by uid 500); 7 Apr 2006 14:33:07 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 9688 invoked by uid 99); 7 Apr 2006 14:33:07 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Apr 2006 07:33:07 -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: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Fri, 07 Apr 2006 07:33:07 -0700
Received: (qmail 45995 invoked by uid 65534); 7 Apr 2006 14:32:46 -0000
Message-ID: <20060407143246.45994.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r392303 -
 /cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl
Date: Fri, 07 Apr 2006 14:32:46 -0000
To: cvs@cocoon.apache.org
From: cziegeler@apache.org
X-Mailer: svnmailer-1.0.7
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: cziegeler
Date: Fri Apr  7 07:32:44 2006
New Revision: 392303

URL: http://svn.apache.org/viewcvs?rev=392303&view=rev
Log:
use mount resources

Modified:
    cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl

Modified: cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl?rev=392303&r1=392302&r2=392303&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl Fri Apr  7 07:32:44 2006
@@ -172,13 +172,25 @@
           <patternset refid="unprocessed.sources"/>
         </fileset>
       </copy>
-
       <copy filtering="off" todir="${{build.blocks}}/@{{name}}/dest">
         <fileset dir="@{{dir}}/java">
           <include name="**/Manifest.mf"/>
           <include name="META-INF/**"/>
         </fileset>
       </copy>
+      <!--  Test for resources of blocks that are mounted from trunk -->
+      <if>
+        <available file="@{{dir}}/resources"/>
+        <then>
+          <copy filtering="on" todir="${{build.blocks}}/@{{name}}/dest">
+            <fileset dir="@{{dir}}/resources">
+              <exclude name="META-INF/**"/>
+              <exclude name="WEB-INF/**"/>
+            </fileset>
+          </copy>
+        </then>
+      </if>
+      <!-- Create the jar -->
       <jar jarfile="${{build.blocks}}/@{{name}}-block.jar" index="true">
         <fileset dir="${{build.blocks}}/@{{name}}/dest">
           <include name="@{{package}}/**"/>
@@ -402,6 +414,18 @@
               <copy todir="${{build.blocks}}/@{{name}}/test" filtering="on">
                 <fileset dir="@{{dir}}/test" excludes="**/*.java"/>
               </copy>
+              <!--  Test for resources of blocks that are mounted from trunk -->
+              <if>
+                <available file="@{{dir}}/test-resources"/>
+                <then>
+                  <copy filtering="on" todir="${{build.blocks}}/@{{name}}/test">
+                    <fileset dir="@{{dir}}/test-resources">
+                      <exclude name="META-INF/**"/>
+                      <exclude name="WEB-INF/**"/>
+                    </fileset>
+                  </copy>
+                </then>
+              </if>
 
               <javac destdir="${{build.blocks}}/@{{name}}/test"
                      debug="${{compiler.debug}}"