Author: crossley
Date: Wed Nov 26 21:35:21 2008
New Revision: 721083
URL: http://svn.apache.org/viewvc?rev=721083&view=rev
Log:
The preparation of the set of xmlcatalogs is better done in our
"validation-props" ant target.
Thanks to assistance from Thomas Emmel.
Issue: FOR-1131 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=721083&r1=721082&r2=721083&view=diff
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Wed Nov 26 21:35:21 2008
@@ -36,16 +36,6 @@
<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>
- <path refid="fcatalog.path"/>
- </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=721083&r1=721082&r2=721083&view=diff
==============================================================================
--- forrest/trunk/main/targets/validate.xml (original)
+++ forrest/trunk/main/targets/validate.xml Wed Nov 26 21:35:21 2008
@@ -95,6 +95,17 @@
<property name="forrest.validate.skins.stylesheets.excludes" value=""/>
<property name="forrest.validate.skins.stylesheets.failonerror"
value="${forrest.validate.skins.failonerror}" />
+ <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>
+ <path refid="fcatalog.path"/>
+ </catalogpath>
+ </xmlcatalog>
+ <echo message="Using these catalog descriptors:
${toString:fcatalog.path}"/>
</target>
<target name="validate-site" depends="load-project-props">
<condition property="forrest.validate.skinconf.disable-xml-link">
@@ -121,7 +132,6 @@
</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:
${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" />
