Author: crossley
Date: Wed Sep 30 09:14:48 2009
New Revision: 820222
URL: http://svn.apache.org/viewvc?rev=820222&view=rev
Log:
Enabled the filtering of output messages from Ant.
Issue: FOR-1178
Modified:
forrest/trunk/main/build.xml
forrest/trunk/main/forrest.build.xml
forrest/trunk/main/targets/context.xml
forrest/trunk/main/targets/plugins.xml
forrest/trunk/main/targets/seed.xml
forrest/trunk/main/targets/site.xml
forrest/trunk/main/targets/skins.xml
forrest/trunk/main/targets/validate.xml
forrest/trunk/main/targets/webapp.xml
forrest/trunk/main/var/pluginlist2echo.xsl
forrest/trunk/main/var/pluginlist2fetch.xsl
forrest/trunk/main/var/skinlist2echo.xsl
forrest/trunk/main/var/skinlist2fetch.xsl
forrest/trunk/plugins/build.xml
forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml
forrest/trunk/site-author/content/xdocs/site.xml
forrest/trunk/site-author/status.xml
forrest/trunk/tools/forrestbot/core/build.xml
forrest/trunk/tools/forrestbot/core/deploy.xml
forrest/trunk/tools/forrestbot/core/getsrc.xml
forrest/trunk/tools/forrestbot/core/notify.xml
Modified: forrest/trunk/main/build.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Wed Sep 30 09:14:48 2009
@@ -61,7 +61,7 @@
<property name="forrestbot.dir"
location="${forrest.home}/tools/forrestbot"/>
<mkdir dir="${build.dir}"/>
<buildnumber file="${build.dir}/build.number"/>
- <echo>
+ <echo level="info">
--------------------------------------------------------------
Using ${ant.version}
@@ -214,7 +214,7 @@
</classpath>
</taskdef>
<!-- skinconf.xml -->
- <echo message="validating **/skinconf.xml ..."/>
+ <echo level="info" message="validating **/skinconf.xml ..."/>
<xmlvalidate failonerror="true" lenient="no" warn="yes">
<xmlcatalog id="xcat">
<catalogpath>
@@ -226,21 +226,21 @@
includes="**/skinconf.xml" />
</xmlvalidate>
<!-- All stylesheets **/*.xsl -->
- <echo message="validating stylesheets **/*.xsl ..."/>
+ <echo level="info" message="validating stylesheets **/*.xsl ..."/>
<jing rngfile="${forrest.core}/webapp/resources/schema/relaxng/xslt.rng">
<fileset dir="${forrest.core}" includes="**/*.xsl"/>
<fileset dir="${tools.dir}" includes="**/*.xsl"/>
</jing>
<!-- sitemap.xmap -->
<!-- commented out see http://issues.apache.org/bugzilla/show_bug.cgi?id=33378
- <echo message="validating **/sitemap.xmap ..."/>
+ <echo level="info" message="validating **/sitemap.xmap ..."/>
<jing
rngfile="${forrest.core}/webapp/resources/schema/relaxng/sitemap-v06.rng">
<fileset dir="${forrest.core}/webapp/" includes="*.xmap"/>
</jing>
-->
<!-- book.xml -->
<!-- FIXME: Need Norm Walsh catalog entity resolver or Jeff's DoctypeChanger.
- <echo message="validating **/book.xml ..."/>
+ <echo level="info" message="validating **/book.xml ..."/>
<jing rngfile="${forrest.core}/resources/schema/relaxng/book-v01.rng">
<fileset dir="${forrest.core}" includes="**/book.xml"/>
</jing>
@@ -251,7 +251,7 @@
<!-- fresh drop-off location for the distribution -->
<delete dir="${dist-shbat.dir}" />
<mkdir dir="${dist-shbat.dir}" />
- <echo>Copy Forrest core files from ${forrest.home}</echo>
+ <echo level="info">Copy Forrest core files from ${forrest.home}</echo>
<copy todir="${dist-shbat.dir}">
<fileset dir="${forrest.home}" >
<exclude name="admin/**"/>
@@ -265,7 +265,7 @@
<exclude name="tools/anttasks/**"/>
</fileset>
</copy>
- <echo>Copy plugin related files from ${plugins.dir}</echo>
+ <echo level="info">Copy plugin related files from ${plugins.dir}</echo>
<copy todir="${dist-shbat.dir}/plugins">
<fileset dir="${plugins.dir}" >
<include name="plugins.xml"/>
@@ -274,14 +274,14 @@
<include name="org.apache.forrest.plugin.output.pdf/**"/>
</fileset>
</copy>
- <echo>Copy whiteboard plugin related files</echo>
+ <echo level="info">Copy whiteboard plugin related files</echo>
<copy todir="${dist-shbat.dir}/whiteboard/plugins">
<fileset dir="${forrest.home}/whiteboard/plugins" >
<include name="whiteboard-plugins.xml"/>
<include name="build.xml"/>
</fileset>
</copy>
- <echo>Copy forrest.jar</echo>
+ <echo level="info">Copy forrest.jar</echo>
<copy todir="${dist-shbat.dir}">
<fileset dir="${forrest.home}" >
<include name="build/xml-forrest.jar"/>
@@ -295,7 +295,7 @@
<fixcrlf eol="crlf" srcdir="${dist-shbat.dir}/tools/ant/bin"
includes="*.bat"/>
<fixcrlf eol="lf" srcdir="${dist-shbat.dir}/tools/ant/bin"
excludes="*.bat"/>
<chmod dir="${dist-shbat.dir}/tools/ant/bin" perm="ugo+rx"
excludes="*.bat"/>
- <echo>
+ <echo level="info">
*-----------------------------------------------------------------
| installation notice
*-----------------------------------------------------------------
@@ -339,23 +339,23 @@
<!--
FIXME: these don't work as the compile stage executes since $java.dir =
FORREST_HOME/main/java
instead of PLUGIN_HOME/java
- <echo>=============================</echo>
- <echo>Testing using an input plugin</echo>
- <echo>=============================</echo>
+ <echo level="info">=============================</echo>
+ <echo level="info">Testing using an input plugin</echo>
+ <echo level="info">=============================</echo>
<ant
antfile="${forrest.home}/plugins/org.apache.forrest.plugin.excel/build.xml"
target="test">
<property name="basedir"
location="${forrest.home}/plugins/org.apache.forrest.plugin.excel"/>
</ant>
- <echo>=============================</echo>
- <echo>Testing using an ouptut plugin</echo>
- <echo>=============================</echo>
+ <echo level="info">=============================</echo>
+ <echo level="info">Testing using an ouptut plugin</echo>
+ <echo level="info">=============================</echo>
<ant
antfile="${forrest.home}/plugins/org.apache.forrest.plugin.output.pdf/build.xml"
target="test">
<property name="basedir"
location="${forrest.home}/plugins/org.apache.forrest.plugin.output.pdf"/>
</ant>
- <echo>=============================</echo>
- <echo>Testing using an internal plugin</echo>
- <echo>=============================</echo>
+ <echo level="info">=============================</echo>
+ <echo level="info">Testing using an internal plugin</echo>
+ <echo level="info">=============================</echo>
<ant antfile="${forrest.home}/plugins/IMSManifest/build.xml" target="test">
<property name="basedir" location="${forrest.home}/plugins/IMSManifest"/>
</ant>
@@ -387,7 +387,7 @@
</target>
<target name="testSeedSiteType"
description="Called by test target - Seeds a new site for testing and
read the value of project.required.plugins if supplied">
- <echo>
+ <echo level="info">
-------------------------------------
Testing seeded ${test.site.type} site ...
-------------------------------------
@@ -409,7 +409,7 @@
<target name="testReplacePluginsList"
if="project.required.plugins"
description="Called by test target - Replaces the list of required
plugins if supplied for testing a new site">
- <echo message="Replace the plugins list"/>
+ <echo level="info" message="Replace the plugins list"/>
<replaceregexp file="${test.dir}/forrest.properties"
match="project.required.plugins=(.+)"
replace="project.required.plugins=${project.required.plugins}"
@@ -462,7 +462,7 @@
</section>
</manifest>
</jar>
- <echo>
+ <echo level="info">
*-----------------------------------------------------------------
| Installation notice
*-----------------------------------------------------------------
Modified: forrest/trunk/main/forrest.build.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/forrest.build.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Wed Sep 30 09:14:48 2009
@@ -181,7 +181,7 @@
<if>
<isset property="project.new-skin-name"/>
<then>
- <echo>
+ <echo level="warning">
-- Warning --
skin "${project.skin}" no longer exists, the skin named
"${project.new-skin-name}" will be automatically used instead.
@@ -206,7 +206,7 @@
<equals arg1="${project.skin}" arg2="crust"/>
</or>
<then>
- <echo>
+ <echo level="warning">
-- Warning --
Using skin "${project.skin}" which is deprecated.
Please migrate to one of the new skins listed in forrest.properties.
@@ -218,7 +218,7 @@
<antcall target="echo-settings" />
<!-- Gather some build information about this Forrest instance,
to be used later by Cocoon. -->
- <echo file="${project.temp-dir}/build-info.xml"><info>
+ <echo level="info" file="${project.temp-dir}/build-info.xml"><info>
<project-skin>${project.skin}</project-skin>
<forrest-version>${forrest.version}</forrest-version>
</info>
@@ -284,9 +284,9 @@
<fail>Java 1.4 or higher is required; found Java ${ant.java.version}
in ${java.home}</fail>
</then>
</if>
- <echo message="This is apache-forrest-${forrest.version}"/>
- <echo message="Using Java ${ant.java.version} from ${java.home}"/>
- <echo message="Using ${ant.version} from ${ant.home}"/>
+ <echo level="info" message="This is apache-forrest-${forrest.version}"/>
+ <echo level="info" message="Using Java ${ant.java.version} from
${java.home}"/>
+ <echo level="info" message="Using ${ant.version} from ${ant.home}"/>
</target>
<target name="diagnostics" depends="init" description="Show the Ant
diagnostics">
<diagnostics/>
@@ -313,7 +313,7 @@
<expandproperties/>
</filterchain>
</loadfile>
- <echo>${echo-settings-message}</echo>
+ <echo level="info">${echo-settings-message}</echo>
</target>
<!-- ===============================================================
Set class-path.
@@ -392,13 +392,13 @@
<target name="run_custom_jetty"
if="custom_jetty_config"
description="Run Jetty with configuration file found in the project">
- <echo>
+ <echo level="info">
Note: Use Ctrl-C to stop the Jetty server
</echo>
<if>
<os family="dos"/>
<then>
- <echo>
+ <echo level="info">
... and reply 'n' and press [Enter]
when asked about aborting the batch!
</echo>
@@ -426,13 +426,13 @@
</target>
<target name="run_default_jetty"
description="Run Jetty with configuration file found in Forrest">
- <echo>
+ <echo level="info">
Note: Use Ctrl-C to stop the Jetty server
</echo>
<if>
<os family="dos"/>
<then>
- <echo>
+ <echo level="info">
... and reply 'n' and press [Enter]
when asked about aborting the batch!
</echo>
@@ -468,11 +468,11 @@
<!-- ***************************************************************** -->
<!-- ***************************************************************** -->
<target name="init-proxy" if="proxy.host" unless="proxy.already.set">
- <echo>Using proxy : ${proxy.host}:${proxy.port}</echo>
+ <echo level="info">Using proxy : ${proxy.host}:${proxy.port}</echo>
<if>
<isset property="proxy.user"/>
<then>
- <echo>Proxy connection : xxxxxx/xxxxxx (confidential)</echo>
+ <echo level="info">Proxy connection : xxxxxx/xxxxxx
(confidential)</echo>
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
proxyuser="${proxy.user}" proxypassword="${proxy.password}"/>
</then>
<else>
Modified: forrest/trunk/main/targets/context.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/targets/context.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/main/targets/context.xml (original)
+++ forrest/trunk/main/targets/context.xml Wed Sep 30 09:14:48 2009
@@ -38,9 +38,9 @@
param: location to make temporary context-dir ${project.webapp}
=============================================================== -->
<target name="bare-context" depends="init" >
- <echo>____________________________________</echo>
- <echo>Using skin "${project.skin}"</echo>
- <echo>____________________________________</echo>
+ <echo level="info">____________________________________</echo>
+ <echo level="info">Using skin "${project.skin}"</echo>
+ <echo level="info">____________________________________</echo>
<mkdir dir="${project.webapp}"/>
<sync todir="${project.webapp}">
<fileset dir="${forrest.core.webapp}" >
Modified: forrest/trunk/main/targets/plugins.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/targets/plugins.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/main/targets/plugins.xml (original)
+++ forrest/trunk/main/targets/plugins.xml Wed Sep 30 09:14:48 2009
@@ -49,10 +49,10 @@
<if>
<isset property="plugin.unavailable"/>
<then>
- <echo>${versioned.name} is not available in the build dir. Trying to
fetch it...</echo>
+ <echo level="info">${versioned.name} is not available in the build
dir. Trying to fetch it...</echo>
</then>
<else>
- <echo>${versioned.name} is available in the build dir. Trying to
update it...</echo>
+ <echo level="info">${versioned.name} is available in the build dir.
Trying to update it...</echo>
</else>
</if>
</target>
@@ -220,7 +220,7 @@
<target name="configure-input-plugin">
<!-- add the snippet to plugins/input.xmap that will mount the plugin
specific input.xmap -->
- <echo>Mounting input plugin: ${plugin}</echo>
+ <echo level="info">Mounting input plugin: ${plugin}</echo>
<xslt in="${project.temp-dir}/input.xmap"
out="${project.temp-dir}/input.xmap.new"
style="${forrest.core}/var/pluginMountSnippet.xsl"
@@ -243,7 +243,7 @@
<target name="configure-output-plugin">
<!-- add the snippet to plugins/output.xmap that will mount the plugin
specific input.xmap -->
- <echo>Mounting output plugin: ${plugin}</echo>
+ <echo level="info">Mounting output plugin: ${plugin}</echo>
<xslt in="${project.temp-dir}/output.xmap"
out="${project.temp-dir}/output.xmap.new"
style="${forrest.core}/var/pluginMountSnippet.xsl"
@@ -257,7 +257,7 @@
<target name="configure-internal-plugin">
<!-- add the snippet to plugins/internal.xmap that will mount the plugin
specific input.xmap -->
- <echo>Mounting internal plugin: ${plugin}</echo>
+ <echo level="info">Mounting internal plugin: ${plugin}</echo>
<xslt in="${project.temp-dir}/internal.xmap"
out="${project.temp-dir}/internal.xmap.new"
style="${forrest.core}/var/pluginMountSnippet.xsl"
@@ -271,7 +271,7 @@
<target name="configure-plugin-locationmap">
<!-- add the snippet to plugins/locationmap.xml that will mount the plugin
specific locationmap -->
- <echo>Mounting plugin locationmap for ${plugin}</echo>
+ <echo level="info">Mounting plugin locationmap for ${plugin}</echo>
<xslt in="${project.temp-dir}/locationmap.xml"
out="${project.temp-dir}/locationmap.xml.new"
style="${forrest.core}/var/pluginLmMountSnippet.xsl"
@@ -293,7 +293,7 @@
<var name="plugin-counter" value="1"/>
<for list="${forrest.plugins.descriptors}" param="url">
<sequential>
- <echo>Fetching plugins descriptor: @{url}</echo>
+ <echo level="info">Fetching plugins descriptor: @{url}</echo>
<get src="@{url}"
dest="${project.temp-dir}/plugins-${plugin-counter}.xml"
verbose="true" usetimestamp="true" ignoreerrors="true"/>
@@ -308,7 +308,7 @@
<if>
<available file="${project.temp-dir}/plugins-${plugin-counter}.xml"/>
<then>
- <echo>Plugin list loaded from @{url}.</echo>
+ <echo level="info">Plugin list loaded from @{url}.</echo>
</then>
<else>
<echo>
@@ -327,7 +327,7 @@
<target name="fetch-plugin"
depends="init-props, fetch-plugins-descriptors">
- <echo>Trying to find the description of ${versioned.name} in the different
descriptor files</echo>
+ <echo level="info">Trying to find the description of ${versioned.name} in
the different descriptor files</echo>
<trycatch property="plugin-found">
<try>
<for param="plugin-descriptor-file">
@@ -335,7 +335,7 @@
<fileset dir="${project.temp-dir}" includes="plugins-*.xml"/>
</path>
<sequential>
- <echo>Using the descriptor file @{plugin-descriptor-file}...</echo>
+ <echo level="info">Using the descriptor file
@{plugin-descriptor-file}...</echo>
<xslt in="@{plugin-descriptor-file}"
out="${project.temp-dir}/pluginlist2fetchbuild.xml"
style="${forrest.core}/var/pluginlist2fetch.xsl"
@@ -352,7 +352,7 @@
</for>
</try>
<catch>
- <echo>Fetch-plugin Ok, installing !</echo>
+ <echo level="info">Fetch-plugin Ok, installing !</echo>
</catch>
</trycatch>
<!-- Here we stop if the description of a plugin has not been found... -->
@@ -391,7 +391,7 @@
overwrite="true"/>
<for list="${project.required.plugins}" param="name">
<sequential>
- <echo>
+ <echo level="info">
--------------------------------------------------------------
Installing plugin: @{name}
--------------------------------------------------------------
Modified: forrest/trunk/main/targets/seed.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/targets/seed.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/main/targets/seed.xml (original)
+++ forrest/trunk/main/targets/seed.xml Wed Sep 30 09:14:48 2009
@@ -38,7 +38,7 @@
<expandproperties/>
</filterchain>
</loadfile>
- <echo>${template-project-created-message}</echo>
+ <echo level="info">${template-project-created-message}</echo>
</target>
<target name="seed-sample" description="* Seeds a directory with a template
project doc structure">
<antcall target="seed"/>
@@ -53,7 +53,7 @@
<expandproperties/>
</filterchain>
</loadfile>
- <echo>${template-project-created-message}</echo>
+ <echo level="info">${template-project-created-message}</echo>
</target>
<target name="seed-benchmark" depends="ensure-nocontent"
description="* Seeds a site to use for benchmarking measurements">
@@ -65,7 +65,7 @@
<expandproperties/>
</filterchain>
</loadfile>
- <echo>${template-project-created-message}</echo>
+ <echo level="info">${template-project-created-message}</echo>
</target>
<target name="seedTestBusiness" depends="ensure-nocontent"
description="A test business site">
Modified: forrest/trunk/main/targets/site.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/targets/site.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/main/targets/site.xml (original)
+++ forrest/trunk/main/targets/site.xml Wed Sep 30 09:14:48 2009
@@ -62,16 +62,16 @@
</syspropertyset>
</java>
<sequential>
- <echo>
- Copying the various non-generated resources to site.
- Warnings will be issued if the optional project resources are not found.
- This is often the case, because they are optional and so may not be
available.</echo>
+ <echo level="warning">
+Copying the various non-generated resources to site.
+Warnings will be issued if the optional project resources are not found.
+This is often the case, because they are optional and so may not be
available.</echo>
<!--
| Copy all non-xdocs content across, as we cannot rely on crawling to
| discover the whole URI space. Note: we are emulating the sitemap
here;
| please ensure they keep in synch.
-->
- <echo message="Copying project resources and images to site ..."/>
+ <echo level="warning" message="Copying project resources and images
to site ..."/>
<copy toDir="${project.site-dir}"
overwrite="true" failonerror="false">
<fileset dir="${content-dir}/content">
@@ -82,7 +82,7 @@
<fileset dir="${project.webapp}/resources" includes="images"/>
</copy>
<!-- Copy skin images -->
- <echo message="Copying main skin images to site ..."/>
+ <echo level="warning" message="Copying main skin images to site
..."/>
<mkdir dir="${project.site-dir}/skin/images"/>
<!-- FIXME: we will only be using either project skins or forrest skins - only
copy those necessary (don't forget common) -->
<!-- Copy forrest skin images -->
@@ -101,7 +101,7 @@
</copy>
<!-- Copy project skin images -->
<!-- Do the common ones first followed by those for the skin. -->
- <echo message="Copying project skin images to site ..."/>
+ <echo level="warning" message="Copying project skin images to site
..."/>
<copy toDir="${project.site-dir}/skin/images" overwrite="true"
failonerror="false">
<fileset dir="${project.skins-dir}/common/images"/>
@@ -114,7 +114,7 @@
</copy>
<!-- Copy all other non-resource files -->
<!-- Do the common ones first followed by those for the skin. -->
- <echo message="Copying main skin css and js files to site ..."/>
+ <echo level="warning" message="Copying main skin css and js files to
site ..."/>
<copy toDir="${project.site-dir}/skin"
overwrite="true"
failonerror="false">
@@ -139,7 +139,7 @@
</copy>
<!-- Copy all other non-resource files from project skins-->
<!-- Do the common ones first followed by those for the skin. -->
- <echo message="Copying project skin css and js files to site ..."/>
+ <echo level="warning" message="Copying project skin css and js files
to site ..."/>
<copy toDir="${project.site-dir}/skin"
overwrite="true"
failonerror="false">
@@ -160,10 +160,12 @@
<exclude name="**/*.xslt"/>
</fileset>
</copy>
- <echo>
+ <echo level="warning">
Finished copying the non-generated resources.
Now Cocoon will generate the rest.
+ </echo>
+ <echo level="info">
Static site will be generated at:
${project.site-dir}
@@ -172,7 +174,7 @@
</echo>
</sequential>
</parallel>
- <echo>
+ <echo level="info">
Copying broken links file to site root.
</echo>
<copy toFile="${project.site-dir}/broken-links.xml"
file="${project.brokenlinkfile}"/>
@@ -182,7 +184,7 @@
<if>
<equals arg1="${project.validation.content.present}" arg2="true"/>
<then>
- <echo message="Assembling validation report ..."/>
+ <echo level="info" message="Assembling validation report ..."/>
<!-- FIXME: See Ant - Bug 18897 Add option to suppress xslt warning messages
Available in upcoming Ant-1.8.0
-->
@@ -256,7 +258,7 @@
</fixcrlf>
</else>
</if>
- <echo>
+ <echo level="info">
-----------------------------
Static site was successfully generated at:
${project.site-dir}
Modified: forrest/trunk/main/targets/skins.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/targets/skins.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/main/targets/skins.xml (original)
+++ forrest/trunk/main/targets/skins.xml Wed Sep 30 09:14:48 2009
@@ -82,7 +82,7 @@
<var name="skin-counter" value="1"/>
<for list="${forrest.skins.descriptors}" param="url">
<sequential>
- <echo>fetching descriptor: @{url}</echo>
+ <echo level="info">fetching descriptor: @{url}</echo>
<get src="@{url}"
dest="${forrest.skins-dir}/skins-${skin-counter}.xml"
verbose="true" usetimestamp="true" ignoreerrors="true"/>
Modified: forrest/trunk/main/targets/validate.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/targets/validate.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/main/targets/validate.xml (original)
+++ forrest/trunk/main/targets/validate.xml Wed Sep 30 09:14:48 2009
@@ -128,7 +128,7 @@
includes="${forrest.validate.xdocs.includes}"
excludes="${forrest.validate.xdocs.excludes}"/>
</xmlvalidate>
- <echo message="...validated site"/>
+ <echo level="info" message="...validated site"/>
</target>
<target name="validate-xdocs" depends="init, validation-props"
if="validate.xdocs"
description="Validate the project xdocs">
@@ -139,7 +139,7 @@
includes="${forrest.validate.xdocs.includes}"
excludes="${forrest.validate.xdocs.excludes}"/>
</xmlvalidate>
- <echo message="...validated xdocs"/>
+ <echo level="info" message="...validated xdocs"/>
</target>
<target name="validate-skinconf" depends="validation-props"
if="validate.skinconf" description="Validate skinconf">
@@ -150,7 +150,7 @@
includes="${forrest.validate.skinconf.includes}"
excludes="${forrest.validate.skinconf.excludes}"/>
</xmlvalidate>
- <echo message="...validated skinconf"/>
+ <echo level="info" message="...validated skinconf"/>
</target>
<target name="validate-sitemap" depends="validation-props"
if="validate.sitemap" description="Validate the project sitemap">
@@ -161,7 +161,7 @@
<include name="sitemap.xmap"/>
</fileset>
</jing>
- <echo message="...validated project sitemap"/>
+ <echo level="info" message="...validated project sitemap"/>
</target>
<target name="validate-stylesheets" depends="validation-props"
if="validate.stylesheets" description="Validate XSL files">
@@ -170,7 +170,7 @@
includes="${forrest.validate.stylesheets.includes}"
excludes="${forrest.validate.stylesheets.excludes}" />
</jing>
- <echo message="...validated stylesheets"/>
+ <echo level="info" message="...validated stylesheets"/>
</target>
<target name="validate-skins" depends="validate-skins-stylesheets"
description="Validate skins"/>
<target name="validate-skins-stylesheets" depends="validation-props"
@@ -180,7 +180,7 @@
includes="${forrest.validate.skins.stylesheets.includes}"
excludes="${forrest.validate.skins.stylesheets.excludes}"/>
</jing>
- <echo message="...validated skin stylesheets"/>
+ <echo level="info" message="...validated skin stylesheets"/>
</target>
<!-- Check that ${project.skin} points to an existing skin. -->
<target name="validate-skinchoice" depends="validation-props"
description="Validate skin choice">
@@ -198,6 +198,6 @@
<fail unless="project.skin.present">
${skin-not-found-message}
</fail>
- <echo message="...validated existence of skin '${project.skin}'"/>
+ <echo level="info" message="...validated existence of skin
'${project.skin}'"/>
</target>
</project>
Modified: forrest/trunk/main/targets/webapp.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/targets/webapp.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/main/targets/webapp.xml (original)
+++ forrest/trunk/main/targets/webapp.xml Wed Sep 30 09:14:48 2009
@@ -53,7 +53,7 @@
<expandproperties/>
</filterchain>
</loadfile>
- <echo>${webapp-local-generated-message}</echo>
+ <echo level="info">${webapp-local-generated-message}</echo>
</target>
<!-- ===============================================================
Builds a cocoon webapp of your project for remote deployment.
@@ -148,7 +148,7 @@
<expandproperties/>
</filterchain>
</loadfile>
- <echo>${webapp-generated-message}</echo>
+ <echo level="info">${webapp-generated-message}</echo>
</target>
<target name="copy-xdocs" if="xdocs.present"></target>
<target name="copy-content" if="raw-content.present"></target>
@@ -194,7 +194,7 @@
</war>
<!-- Finishing by echoing the location of the ready to use war -->
- <echo>
+ <echo level="info">
---------------------------------
Webapp .war file generated:
${project.war}
Modified: forrest/trunk/main/var/pluginlist2echo.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/var/pluginlist2echo.xsl?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/main/var/pluginlist2echo.xsl (original)
+++ forrest/trunk/main/var/pluginlist2echo.xsl Wed Sep 30 09:14:48 2009
@@ -19,7 +19,7 @@
<xsl:template match="plugins">
<project default="echoplugins">
<target name="echoplugins">
- <echo>Available plugins:
+ <echo level="info">Available plugins:
Forrest provides basic functionality for creating documentation in various
formats from a range of source formats. However, additional functionlaity
can be provided through plugins.
@@ -27,19 +27,19 @@
Plugins may be maintained by other people and be available from
outside the Forrest distribution. The list below details all known plugins.
</echo>
- <echo>
+ <echo level="info">
=============
Input Plugins
=============
</echo>
<xsl:apply-templates select="plug...@type='input']" />
- <echo>
+ <echo level="info">
==============
Output Plugins
==============
</echo>
<xsl:apply-templates select="plug...@type='output']" />
- <echo>
+ <echo level="info">
================
Internal Plugins
================
@@ -49,7 +49,7 @@
</project>
</xsl:template>
<xsl:template match="plugin">
- <echo>
+ <echo level="info">
* <xsl:value-of select="@name"/>
- <xsl:value-of select="normalize-space(description)"/>
Modified: forrest/trunk/main/var/pluginlist2fetch.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/var/pluginlist2fetch.xsl?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/main/var/pluginlist2fetch.xsl (original)
+++ forrest/trunk/main/var/pluginlist2fetch.xsl Wed Sep 30 09:14:48 2009
@@ -106,7 +106,7 @@
</antcallback>
</target>
<target name="get-local">
- <echo>Trying to locally get
${local-plugin-name}${local-plugin-version}</echo>
+ <echo level="info">Trying to locally get
${local-plugin-name}${local-plugin-version}</echo>
<trycatch property="plugin-found">
<try>
<for param="plugin-src-dir">
@@ -114,13 +114,13 @@
<xsl:value-of select="$plugin-src-dir" />
</xsl:attribute>
<sequential>
- <echo>Looking in local @{plugin-src-dir}</echo>
+ <echo level="info">Looking in local
@{plugin-src-dir}</echo>
<if>
<available property="plugin.src.present" type="dir">
<xsl:attribute
name="file">@{plugin-src-dir}/${local-plugin-name}${local-plugin-version}</xsl:attribute>
</available>
<then>
- <echo message="Found !"/>
+ <echo level="info" message="Found !"/>
<ant target="local-deploy">
<xsl:attribute
name="antfile">@{plugin-src-dir}/${local-plugin-name}${local-plugin-version}/build.xml</xsl:attribute>
<xsl:attribute
name="dir">@{plugin-src-dir}/${local-plugin-name}${local-plugin-version}</xsl:attribute>
@@ -133,7 +133,7 @@
</for>
</try>
<catch>
- <echo>Plugin ${local-plugin-name}${local-plugin-version}
deployed ! Ready to configure</echo>
+ <echo level="info">Plugin
${local-plugin-name}${local-plugin-version} deployed ! Ready to configure</echo>
</catch>
</trycatch>
</target>
@@ -153,7 +153,7 @@
</available>
</target>
<target name="get-from-remote-site">
- <echo>Tying to download
${download-plugin-name}${download-plugin-version} from the distribution site
...</echo>
+ <echo level="info">Tying to download
${download-plugin-name}${download-plugin-version} from the distribution site
...</echo>
<!-- FIXME the following test does not work... -->
<if>
<not>
@@ -162,7 +162,7 @@
</equals>
</not>
<then>
- <echo>Using Forrest version :
${download-forrest-version}</echo>
+ <echo level="info">Using Forrest version :
${download-forrest-version}</echo>
</then>
</if>
<!-- Get from the remote URL -->
@@ -224,10 +224,10 @@
</condition>
</target>
<target name="downloaded-message" if="downloaded">
- <echo>Plugin <xsl:value-of select="$plugin-name" /> downloaded !
Ready to install</echo>
+ <echo level="info">Plugin <xsl:value-of select="$plugin-name" />
downloaded ! Ready to install</echo>
</target>
<target name="uptodate-message" if="up-to-date">
- <echo>Plugin <xsl:value-of select="$plugin-name" /> was up-to-date
! Ready to configure</echo>
+ <echo level="info">Plugin <xsl:value-of select="$plugin-name" />
was up-to-date ! Ready to configure</echo>
<property name="plugin-found" value="true"/>
</target>
<target name="not-found-message" unless="desired.plugin.zip.present">
Modified: forrest/trunk/main/var/skinlist2echo.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/var/skinlist2echo.xsl?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/main/var/skinlist2echo.xsl (original)
+++ forrest/trunk/main/var/skinlist2echo.xsl Wed Sep 30 09:14:48 2009
@@ -19,7 +19,7 @@
<xsl:template match="skins">
<project default="echoskins">
<target name="echoskins">
- <echo>Available skins:
+ <echo level="info">Available skins:
Forrest provides the following default skins which should meet most needs:
Current:
@@ -39,7 +39,7 @@
</project>
</xsl:template>
<xsl:template match="skin">
- <echo>
+ <echo level="info">
* <xsl:value-of select="@name"/> - <xsl:value-of
select="normalize-space(description)"/>
- author: <xsl:value-of select="@author"/>
- website: <xsl:value-of select="@website"/>
Modified: forrest/trunk/main/var/skinlist2fetch.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/var/skinlist2fetch.xsl?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/main/var/skinlist2fetch.xsl (original)
+++ forrest/trunk/main/var/skinlist2fetch.xsl Wed Sep 30 09:14:48 2009
@@ -23,7 +23,7 @@
<project default="fetchskin">
<target name="fetchskin" depends="fetch-versioned-skin,
fetch-unversioned-skin, final-check"/>
<target name="fetch-versioned-skin">
- <echo>Trying to get "<xsl:value-of select="$skin-name" />" skin
version
+ <echo level="info">Trying to get "<xsl:value-of select="$skin-name"
/>" skin version
<xsl:value-of select="$forrest-version" />...</echo>
<get verbose="true" usetimestamp="true" ignoreerrors="true">
<xsl:attribute name="src">
@@ -36,7 +36,7 @@
</available>
</target>
<target name="fetch-unversioned-skin" unless="versioned-skin.present">
- <echo>Versioned skin unavailable, trying to get versionless
skin...</echo>
+ <echo level="info">Versioned skin unavailable, trying to get
versionless skin...</echo>
<get verbose="true" usetimestamp="true" ignoreerrors="true">
<xsl:attribute name="src">
<xsl:value-of select="sk...@name=$skin-name]/@url" />
@@ -55,7 +55,7 @@
In case the reason is the network connection, you can try
installing the package manually by placing the file in the
skins directory.</fail>
- <echo>Skin "<xsl:value-of select="$skin-name" />" correctly
installed.</echo>
+ <echo level="info">Skin "<xsl:value-of select="$skin-name" />"
correctly installed.</echo>
</target>
</project>
</xsl:template>
Modified: forrest/trunk/plugins/build.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/build.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/plugins/build.xml (original)
+++ forrest/trunk/plugins/build.xml Wed Sep 30 09:14:48 2009
@@ -91,7 +91,7 @@
</target>
<target name="echo-init" depends="init-build-compiler" unless="no.echo.init">
<buildnumber file="${build.dir}/build.number"/>
- <echo>
+ <echo level="info">
--------------------------------------------------------------
Using ${ant.version}
@@ -113,7 +113,7 @@
<target name="local-deploy"
description="Deploy a plugin locally"
depends="init, jar">
- <echo>Locally deploying ${plugin-name}</echo>
+ <echo level="info">Locally deploying ${plugin-name}</echo>
<copy toDir="${forrest.plugins.localDeploy.dir}/${plugin-name}">
<fileset dir="${forrest.plugins.dir}/${plugin-name}">
<exclude name="lib/**"/>
@@ -174,7 +174,7 @@
<target name="deploy-docs"
description="Deploy the plugin documentation"
depends="clean, dist, docs, checkout-deployed-docs,
deploy-plugins.xml">
- <echo>Deploying plugin documentation to the web server</echo>
+ <echo level="info">Deploying plugin documentation to the web server</echo>
<if>
<contains string="${forrest.version}" substring="0.7"/>
<then>
@@ -244,13 +244,13 @@
<target name="release"
description="Release the versioned plugin to the website SVN to make
it available for download"
depends="clean, deploy-plugins.xml, deploy-docs, dist,
checkout-deployed-plugins">
- <echo>Releasing versioned plugin ${plugin-name} to the download
server</echo>
+ <echo level="info">Releasing versioned plugin ${plugin-name} to the
download server</echo>
<!-- Put versioned plugin in the ${forrest.version} directory -->
<copy todir="${deploy.plugins.svn-dir}/${forrest.version}"
overwrite="true"
file="${forrest.plugins.dist.dir}/${forrest.version}/${plugin-name}-${plugin-version}.zip"/>
<antcall target="updateSVN"/>
- <echo>
+ <echo level="info">
You have just released a plugin. There are other tasks to complete. For
example:
- release emails
- SVN tagging
@@ -289,7 +289,7 @@
<target name="deploy"
description="Deploy the unversioned plugin to the website SVN to
make it available for download"
depends="clean, deploy-plugins.xml, deploy-docs, dist,
checkout-deployed-plugins">
- <echo>Deploying unversioned plugin ${plugin-name} to the download
server</echo>
+ <echo level="info">Deploying unversioned plugin ${plugin-name} to the
download server</echo>
<!-- Put unversioned plugin in the ${forrest.version} directory -->
<copy
tofile="${deploy.plugins.svn-dir}/${forrest.version}/${plugin-name}.zip"
overwrite="true"
@@ -323,7 +323,7 @@
/>
</target>
<target name="docs" depends="local-deploy">
- <echo>Building Docs for ${plugin-name}</echo>
+ <echo level="info">Building Docs for ${plugin-name}</echo>
<ant antfile="${forrest.core}/forrest.build.xml" target="site">
<property name="project.home" value="${basedir}"/>
</ant>
Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_90/faq.xml Wed Sep 30
09:14:48 2009
@@ -1463,6 +1463,23 @@
</p>
</answer>
</faq>
+ <faq id="verbose-ant">
+ <question> How to filter or reduce the standard output messages?
</question>
+ <answer>
+ <p>
+ Where normally you would do
+ <code>'forrest'</code> or <code>'forrest run'</code> etc. instead use
+ the "quiet" option, and do
+ <code>'forrest -q'</code> or <code>'forrest -q run'</code> etc.
+ If errors are reported, then drop the "quiet" option and run again to
+ get the context for the error.
+ </p>
+ <p>
+ Doing <code>'forrest -v'</code> will provide very verbose build
messages to
+ the standard output.
+ </p>
+ </answer>
+ </faq>
<faq id="how_can_I_help">
<question> How to help? </question>
<answer>
Modified: forrest/trunk/site-author/content/xdocs/site.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/site.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/site.xml (original)
+++ forrest/trunk/site-author/content/xdocs/site.xml Wed Sep 30 09:14:48 2009
@@ -328,6 +328,7 @@
<php href="#php"/>
<site-xml href="#site-xml"/>
<requirements href="#requirements"/>
+ <verbose-ant href="#verbose-ant"/>
<xml-entities href="#xml-entities"/>
</faq>
<whitepapers label="Background" description="Background documentation
about Forrest and the technologies used">
Modified: forrest/trunk/site-author/status.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Wed Sep 30 09:14:48 2009
@@ -154,6 +154,10 @@
<link href="site:upgrading_09">upgrading to v0.9</link>
</action>
<!-- 2009-10 -->
+ <action context="code" type="add" dev="DC" fixes-bug="FOR-1178"
importance="high">
+ Enabled the filtering of output messages from Ant.
+ See <link href="site:faq/verbose-ant">FAQ</link>
+ </action>
<action context="code" type="add" dev="DC">
Assist with xml debugging. Show list of catalog descriptors being used.
</action>
Modified: forrest/trunk/tools/forrestbot/core/build.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/core/build.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/tools/forrestbot/core/build.xml (original)
+++ forrest/trunk/tools/forrestbot/core/build.xml Wed Sep 30 09:14:48 2009
@@ -40,7 +40,7 @@
<tstamp>
<format property="time.start" pattern="yyyy-MM-dd hh:mm:ss"/>
</tstamp>
- <echo>
+ <echo level="info">
....... Forrest render START ${time.start}
... Rendering docs in ${build.work-dir}
</echo>
@@ -49,14 +49,14 @@
<param name="project.build-dir" value="${build.work-dir}"/>
<param name="project.site-dir" value="${build.site-dir}"/>
</antcall>
- <echo>
+ <echo level="info">
....... Forrest render Succeeded
</echo>
<record name="${build.logfile}" action="stop"/>
<property name="notify.completion-status" value="succeeded" />
</try>
<catch>
- <echo>Oops, something broke</echo>
+ <echo level="error">Oops, something broke</echo>
<record name="${build.logfile}" action="stop"/>
<property name="notify.completion-status" value="FAILED" />
<property name="build.failed" value="true"/>
Modified: forrest/trunk/tools/forrestbot/core/deploy.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/core/deploy.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/tools/forrestbot/core/deploy.xml (original)
+++ forrest/trunk/tools/forrestbot/core/deploy.xml Wed Sep 30 09:14:48 2009
@@ -22,7 +22,7 @@
<property name="deploy.local.dir" location="sites/${ant.project.name}"/>
<target name="deploy.local" unless="build.failed" description="FB: Deploy to
a local location">
<mkdir dir="${deploy.local.dir}"/>
- <echo>Deploying from ${build.site-dir} to ${deploy.local.dir}</echo>
+ <echo level="info">Deploying from ${build.site-dir} to
${deploy.local.dir}</echo>
<copy todir="${deploy.local.dir}">
<fileset dir="${build.site-dir}">
<modified/>
Modified: forrest/trunk/tools/forrestbot/core/getsrc.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/core/getsrc.xml?rev=820222&r1=820221&r2=820222&view=diff
==============================================================================
--- forrest/trunk/tools/forrestbot/core/getsrc.xml (original)
+++ forrest/trunk/tools/forrestbot/core/getsrc.xml Wed Sep 30 09:14:48 2009
@@ -53,11 +53,11 @@
tag="${getsrc.cvs.tag}"
failonerror="true"
/>
- <echo>Loading
${build.cvsmodule-dir}/${getsrc.cvs.module}/forrest.properties..</echo>
+ <echo level="info">Loading
${build.cvsmodule-dir}/${getsrc.cvs.module}/forrest.properties..</echo>
<loadproperties
srcFile="${build.cvsmodule-dir}/${getsrc.cvs.module}/forrest.properties"/>
<loadproperties
srcFile="${forrest.home}/main/webapp/default-forrest.properties"/>
<!-- only the project.content-dir directory -->
- <echo>
+ <echo level="info">
<