Return-Path: 
 <svn-return-8047-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 33810 invoked from network); 1 Oct 2008 14:33:52 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Oct 2008 14:33:52 -0000
Received: (qmail 38048 invoked by uid 500); 1 Oct 2008 14:33:50 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 38007 invoked by uid 500); 1 Oct 2008 14:33:50 -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 37998 invoked by uid 99); 1 Oct 2008 14:33:50 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 07:33:50 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Oct 2008 14:32:56 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 42AAC2388882; Wed,  1 Oct 2008 07:33:31 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r700787 - in /forrest/trunk/main: forrest.build.xml
 targets/validate.xml
Date: Wed, 01 Oct 2008 14:33:31 -0000
To: svn@forrest.apache.org
From: crossley@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081001143331.42AAC2388882@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: crossley
Date: Wed Oct  1 07:33:30 2008
New Revision: 700787

URL: http://svn.apache.org/viewvc?rev=700787&view=rev
Log:
Define xmlcatalog "fcatalog" at the top-level.
Fixes one of the Ant warnings about "referencing ids defined in non-executed targets"
Issue: FOR-1120

Modified:
    forrest/trunk/main/forrest.build.xml
    forrest/trunk/main/targets/validate.xml

Modified: forrest/trunk/main/forrest.build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/forrest.build.xml?rev=700787&r1=700786&r2=700787&view=diff
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Wed Oct  1 07:33:30 2008
@@ -36,6 +36,15 @@
   <property name="forrest.build.lib-dir"      location="${forrest.home}/build"/>
   <property name="forrest.core"               location="${forrest.home}/main"/>
   <property name="forrest.core.webapp"        location="${forrest.core}/webapp"/>
+  <xmlcatalog id="fcatalog">
+    <catalogpath>
+      <pathelement
+        location="${forrest.core.webapp}/resources/schema/catalog.xcat"/>
+      <pathelement
+        location="${forrest.plugins-dir}/catalog.xcat"/>
+      <pathelement location="${catalog}"/>
+    </catalogpath>
+  </xmlcatalog>
   <import file="targets/validate.xml"/>
   <import file="targets/webapp.xml"/>
   <import file="targets/site.xml"/>

Modified: forrest/trunk/main/targets/validate.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/validate.xml?rev=700787&r1=700786&r2=700787&view=diff
==============================================================================
--- forrest/trunk/main/targets/validate.xml (original)
+++ forrest/trunk/main/targets/validate.xml Wed Oct  1 07:33:30 2008
@@ -112,15 +112,7 @@
     </fail>
     <xmlvalidate failonerror="${forrest.validate.site.failonerror}" lenient="no" warn="yes">
       <attribute name="http://apache.org/xml/features/validation/dynamic"  value="true"/>
-      <xmlcatalog id="fcatalog" >
-        <catalogpath>
-          <pathelement
-            location="${forrest.core.webapp}/resources/schema/catalog.xcat"/>
-          <pathelement
-            location="${forrest.plugins-dir}/catalog.xcat"/>
-          <pathelement location="${catalog}"/>
-        </catalogpath>
-      </xmlcatalog>
+      <xmlcatalog refid="fcatalog" />
       <fileset dir="${project.site-dir}"
         includes="${forrest.validate.xdocs.includes}"
         excludes="${forrest.validate.xdocs.excludes}"/>