forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ross Gardler <rgard...@apache.org>
Subject Re: svn commit: r326555 - in /forrest/trunk: main/targets/site.xml site-author/status.xml
Date Wed, 19 Oct 2005 14:12:56 GMT
David Crossley wrote:
> These are a lot of changes. Are you doing whitespace changes
> at the same time, or perhaps a new text editor gone awry.

Hmmm... not at all sure about why that happened, unless the file was 
originally had tabs. I checked and it is still spaces for me.

I'll summarise the changes for you to make them readable:

>>--- forrest/trunk/main/targets/site.xml (original)
>>+++ forrest/trunk/main/targets/site.xml Wed Oct 19 06:38:02 2005
>>@@ -33,140 +33,160 @@
>>                        if="project.content.present"
>>                        description="* Generates a static HTML website for this project">
>> 
>>-    <parallel>
>>-      <java classname="org.apache.cocoon.Main"

This whole section has not been removed, it has been wrapped in a 
sequential tag:

>>-        failonerror="true">

This line has changed (see below)

>>+    <sequential>
>>+      <parallel>
>>+        <java classname="org.apache.cocoon.Main"

there's that sequential tag

>>+          failonerror="false"
>>+          resultproperty="buildResult">

and the failonerror change (with a new property too)

>>+      <echo>
>>+  Copying broken links file to site root.
>>+      </echo>
>>+      <copy toFile="${project.site-dir}/broken-links.xml" file="${project.brokenlinkfile}"/>
>>+    </sequential>

added this last copy

>>+    
>>+    <if>
>>+      <equals arg1="${buildResult}" arg2="1"/>
>>+      <then>
>>+        <fail if="buildResult">
>>+Error building site.
 >>
>>+There appears to be a problem with your site build.
>> 
>>-Note that there are various reasons for "build failed" messages.
>>+Read the output above:
>> * Cocoon will report the status of each document:
>>-  - in column 1: *=okay X=brokenLink ^=pageSkipped (see FAQ).
>>+    - in column 1: *=okay X=brokenLink ^=pageSkipped (see FAQ).
>> * Even if only one link is broken, you will still get "failed".
>> * Your site would still be generated, but some pages would be broken.
>>+  - See ${project.site-dir}/broken-links.xml
>>+        </fail>
>>+      </then>
>>+    </if>
>>-      </sequential>
>>-    </parallel>

The above output has been moved (now only displays if there is a problem)

HTH

Ross

Mime
View raw message