forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r700787 - in /forrest/trunk/main: forrest.build.xml targets/validate.xml
Date Wed, 01 Oct 2008 14:33:31 GMT
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}"/>



Mime
View raw message