forrest-dev mailing list archives

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

-David

> Author: rgardler
> Date: Wed Oct 19 06:38:02 2005
> New Revision: 326555
> 
> URL: http://svn.apache.org/viewcvs?rev=326555&view=rev
> Log:
> broken links file copied to site root (more useful when built by forrestbot)
> 
> Modified:
>     forrest/trunk/main/targets/site.xml
>     forrest/trunk/site-author/status.xml
> 
> Modified: forrest/trunk/main/targets/site.xml
> URL: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/site.xml?rev=326555&r1=326554&r2=326555&view=diff
> ==============================================================================
> --- 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"
> -        fork="true"
> -        dir="${forrest.core.webapp}"  
> -        maxmemory="${forrest.maxmemory}"
> -        failonerror="true">
> -        <jvmarg line="${forrest.jvmargs}"/>
> -        <jvmarg value="-Djava.endorsed.dirs=${forrest.endorsed.lib-dir}${path.separator}${java.endorsed.dirs}"/>
> -        <jvmarg value="-Dorg.apache.cocoon.core.LazyMode=true"/>
> -        <arg value="--logLevel=${project.debuglevel}"/>
> -        <arg value="--Logger=${project.logger}"/>
> -        <arg value="--logKitconfig=${project.logkitfile}"/>
> -        <arg value="--destDir=${project.site-dir}"/>
> -        <arg value="--xconf=${project.configfile}"/>
> -        <arg value="--brokenLinkFile=${project.brokenlinkfile}"/>
> -        <arg value="--workDir=${project.cocoon-work-dir}"/>
> -        <arg value="${project.start-uri}"/>
> -        <classpath>
> -          <path refid="forrest.cp"/>
> -        </classpath>
> -        <syspropertyset>
> -          <propertyref prefix="forrest."/>
> -          <propertyref prefix="project."/>
> -        </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>
> -        <!-- 
> -        | 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 ..."/>
> -        <copy toDir="${project.site-dir}" 
> -          overwrite="true" failonerror="false">
> -            <fileset dir="${content-dir}/content"> <!-- FIXME: what about raw-content-dir?
-->
> -              <exclude name="xdocs/**"/> <!-- FIXME: should use properties
since they can be overridden in forrest.properties -->
> +    <sequential>
> +      <parallel>
> +        <java classname="org.apache.cocoon.Main"
> +          fork="true"
> +          dir="${forrest.core.webapp}"  
> +          maxmemory="${forrest.maxmemory}"
> +          failonerror="false"
> +          resultproperty="buildResult">
> +          <jvmarg line="${forrest.jvmargs}"/>
> +          <jvmarg value="-Djava.endorsed.dirs=${forrest.endorsed.lib-dir}${path.separator}${java.endorsed.dirs}"/>
> +          <jvmarg value="-Dorg.apache.cocoon.core.LazyMode=true"/>
> +          <arg value="--logLevel=${project.debuglevel}"/>
> +          <arg value="--Logger=${project.logger}"/>
> +          <arg value="--logKitconfig=${project.logkitfile}"/>
> +          <arg value="--destDir=${project.site-dir}"/>
> +          <arg value="--xconf=${project.configfile}"/>
> +          <arg value="--brokenLinkFile=${project.brokenlinkfile}"/>
> +          <arg value="--workDir=${project.cocoon-work-dir}"/>
> +          <arg value="${project.start-uri}"/>
> +          <classpath>
> +            <path refid="forrest.cp"/>
> +          </classpath>
> +          <syspropertyset>
> +            <propertyref prefix="forrest."/>
> +            <propertyref prefix="project."/>
> +          </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>
> +          <!-- 
> +          | 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 ..."/>
> +          <copy toDir="${project.site-dir}" 
> +            overwrite="true" failonerror="false">
> +              <fileset dir="${content-dir}/content"> <!-- FIXME: what about
raw-content-dir? -->
> +                <exclude name="xdocs/**"/> <!-- FIXME: should use properties
since they can be overridden in forrest.properties -->
> +              </fileset>
> +            <fileset dir="${project.webapp}/resources" includes="images"/>
> +          </copy>
> +  
> +          <!-- Copy skin images -->
> +          <echo 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 -->
> +           <!-- Do the common ones first followed by those for the skin. -->
> +          <copy toDir="${project.site-dir}/skin/images" overwrite="true"
> +            failonerror="false">
> +             <fileset dir="${forrest.skins-dir}/common/images"/>
> +          </copy>
> +          <copy toDir="${project.site-dir}/skin/images" overwrite="true"
> +            failonerror="false">
> +             <fileset dir="${forrest.skins-dir}/${project.skin}/images"/>
> +          </copy>
> +  
> +          <!-- Copy project skin images -->
> +          <!-- Do the common ones first followed by those for the skin. -->
> +          <echo 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"/>
> +          </copy>
> +          <copy toDir="${project.site-dir}/skin/images" overwrite="true"
> +            failonerror="false">
> +            <fileset dir="${project.skins-dir}/${project.skin}/images"/>
> +          </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 ..."/>
> +          <copy toDir="${project.site-dir}/skin" 
> +            overwrite="true"
> +            failonerror="false">
> +            <mapper type="flatten"/>
> +            <fileset dir="${forrest.skins-dir}/common">
> +              <exclude name="images/**"/>
> +              <exclude name="xslt/**"/>
>              </fileset>
> -          <fileset dir="${project.webapp}/resources" includes="images"/>
> -        </copy>
> -
> -        <!-- Copy skin images -->
> -        <echo 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 -->
> -         <!-- Do the common ones first followed by those for the skin. -->
> -        <copy toDir="${project.site-dir}/skin/images" overwrite="true"
> -          failonerror="false">
> -           <fileset dir="${forrest.skins-dir}/common/images"/>
> -        </copy>
> -        <copy toDir="${project.site-dir}/skin/images" overwrite="true"
> -          failonerror="false">
> -           <fileset dir="${forrest.skins-dir}/${project.skin}/images"/>
> -        </copy>
> -
> -        <!-- Copy project skin images -->
> -        <!-- Do the common ones first followed by those for the skin. -->
> -        <echo 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"/>
> -        </copy>
> -        <copy toDir="${project.site-dir}/skin/images" overwrite="true"
> -          failonerror="false">
> -          <fileset dir="${project.skins-dir}/${project.skin}/images"/>
> -        </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 ..."/>
> -        <copy toDir="${project.site-dir}/skin" 
> -          overwrite="true"
> -          failonerror="false">
> -          <mapper type="flatten"/>
> -          <fileset dir="${forrest.skins-dir}/common">
> -            <exclude name="images/**"/>
> -            <exclude name="xslt/**"/>
> -          </fileset>
> -        </copy>
> -        <copy toDir="${project.site-dir}/skin" 
> -          overwrite="true"
> -          failonerror="false">
> -          <mapper type="flatten"/>
> -          <fileset dir="${forrest.skins-dir}/${project.skin}">
> -            <exclude name="images/**"/>
> -            <exclude name="xslt/**"/>
> -          </fileset>
> -        </copy>
> -        
> +          </copy>
> +          <copy toDir="${project.site-dir}/skin" 
> +            overwrite="true"
> +            failonerror="false">
> +            <mapper type="flatten"/>
> +            <fileset dir="${forrest.skins-dir}/${project.skin}">
> +              <exclude name="images/**"/>
> +              <exclude name="xslt/**"/>
> +            </fileset>
> +          </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 ..."/>
> +          <copy toDir="${project.site-dir}/skin" 
> +            overwrite="true"
> +            failonerror="false">
> +            <mapper type="flatten"/>
> +            <fileset dir="${project.skins-dir}/common">
> +              <exclude name="images/**"/>
> +              <exclude name="xslt/**"/>
> +            </fileset>
> +          </copy>
> +          <copy toDir="${project.site-dir}/skin" 
> +            overwrite="true"
> +            failonerror="false">
> +            <mapper type="flatten"/>
> +            <fileset dir="${project.skins-dir}/${project.skin}">
> +              <exclude name="images/**"/>
> +              <exclude name="xslt/**"/>
> +            </fileset>
> +          </copy>
> +          <echo>Finished copying the non-generated resources.
> +  Now Cocoon will generate the rest ...</echo>
> +  
> +          <echo>
> +  Static site will be generated at:
> +  ${project.site-dir}
> +  </echo>
> +        </sequential>
> +      </parallel>     
> +      
> +      <echo>
> +  Copying broken links file to site root.
> +      </echo>
> +      <copy toFile="${project.site-dir}/broken-links.xml" file="${project.brokenlinkfile}"/>
> +    </sequential>
> +    
> +    <if>
> +      <equals arg1="${buildResult}" arg2="1"/>
> +      <then>
> +        <fail if="buildResult">
> +Error building site.
>          
> -        <!-- 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 ..."/>
> -        <copy toDir="${project.site-dir}/skin" 
> -          overwrite="true"
> -          failonerror="false">
> -          <mapper type="flatten"/>
> -          <fileset dir="${project.skins-dir}/common">
> -            <exclude name="images/**"/>
> -            <exclude name="xslt/**"/>
> -          </fileset>
> -        </copy>
> -        <copy toDir="${project.site-dir}/skin" 
> -          overwrite="true"
> -          failonerror="false">
> -          <mapper type="flatten"/>
> -          <fileset dir="${project.skins-dir}/${project.skin}">
> -            <exclude name="images/**"/>
> -            <exclude name="xslt/**"/>
> -          </fileset>
> -        </copy>
> -        <echo>Finished copying the non-generated resources.
> -Now Cocoon will generate the rest ...</echo>
> -
> -        <echo>
> -Static site will be generated at:
> -${project.site-dir}
> +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.
> -* Please check the file:
> -${project.brokenlinkfile}
> -for any broken links in the generated site.</echo>
> -      </sequential>
> -    </parallel>
> -    <echo>------------------------------
> +  - See ${project.site-dir}/broken-links.xml
> +        </fail>
> +      </then>
> +    </if>
> +    
> +    <echo>
> +-----------------------------
>  Static site was successfully generated at:
>  ${project.site-dir}
>  ------------------------------
> 
> Modified: forrest/trunk/site-author/status.xml
> URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/status.xml?rev=326555&r1=326554&r2=326555&view=diff
> ==============================================================================
> --- forrest/trunk/site-author/status.xml (original)
> +++ forrest/trunk/site-author/status.xml Wed Oct 19 06:38:02 2005
> @@ -131,6 +131,12 @@
>          <link href="site:v0.80//upgrading_08">upgrading to v0.8</link>
>        </action>
>  
> +      <action context="code" type="add" dev="RDG">
> +        broken-links file is now copied into to the site root as
> +        "broken-links.xml" so that when building with Forrestbot
> +	 you can easily view it.
> +      </action>
> +
>        <action context="code" type="add" dev="TS">
>          The "views" development work has moved to two new plugins.
>          See <link href="site:v0.80//views">views development</link> and
> 

Mime
View raw message