svn commit: r721076 - in /forrest/trunk/main: forrest.build.xml targets/validate.xml

[cr...@apache.org]

Author: crossley
Date: Wed Nov 26 19:55:26 2008
New Revision: 721076

URL: http://svn.apache.org/viewvc?rev=721076&view=rev
Log:
A better way to report the set of xmlcatalog files being used.
Define a "path" structure and show it using toString:...

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=721076&r1=721075&r2=721076&view=diff
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Wed Nov 26 19:55:26 2008
@@ -36,13 +36,14 @@
   <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"/>
+  <path id="fcatalog.path">
+    <pathelement location="${forrest.core.webapp}/resources/schema/catalog.xcat"/>
+    <pathelement location="${forrest.plugins-dir}/catalog.xcat"/>
+    <pathelement location="${catalog}"/>
+  </path>
   <xmlcatalog id="fcatalog">
     <catalogpath>
-      <pathelement
-        location="${forrest.core.webapp}/resources/schema/catalog.xcat"/>
-      <pathelement
-        location="${forrest.plugins-dir}/catalog.xcat"/>
-      <pathelement location="${catalog}"/>
+      <path refid="fcatalog.path"/>
     </catalogpath>
   </xmlcatalog>
   <import file="targets/validate.xml"/>

Modified: forrest/trunk/main/targets/validate.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/validate.xml?rev=721076&r1=721075&r2=721076&view=diff
==============================================================================
--- forrest/trunk/main/targets/validate.xml (original)
+++ forrest/trunk/main/targets/validate.xml Wed Nov 26 19:55:26 2008
@@ -121,10 +121,7 @@
   </target>
   <target name="validate-xdocs" depends="init, validation-props" if="validate.xdocs"
       description="Validate the project xdocs">
-    <echo level="verbose" message="Using these catalog descriptors:
-forrest.core.webapp=${forrest.core.webapp}/resources/schema/catalog.xcat
-forrest.plugins-dir=${forrest.plugins-dir}/catalog.xcat
-catalog=${catalog}"/>
+    <echo level="verbose" message="Using these catalog descriptors: ${toString:fcatalog.path}"/>
     <xmlvalidate failonerror="${forrest.validate.xdocs.failonerror}" lenient="no" warn="yes" classpathref="forrest.cp" classname="org.apache.xerces.parsers.SAXParser">
       <attribute name="http://apache.org/xml/features/validation/dynamic"  value="true"/>
       <xmlcatalog refid="fcatalog" />