forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527004 - in /forrest/trunk/main: build.xml forrest.antproxy.xml forrest.build.xml module.xml
Date Tue, 10 Apr 2007 03:02:56 GMT
Author: crossley
Date: Mon Apr  9 20:02:54 2007
New Revision: 527004

URL: http://svn.apache.org/viewvc?view=rev&rev=527004
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644

Modified:
    forrest/trunk/main/build.xml
    forrest/trunk/main/forrest.antproxy.xml
    forrest/trunk/main/forrest.build.xml
    forrest/trunk/main/module.xml

Modified: forrest/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?view=diff&rev=527004&r1=527003&r2=527004
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Mon Apr  9 20:02:54 2007
@@ -16,65 +16,50 @@
   limitations under the License.
 -->
 <project default="jar" basedir="." name="Forrest build file">
-
   <description>
-    Build system for Apache Forrest.
-    Run the build script: build.bat or build.sh
+    Build system for Apache Forrest. Run the build script: build.bat or build.sh
   </description>
-
-  <!-- Global properties for taskdef ... -->
+<!-- Global properties for taskdef ... -->
   <property name="forrest.home" location=".."/>
   <property name="forrest.ant.lib-dir"    location="${forrest.home}/tools/ant/lib"/>
-
-  <!-- Defintion of optional but useful targets ... -->
+<!-- Defintion of optional but useful targets ... -->
   <taskdef resource="net/sf/antcontrib/antlib.xml">
     <classpath>
       <fileset dir="${forrest.ant.lib-dir}" includes="ant-contrib-*.jar" />
     </classpath>
   </taskdef>
-
   <target name="init">
     <tstamp>
       <format property="YEAR" pattern="yyyy" locale="en"/>
     </tstamp>
-
-    <xmlproperty file="status.xml"     prefix="xstatus"  keeproot="false" collapseAttributes="true" />   
-
+    <xmlproperty file="status.xml"     prefix="xstatus"  keeproot="false" collapseAttributes="true" />
     <property name="build.compiler.emacs"       value="on"/>
     <property name="build.compiler.warnings"    value="true"/>
     <property name="build.compiler.pedantic"    value="false"/>
     <property name="build.compiler.depend"      value="true"/>
     <property name="build.compiler.fulldepend"  value="true"/>
-    <property name="build.compiler.debug"       value="on"/>    
+    <property name="build.compiler.debug"       value="on"/>
     <property name="build.compiler.optimize"    value="off"/>
     <property name="build.compiler.deprecation" value="on"/>
-    <property name="build.compiler.nowarn"      value="on"/>    
+    <property name="build.compiler.nowarn"      value="on"/>
     <property name="build.compiler.type"        value="classic"/>
     <property name="build.compiler.vm"          value="1.2"/>
-   
     <property name="name" value="apache-forrest"/>
     <property name="forrest.version" value="0.8-dev"/>
     <property name="forrest.core" location="."/>
-
     <property name="java.dir"              location="java"/>
     <property name="plugins.dir"           location="${forrest.home}/plugins"/>
     <property name="build.dir"             location="${forrest.home}/build"/>
     <property name="build.docs"            location="${build.dir}/docs"/>
     <property name="build.classes"         location="${build.dir}/classes"/>
-
     <property name="dist.dir"              location="${build.dir}/dist" />
     <property name="dist-shbat.dir"        location="${dist.dir}/shbat" />
-
     <property name="tools.dir"             location="${forrest.home}/tools"/>
     <property name="tools.jar"             location="${java.home}/../lib/tools.jar"/>
     <available file="${tools.jar}"         property="tools.jar.present"/>
-    
     <property name="src-fresh-site"         location="${forrest.home}/main/fresh-site"/>
-    
     <property name="forrestbot.dir"         location="${forrest.home}/tools/forrestbot"/>
-
     <mkdir dir="${build.dir}"/>
-    
     <buildnumber file="${build.dir}/build.number"/>
     <echo>
       --------------------------------------------------------------
@@ -91,15 +76,12 @@
 
       --------------------------------------------------------------
     </echo>
-    
     <path id="classpath">
       <fileset dir="${forrest.home}/lib" includes="**/*.jar"/>
       <fileset dir="${tools.dir}/jetty" includes="servlet*.jar"/>
       <pathelement location="${tools.jar}"/>
     </path>
-
   </target>
-
   <target name="clean" depends="init" description="Delete all generated files">
     <delete dir="${build.dir}"/>
     <delete dir="${forrestbot.dir}/logs"/>
@@ -110,23 +92,19 @@
     <delete dir="${forrestbot.dir}/webapp/maven.log"/>
     <delete dir="webapp/WEB-INF/logs"/>
   </target>
-
   <target name="dist-clean" depends="init, clean"
      description="Delete all non-forrest files (*.settings, *.bak, *~)">
     <delete dir="${forrestbot.dir}/*.settings"/>
     <delete file="**/*.bak"/>
     <delete file="**/*~"/>
   </target>
-
-  <!-- =================================================================== -->
-  <!-- Make release distributions                                          -->
-  <!-- =================================================================== -->
-
-
+<!-- =================================================================== -->
+<!-- Make release distributions                                          -->
+<!-- =================================================================== -->
   <target name="release-dist" depends="init, dist-clean, dist-shbat" 
     description="Makes release distributions">
     <property name="release-name-bin" value="${name}-${forrest.version}"/>
-    <!-- Prepare *.tar.gz for "lf" eol-style systems -->
+<!-- Prepare *.tar.gz for "lf" eol-style systems -->
     <fixcrlf eol="lf" srcdir="${dist-shbat.dir}" excludes="*.bat"/>
     <tar longfile="gnu" compression="gzip"
       destfile="${dist.dir}/${release-name-bin}.tar.gz" >
@@ -143,25 +121,22 @@
         <include name="**/forrest"/>
       </tarfileset>
     </tar>
-    <!-- Prepare *.zip for "crlf" eol-style systems -->
+<!-- Prepare *.zip for "crlf" eol-style systems -->
     <fixcrlf eol="crlf" srcdir="${dist-shbat.dir}"/>
     <zip
       file="${dist.dir}/${release-name-bin}.zip" >
       <zipfileset dir="${dist-shbat.dir}" prefix="${release-name-bin}"/>
     </zip>
   </target>
-
-
-  <!-- =================================================================== -->
-  <!-- Make all known distributions                                        -->
-  <!-- =================================================================== -->
+<!-- =================================================================== -->
+<!-- Make all known distributions                                        -->
+<!-- =================================================================== -->
   <target name="dist" 
     description="Makes all the known incarnations of forrest"
     depends="clean,dist-shbat" />
-
-  <!-- =================================================================== -->
-  <!-- Use xmlformat on various xml-type files                             -->
-  <!-- =================================================================== -->
+<!-- =================================================================== -->
+<!-- Use xmlformat on various xml-type files                             -->
+<!-- =================================================================== -->
 <!-- Notes:
 You need 'xmlformat' locally installed.
 Change the fileset/@dir to the tree that you want to clean.
@@ -195,38 +170,38 @@
       </fileset>
     </apply>
   </target>
-
   <target name="xmlformat-single" depends="init">
     <exec dir="${build.dir}" executable="xmlformat">
       <arg line="-f${forrest.home}/etc/xmlformat.conf"/>
       <arg line="-i"/>
+<!--
+      <arg line="-v"/>
+-->
       <arg line="${forrest.home}/etc/test-whitespace/test-1.xml"/>
     </exec>
   </target>
-
-  <!-- =================================================================== -->
-  <!-- Test tidy.sf.net on a single xml-type file                          -->
-  <!-- See also etc/tidy-xml.pl                                            -->
-  <!-- =================================================================== -->
+<!-- =================================================================== -->
+<!-- Test tidy.sf.net on a single xml-type file                          -->
+<!-- See also etc/tidy-xml.pl                                            -->
+<!-- =================================================================== -->
   <target name="tidy-xml-file" depends="init">
     <exec dir="${build.dir}" executable="tidy">
       <arg line="-config ${forrest.home}/etc/tidy-config.txt"/>
       <arg line="${forrest.home}/etc/test-whitespace/test-1.xml"/>
     </exec>
   </target>
-
-  <!-- =================================================================== -->
-  <!-- Validate the important core configuration files                     -->
-  <!-- =================================================================== -->
+<!-- =================================================================== -->
+<!-- Validate the important core configuration files                     -->
+<!-- =================================================================== -->
   <target name="validate-config" depends="init"
     description="Validate the important core configuration files">
-    <!-- FIXME allow switch if="validate.config"  -->
+<!-- FIXME allow switch if="validate.config"  -->
     <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
       <classpath>
         <fileset dir="${forrest.home}/lib/core" includes="*.jar" />
       </classpath>
     </taskdef>
-    <!-- skinconf.xml -->
+<!-- skinconf.xml -->
     <echo message="validating **/skinconf.xml ..."/>
     <xmlvalidate failonerror="true" lenient="no" warn="yes">
       <xmlcatalog id="xcat">
@@ -238,35 +213,32 @@
       <fileset dir="${forrest.core}/fresh-site"
         includes="**/skinconf.xml" />
     </xmlvalidate>
-    <!-- All stylesheets **/*.xsl -->
+<!-- All stylesheets **/*.xsl -->
     <echo 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 
+<!-- sitemap.xmap -->
+<!-- commented out see http://issues.apache.org/bugzilla/show_bug.cgi?id=33378 
     <echo 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.
+<!-- book.xml -->
+<!-- FIXME: Need Norm Walsh catalog entity resolver or Jeff's DoctypeChanger.
     <echo message="validating **/book.xml ..."/>
     <jing rngfile="${forrest.core}/resources/schema/relaxng/book-v01.rng">
       <fileset dir="${forrest.core}" includes="**/book.xml"/>
     </jing>
     -->
   </target>
- 
   <target name="dist-shbat" 
     depends="init, jar, validate-config" >
-
-    <!-- fresh drop-off location for the distribution -->
+<!-- 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>
     <copy todir="${dist-shbat.dir}">
       <fileset dir="${forrest.home}" >
@@ -281,42 +253,36 @@
         <exclude name="tools/anttasks/**"/>
       </fileset>
     </copy>
-    
     <echo>Copy plugin related files from ${plugins.dir}</echo>
     <copy todir="${dist-shbat.dir}/plugins">
-       <fileset dir="${plugins.dir}" >
+      <fileset dir="${plugins.dir}" >
         <include name="plugins.xml"/>
         <include name="build.xml"/>
         <include name="pluginTemplate/**"/>
         <include name="org.apache.forrest.plugin.output.pdf/**"/>
       </fileset>
     </copy>
-    
     <echo>Copy whiteboard plugin related files</echo>
     <copy todir="${dist-shbat.dir}/whiteboard/plugins">
-       <fileset dir="${forrest.home}/whiteboard/plugins" >
+      <fileset dir="${forrest.home}/whiteboard/plugins" >
         <include name="whiteboard-plugins.xml"/>
         <include name="build.xml"/>
       </fileset>
     </copy>
-    
     <echo>Copy forrest.jar</echo>
     <copy todir="${dist-shbat.dir}">
-       <fileset dir="${forrest.home}" >
+      <fileset dir="${forrest.home}" >
         <include name="build/xml-forrest.jar"/>
       </fileset>
     </copy>
-    
-    <!-- Fix bin/ permissions -->
+<!-- Fix bin/ permissions -->
     <fixcrlf eol="crlf" srcdir="${dist-shbat.dir}/bin" includes="*.bat"/>
     <fixcrlf eol="lf" srcdir="${dist-shbat.dir}/bin" excludes="*.bat"/>
-    <chmod dir="${dist-shbat.dir}/bin" perm="ugo+rx" excludes="*.bat"/> 
-
-    <!-- Fix ant/bin/ permissions -->
+    <chmod dir="${dist-shbat.dir}/bin" perm="ugo+rx" excludes="*.bat"/>
+<!-- Fix ant/bin/ permissions -->
     <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"/> 
-
+    <chmod dir="${dist-shbat.dir}/tools/ant/bin" perm="ugo+rx" excludes="*.bat"/>
     <echo>
   *-----------------------------------------------------------------
   | installation notice 
@@ -337,10 +303,9 @@
   *-----------------------------------------------------------------
     </echo>
   </target>
-
-  <!-- =================================================================== -->
-  <!-- Generate project-site                                               -->
-  <!-- =================================================================== -->
+<!-- =================================================================== -->
+<!-- Generate project-site                                               -->
+<!-- =================================================================== -->
   <target name="docs" depends="site"/>
   <target name="site" depends="dist-shbat"
     description="Generates static HTML documentation">
@@ -350,18 +315,16 @@
     description="Builds a cocoon webapp for local execution">
     <ant antfile="${forrest.core}/forrest.build.xml" target="webapp"/>
   </target>
-
-  <!-- ================================== -->
-  <!--        Test targets                -->
-  <!-- ================================== -->
+<!-- ================================== -->
+<!--        Test targets                -->
+<!-- ================================== -->
   <target name="test" 
           depends="validate-config, testseed, testPlugins" 
           description="Test that the features are okay before committing."/>
-  
   <target name="testPlugins"
           depends="cleanPlugins"
           description="Test each type of the plugin">
-    <!--
+<!--
       FIXME: these don't work as the compile stage executes since $java.dir = FORREST_HOME/main/java
       instead of PLUGIN_HOME/java
     <echo>=============================</echo>
@@ -386,12 +349,10 @@
     </ant>
     -->
   </target>
-  
   <target name="cleanPlugins"
           description="Remove installed plugins before testing to ensure they are correctly installed when run">
     <delete dir="${forrest.home}/build/plugins"/>
   </target>
-
   <target name="testseed"
 	  depends="init, cleanPlugins"
           description="Called by test target - Seeds and generates the different types of sites (skinned, dispatcher...)">
@@ -400,20 +361,18 @@
         <antcall target="testSiteType">
           <param name="test.site.type" value="@{type}"/>
         </antcall>
-      </sequential> 
+      </sequential>
     </for>
   </target>
-
   <target name="testSiteType"
 	  depends="testSeedSiteType,testReplacePluginsList"
           if="test.site.type"
 	  description="Called by test target - Seeds, replaces list of required plugins and generates a new site for testing">
     <ant antfile="${forrest.core}/forrest.build.xml" target="site">
-      <property name="forrest.home" value="${forrest.home}"/>  
+      <property name="forrest.home" value="${forrest.home}"/>
       <property name="project.home" value="${test.dir}"/>
     </ant>
   </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>
@@ -426,16 +385,15 @@
     <delete dir="${test.dir}"/>
     <mkdir dir="${test.dir}"/>
     <ant antfile="${forrest.core}/forrest.build.xml" target="seed">
-      <property name="forrest.home" value="${forrest.home}"/>  
+      <property name="forrest.home" value="${forrest.home}"/>
       <property name="project.home" value="${test.dir}"/>
-    </ant> 
-    <!-- reading the value of project.required.plugins property if defined in forrest.properties.${test.site.type}.properties -->
+    </ant>
+<!-- reading the value of project.required.plugins property if defined in forrest.properties.${test.site.type}.properties -->
     <property file="${test.dir}/forrest.properties.${test.site.type}.properties"/>
-    <delete file="${test.dir}/forrest.properties.*.properties" failonerror="false"> 
-      <fileset dir="${test.dir}" includes="forrest.properties.*.properties"/> 
+    <delete file="${test.dir}/forrest.properties.*.properties" failonerror="false">
+      <fileset dir="${test.dir}" includes="forrest.properties.*.properties"/>
     </delete>
   </target>
-
   <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">
@@ -443,10 +401,9 @@
     <replaceregexp file="${test.dir}/forrest.properties"
       match="project.required.plugins=(.+)"
       replace="project.required.plugins=${project.required.plugins}"
-      byline="true"/> 
+      byline="true"/>
   </target>
-
-  <!-- ==================================================
+<!-- ==================================================
        Target used by Gump for the main "forrest" project.
        Our gump descriptor also has other projects for other aspects
        of forrest build:
@@ -455,10 +412,9 @@
   <target  name="gump" description="Target used by Gump: forrest">
     <antcall target="jar"/>
   </target>
-  
-  <!-- =================================================================== -->
-  <!-- Compile Cocoon java classes                                         -->
-  <!-- =================================================================== -->
+<!-- =================================================================== -->
+<!-- Compile Cocoon java classes                                         -->
+<!-- =================================================================== -->
   <target name="compile" depends="init">
     <mkdir dir="${build.classes}"/>
     <javac srcdir=   "${java.dir}"
@@ -467,13 +423,11 @@
       optimize=      "${build.compiler.optimize}"
       deprecation=   "${build.compiler.deprecation}"
       nowarn=        "${build.compiler.nowarn}"
-      classpathref=  "classpath">
-    </javac>
+      classpathref=  "classpath"></javac>
   </target>
-
-  <!-- =================================================================== -->
-  <!-- Jar Cocoon classes                                                  -->
-  <!-- =================================================================== -->
+<!-- =================================================================== -->
+<!-- Jar Cocoon classes                                                  -->
+<!-- =================================================================== -->
   <target name="jar" depends="init, compile">
     <jar destfile="${build.dir}/xml-forrest.jar"
       basedir="${build.classes}">
@@ -481,14 +435,14 @@
         <section name="org/apache/forrest/">
           <attribute name="Comment" value="Support classes for Apache Forrest"/>
           <attribute name="Implementation-Title" value="org.apache.forrest"/>
-          <attribute name="Implementation-Version" value="${forrest.version} ${TODAY}"/> 
+          <attribute name="Implementation-Version" value="${forrest.version} ${TODAY}"/>
           <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
           <attribute name="Implementation-URL" value="http://forrest.apache.org/"/>
         </section>
         <section name="org/apache/cocoon/">
           <attribute name="Comment" value="Support classes for Apache Forrest"/>
           <attribute name="Implementation-Title" value="org.apache.cocoon"/>
-          <attribute name="Implementation-Version" value="${forrest.version} ${TODAY}"/> 
+          <attribute name="Implementation-Version" value="${forrest.version} ${TODAY}"/>
           <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
           <attribute name="Implementation-URL" value="http://forrest.apache.org/"/>
         </section>
@@ -509,65 +463,57 @@
   *-----------------------------------------------------------------
     </echo>
   </target>
-
-  <!-- =================================================================== -->
-  <!-- Clean build, that is clean before build                             -->
-  <!-- =================================================================== -->
+<!-- =================================================================== -->
+<!-- Clean build, that is clean before build                             -->
+<!-- =================================================================== -->
   <target name="clean-build" depends="clean, jar" description="Clean build, that is clean before build..." />
-
-  <!-- =================================================================== -->
-  <!-- Generate DTDs with entities expanded                                -->
-  <!-- =================================================================== -->
+<!-- =================================================================== -->
+<!-- Generate DTDs with entities expanded                                -->
+<!-- =================================================================== -->
   <target name='expand-dtd' depends="init"
      description="Generates '-full' DTDs, with all entity refs expanded, for use with catalog-ignorant editors like IDEA">
-	<taskdef name="dtd2xml" classpathref="classpath" classname="org.cyberneko.dtd.anttasks.DTD2XML"/>
-	<property name="dtdx.dir" location="${build.dir}/tmp/dtdx"/>
-	<mkdir dir="${dtdx.dir}"/>
-	<!-- Generate an intermediate XML representation of each DTD -->
-	<dtd2xml classpathref="classpath" outputDir="${dtdx.dir}" preserveDirs="yes" extension=".dtdx">
-		<fileset dir="${forrest.core}/webapp/resources/schema/dtd">
-			<include name="changes-v12.dtd"/>
-			<include name="changes-v13.dtd"/>
-			<include name="document-v11.dtd"/>
-			<include name="document-v12.dtd"/>
-			<include name="document-v13.dtd"/>
-			<include name="faq-v12.dtd"/>
-			<include name="faq-v13.dtd"/>
-			<include name="howto-v12.dtd"/>
-			<include name="howto-v13.dtd"/>
-			<include name="todo-v12.dtd"/>
-			<include name="todo-v13.dtd"/>
-      <include name="v20/document-v20.dtd"/>
-      <include name="v20/changes-v20.dtd"/>
-      <include name="v20/faq-v20.dtd"/>
-      <include name="v20/howto-v20.dtd"/>
-      <include name="v20/todo-v20.dtd"/>
-		</fileset>
-	</dtd2xml>
-
-	<!-- Now transform the intermediate format back to the regular DTD format -->
-	<!-- Note that we could also transform to XSD or RNG -->
-	<xslt basedir="${dtdx.dir}"
+    <taskdef name="dtd2xml" classpathref="classpath" classname="org.cyberneko.dtd.anttasks.DTD2XML"/>
+    <property name="dtdx.dir" location="${build.dir}/tmp/dtdx"/>
+    <mkdir dir="${dtdx.dir}"/>
+<!-- Generate an intermediate XML representation of each DTD -->
+    <dtd2xml classpathref="classpath" outputDir="${dtdx.dir}" preserveDirs="yes" extension=".dtdx">
+      <fileset dir="${forrest.core}/webapp/resources/schema/dtd">
+        <include name="changes-v12.dtd"/>
+        <include name="changes-v13.dtd"/>
+        <include name="document-v11.dtd"/>
+        <include name="document-v12.dtd"/>
+        <include name="document-v13.dtd"/>
+        <include name="faq-v12.dtd"/>
+        <include name="faq-v13.dtd"/>
+        <include name="howto-v12.dtd"/>
+        <include name="howto-v13.dtd"/>
+        <include name="todo-v12.dtd"/>
+        <include name="todo-v13.dtd"/>
+        <include name="v20/document-v20.dtd"/>
+        <include name="v20/changes-v20.dtd"/>
+        <include name="v20/faq-v20.dtd"/>
+        <include name="v20/howto-v20.dtd"/>
+        <include name="v20/todo-v20.dtd"/>
+      </fileset>
+    </dtd2xml>
+<!-- Now transform the intermediate format back to the regular DTD format -->
+<!-- Note that we could also transform to XSD or RNG -->
+    <xslt basedir="${dtdx.dir}"
 		destdir="${dist-shbat.dir}/webapp/resources/schema/dtd"
 		extension="-full.dtd"
     style="${forrest.home}/tools/dtdconverters/dtdx2dtd.xsl">
-    <include name="*.dtdx"/>
-    <include name="v20a/*.dtdx"/>
-  </xslt>
-
-  </target>
-
-
-  <!-- =================================================================== -->
-  <!-- Use Apache Ant to generate a patch file                             -->
-  <!-- =================================================================== -->
-    <target name="patch" depends="init">
+      <include name="*.dtdx"/>
+      <include name="v20a/*.dtdx"/>
+    </xslt>
+  </target>
+<!-- =================================================================== -->
+<!-- Use Apache Ant to generate a patch file                             -->
+<!-- =================================================================== -->
+  <target name="patch" depends="init">
 <!-- Do not advertise this capability. May need to be removed.
      It makes a messy patch when they have other pending changes.
         description="Create a patch from your working copy, ready for contribution">
 -->
-      <ant antfile="${forrest.home}/tools/targets/patch.xml" target="patchpackage"/>
-    </target>
-
-
+    <ant antfile="${forrest.home}/tools/targets/patch.xml" target="patchpackage"/>
+  </target>
 </project>

Modified: forrest/trunk/main/forrest.antproxy.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/forrest.antproxy.xml?view=diff&rev=527004&r1=527003&r2=527004
==============================================================================
--- forrest/trunk/main/forrest.antproxy.xml (original)
+++ forrest/trunk/main/forrest.antproxy.xml Mon Apr  9 20:02:54 2007
@@ -15,15 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--
 This file kept for backwards-compatibility (well, backwards-warning at least).
 In the future we can probably remove it altogether.
 -->
 <project default="site" basedir="." name="Forrest Ant proxy targets">
-
   <property name="obsolete.message" value="${line.separator}${line.separator}The use of forrest-targets.ent as an 'ant proxy' is no longer supported.${line.separator}Please see http://forrest.apache.org/docs/upgrading_06.html#antproxy for upgrade instructions."/>
-
   <target name="validate" description="Validates XML doc files">
     <fail>${obsolete.message}</fail>
   </target>
@@ -36,10 +33,7 @@
   <target name="site" description="Generates static HTML">
     <fail>${obsolete.message}</fail>
   </target>
-
   <target name="forrest">
     <fail>${obsolete.message}</fail>
   </target>
-
-
 </project>

Modified: forrest/trunk/main/forrest.build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/forrest.build.xml?view=diff&rev=527004&r1=527003&r2=527004
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Mon Apr  9 20:02:54 2007
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--
 FORREST SITE BUILDER
 
@@ -23,28 +22,20 @@
  - Contains actions Forrest can peform on any Forrest-using project.
  - This is typically called by forrest.bat or forrest
 -->
-
-
 <project default="site" basedir="." name="forrest">
-
   <property environment="env" />
   <property name="forrest.home"               location="${env.FORREST_HOME}" />
   <property name="forrest.version"            value="0.8-dev"/>
-
   <property name="forrest.lib-dir"            location="${forrest.home}/lib"/>
   <property name="forrest.core.lib-dir"       location="${forrest.lib-dir}/core"/>
   <property name="forrest.endorsed.lib-dir"   location="${forrest.lib-dir}/endorsed"/>
   <property name="forrest.optional.lib-dir"   location="${forrest.lib-dir}/optional"/>
-
   <property name="forrest.ant.lib-dir"        location="${forrest.home}/tools/ant/lib"/>
   <property name="forrest.anttasks"           location="${forrest.home}/tools/anttasks"/>
   <property name="forrest.jetty.lib-dir"      location="${forrest.home}/tools/jetty"/>
-
   <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"/>
-  
   <import file="targets/validate.xml"/>
   <import file="targets/webapp.xml"/>
   <import file="targets/site.xml"/>
@@ -52,15 +43,11 @@
   <import file="targets/plugins.xml"/>
   <import file="targets/context.xml"/>
   <import file="targets/seed.xml"/>
-
   <description>
-    *=======================================================*
-    |                 Forrest Site Builder                  |
-    *=======================================================*
-
-             Call this through the 'forrest' command
+    *=======================================================* | Forrest Site
+    Builder | *=======================================================* Call
+    this through the 'forrest' command
   </description>
-
   <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
     <classpath>
       <fileset dir="${forrest.core.lib-dir}" includes="jing*.jar" />
@@ -71,7 +58,6 @@
       <fileset dir="${forrest.ant.lib-dir}" includes="ant-contrib-*.jar" />
     </classpath>
   </taskdef>
-
 <!-- ***************************************************************** -->
 <!-- ***************************************************************** -->
 <!-- **                                                             ** -->
@@ -81,51 +67,42 @@
 <!-- **                                                             ** -->
 <!-- ***************************************************************** -->
 <!-- ***************************************************************** -->
-
-  <!-- ===============================================================
+<!-- ===============================================================
        Loads user defined settings for local deployment.
        Steps back to defaults when they are not set.
        Echo's the settings if requested.
        =============================================================== -->
   <target name="init-props">
-
-    <!-- setting defaults for parameters -->
-    <!-- people should use -D switch, or <ant><property>s to override these   -->
-
+<!-- setting defaults for parameters -->
+<!-- people should use -D switch, or <ant><property>s to override these   -->
     <property name="project.home" location="." />
     <property file="${project.home}/forrest.properties" />
     <property file="${user.home}/forrest.properties" />
     <property file="${global.home}/forrest.properties" />
     <property file="${forrest.core.webapp}/default-forrest.properties" />
-    
-    <!-- people should use forrest.properties to override following defaults  -->
+<!-- people should use forrest.properties to override following defaults  -->
     <property name="build.plugins-dir"     value="build/plugins"/>
     <property name="forrest.skins-dir"     location="${forrest.core.webapp}/skins"/>
     <property name="forrest.plugins-dir"   location="${forrest.home}/${build.plugins-dir}"/>
-
-    <!-- If the user wants to build i18n in diferent locations this is one way to implemented it--> 
+<!-- If the user wants to build i18n in diferent locations this is one way to implemented it-->
     <if>
-        <equals arg1="${project.i18n}" arg2="true"/>
-        <then>
-          <property name="project.site-dir"      location="${project.build-dir}/${project.site}/${user.language}"    />
-        </then>
-        <else>
-          <property name="project.site-dir"      location="${project.build-dir}/${project.site}"    />
-        </else>
+      <equals arg1="${project.i18n}" arg2="true"/>
+      <then>
+        <property name="project.site-dir"      location="${project.build-dir}/${project.site}/${user.language}"    />
+      </then>
+      <else>
+        <property name="project.site-dir"      location="${project.build-dir}/${project.site}"    />
+      </else>
     </if>
     <property name="project.war"           location="${project.build-dir}/${project.name}.war" />
     <property name="project.webapp"        location="${project.build-dir}/webapp" />
-
     <property name="project.cocoon-work-dir"    location="${project.temp-dir}/cocoon-work"      />
-
     <property name="project.brokenlinkfile" location="${project.temp-dir}/brokenlinks.xml"/>
     <property name="project.configfile"     value="${forrest.core.webapp}/WEB-INF/cli.xconf" />
     <property name="project.logkitfile"     value="${forrest.core.webapp}/WEB-INF/logkit.xconf" />
     <property name="project.logger"         value="debug" />
-
     <property name="status"      location="${project.home}/${project.status}" />
-
-    <!-- FIXME: rename project.content-dir to project.documentation-dir -->
+<!-- FIXME: rename project.content-dir to project.documentation-dir -->
     <property name="content-dir" location="${project.home}/${project.content-dir}" />
     <property name="raw-content-dir" location="${project.home}/${project.content-dir}/content" />
     <property name="sitemap-dir"     location="${project.home}/${project.sitemap-dir}" />
@@ -137,23 +114,19 @@
     <property name="lib-dir"     location="${project.home}/${project.lib-dir}" />
     <property name="classes-dir" location="${project.home}/${project.classes-dir}" />
     <property name="translations-dir" location="${project.home}/${project.translations-dir}" />
-
-    <!-- checks for presence of tools.jar -->
+<!-- checks for presence of tools.jar -->
     <property name="tools.jar"           location="${java.home}/../lib/tools.jar"/>
     <available file="${tools.jar}"       property="tools.jar.present"/>
-
-    <!-- Define filters for project.* properties -->
+<!-- Define filters for project.* properties -->
     <mkdir dir="${project.temp-dir}"/>
     <property name="projfilters" value="${project.temp-dir}/projfilters.properties"/>
     <echoproperties prefix="project" destfile="${projfilters}"/>
     <filter filtersfile="${projfilters}"/>
     <filter token="forrest.home" value="${forrest.home}"/>
     <filter token="project.home" value="${project.home}"/>
-
     <available file="${content-dir}/jettyconf.xml"
       property="custom_jetty_config"/>
-
-    <!--
+<!--
     Skin aliasing for backwards compatability
         0.5 => 0.6+
         krysalis-site => ... warn about future removal
@@ -166,29 +139,29 @@
     This must be kept in sync with ForrestConfModule.java/aliasSkinProperties()
     -->
     <if>
-        <equals arg1="${project.skin}" arg2="forrest-css"/>
+      <equals arg1="${project.skin}" arg2="forrest-css"/>
+      <then>
+        <property name="project.new-skin-name" value="pelt"/>
+      </then>
+      <elseif>
+        <equals arg1="${project.skin}" arg2="avalon-tigris"/>
         <then>
-            <property name="project.new-skin-name" value="pelt"/>
+          <property name="project.new-skin-name" value="tigris"/>
         </then>
-        <elseif>
-            <equals arg1="${project.skin}" arg2="avalon-tigris"/>
-            <then>
-                <property name="project.new-skin-name" value="tigris"/>
-            </then>
-        </elseif>
-        <elseif>
-            <equals arg1="${project.skin}" arg2="tigris-style"/>
-            <then>
-                <property name="project.new-skin-name" value="tigris"/>
-            </then>
-        </elseif>
-        <elseif>
-            <equals arg1="${project.skin}" arg2="crust"/>
-            <then>
-                <property name="project.new-skin-name" value="krysalis-site"/>
-            </then>
-        </elseif>
-        <!-- temporarily bring back krysalis-site
+      </elseif>
+      <elseif>
+        <equals arg1="${project.skin}" arg2="tigris-style"/>
+        <then>
+          <property name="project.new-skin-name" value="tigris"/>
+        </then>
+      </elseif>
+      <elseif>
+        <equals arg1="${project.skin}" arg2="crust"/>
+        <then>
+          <property name="project.new-skin-name" value="krysalis-site"/>
+        </then>
+      </elseif>
+<!-- temporarily bring back krysalis-site
         <elseif>
             <equals arg1="${project.skin}" arg2="krysalis-site"/>
             <then>
@@ -196,7 +169,7 @@
             </then>
         </elseif>
         -->
-        <!-- temporarily bring back forrest-site
+<!-- temporarily bring back forrest-site
         <elseif>
             <equals arg1="${project.skin}" arg2="forrest-site"/>
             <then>
@@ -206,9 +179,9 @@
         -->
     </if>
     <if>
-        <isset property="project.new-skin-name"/>
-        <then>
-<echo>
+      <isset property="project.new-skin-name"/>
+      <then>
+        <echo>
 -- Warning --
 skin "${project.skin}" no longer exists, the skin named
 "${project.new-skin-name}" will be automatically used instead.
@@ -223,17 +196,17 @@
 Please update forrest.properties to choose a new skin
 and so remove this warning.
 </echo>
-            <var name="project.skin" value="${project.new-skin-name}"/>
-        </then>
+        <var name="project.skin" value="${project.new-skin-name}"/>
+      </then>
     </if>
     <if>
       <or>
-          <equals arg1="${project.skin}" arg2="forrest-site"/>
-          <equals arg1="${project.skin}" arg2="krysalis-site"/>
-          <equals arg1="${project.skin}" arg2="crust"/>
+        <equals arg1="${project.skin}" arg2="forrest-site"/>
+        <equals arg1="${project.skin}" arg2="krysalis-site"/>
+        <equals arg1="${project.skin}" arg2="crust"/>
       </or>
       <then>
-<echo>
+        <echo>
 -- Warning --
 Using skin "${project.skin}" which is deprecated.
 Please migrate to one of the new skins listed in forrest.properties.
@@ -241,11 +214,9 @@
 </echo>
       </then>
     </if>
-
-    <!-- echo settings in -Dforrest.echo=true mode -->
+<!-- echo settings in -Dforrest.echo=true mode -->
     <antcall target="echo-settings" />
-
-    <!-- Gather some build information about this Forrest instance,
+<!-- Gather some build information about this Forrest instance,
       to be used later by Cocoon. -->
     <echo file="${project.temp-dir}/build-info.xml">&lt;info>
   &lt;project-skin>${project.skin}&lt;/project-skin>
@@ -253,7 +224,6 @@
 &lt;/info>
     </echo>
   </target>
-
   <target name="examine-proj" depends="init-props">
     <available property="conf.present" file="${conf-dir}" type="dir"/>
     <available property="raw-content.present" file="${raw-content-dir}" type="dir"/>
@@ -269,33 +239,28 @@
     <available property="skinconf.present" file="${skinconf}"/>
     <available property="status.present" file="${status}"/>
   </target>
-
-  <!-- Load properties from user's skinconf.xml, if it is defined -->
+<!-- Load properties from user's skinconf.xml, if it is defined -->
   <target name="load-project-props" depends="validation-props, prepare-context" if="skinconf.present">
     <xslt in="${skinconf}"
           out="${project.temp-dir}/no-doctype-project-skinconf.xml"
           style="${forrest.core.webapp}/resources/stylesheets/strip-doctype.xsl">
-        <xmlcatalog refid="fcatalog"/>
+      <xmlcatalog refid="fcatalog"/>
     </xslt>
-
     <xmlproperty file="${project.temp-dir}/no-doctype-project-skinconf.xml"
                  collapseattributes="true"/>
   </target>
-
-  <!-- Load properties from Forrest's default skinconf.xml, unless a user's is defined -->
+<!-- Load properties from Forrest's default skinconf.xml, unless a user's is defined -->
   <target name="load-forrest-props" unless="skinconf.present">
-     <xslt in="${forrest.core.webapp}/skinconf.xml"
+    <xslt in="${forrest.core.webapp}/skinconf.xml"
            out="${project.temp-dir}/no-doctype-forrest-skinconf.xml"
            style="${forrest.core.webapp}/resources/stylesheets/strip-doctype.xsl">
-        <xmlcatalog refid="fcatalog"/>
+      <xmlcatalog refid="fcatalog"/>
     </xslt>
-
-    <!-- Forrest skinconf should have been previously validated in build.xml -->
+<!-- Forrest skinconf should have been previously validated in build.xml -->
     <xmlproperty file="${project.temp-dir}/no-doctype-forrest-skinconf.xml"
                  collapseattributes="true"/>
   </target>
-
-  <!-- Define filters equating to elements in the skinconf.xml file. Skins can
+<!-- Define filters equating to elements in the skinconf.xml file. Skins can
   include tokens corresponding to skinconf.xml elements, and have them replaced
   at runtime.-->
   <target name="init-skinprops" depends="load-project-props, load-forrest-props">
@@ -304,12 +269,11 @@
     <echoproperties prefix="skinconfig" destfile="${skinfilters}"/>
     <filter filtersfile="${skinfilters}"/>
     <condition property="use-lucene-indexer">
-        <equals arg1="${skinconfig.search.provider}" arg2="lucene"/>
+      <equals arg1="${skinconfig.search.provider}" arg2="lucene"/>
     </condition>
   </target>
-
   <target name="check-java-version">
-    <!-- check java version, else user may get a confusing java.lang.UnsupportedClassVersionError -->
+<!-- check java version, else user may get a confusing java.lang.UnsupportedClassVersionError -->
     <if>
       <or>
         <equals arg1="${ant.java.version}" arg2="1.1"/>
@@ -323,60 +287,56 @@
     <echo message="This is apache-forrest-${forrest.version}"/>
     <echo message="Using Java ${ant.java.version} from ${java.home}"/>
   </target>
-
-  <!-- Sets up properties and filters -->
+<!-- Sets up properties and filters -->
   <target name="init" depends="check-java-version, init-props, init-skins, init-plugins">
     <available property="xml-forrest.jar.exists" file="${forrest.build.lib-dir}/xml-forrest.jar"/>
     <fail unless="xml-forrest.jar.exists">You must build forrest before you can run it.  In ${forrest.home}/main run './build.sh' (linux) or 'build' (windows)</fail>
   </target>
-
-  <!-- ===============================================================
+<!-- ===============================================================
        Echo's the settings if requested. [-Dforrest.echo=true]
        =============================================================== -->
   <target name="echo-settings" if="forrest.echo">
     <loadfile property="echo-settings-message" srcFile="${forrest.core}/var/echo-settings-message.txt">
-       <filterchain><expandproperties/></filterchain>
+      <filterchain>
+        <expandproperties/>
+      </filterchain>
     </loadfile>
     <echo>${echo-settings-message}</echo>
   </target>
-
-
-  <!-- ===============================================================
+<!-- ===============================================================
        Set class-path.
        =============================================================== -->
   <target name="prepare-classpath" depends="prepare-context, -prepare-classpath"/>
   <target name="-prepare-classpath">
     <path id="forrest.cp">
-         <pathelement path="${env.CLASSPATH}" />
-         <pathelement location="${forrest.core.webapp}/WEB-INF/classes"/>
-         <pathelement location="${forrest.build.lib-dir}/xml-forrest.jar"/>
-         <pathelement location="${project.home}/${project.classes-dir}"/>
-         <pathelement location="${project.build-dir}"/>
-         <fileset dir="${forrest.plugins-dir}" casesensitive="no">
-           <include name="**/lib/*.jar"/>
-           <include name="**/lib/*.zip"/>
-         </fileset>
-         <fileset dir="${forrest.jetty.lib-dir}" casesensitive="no">
-           <include name="*.jar"/>
-           <include name="*.zip"/>
-         </fileset>
-         <fileset dir="${forrest.endorsed.lib-dir}"  casesensitive="no">
-           <include name="*.jar"/>
-           <include name="*.zip"/>
-         </fileset>
-         <fileset dir="${forrest.core.lib-dir}"  casesensitive="no">
-           <include name="*.jar"/>
-           <include name="*.zip"/>
-         </fileset>
-         <fileset dir="${forrest.optional.lib-dir}"  casesensitive="no">
-           <include name="*.jar"/>
-           <include name="*.zip"/>
-         </fileset>
-         <pathelement location="${tools.jar}"/>
+      <pathelement path="${env.CLASSPATH}" />
+      <pathelement location="${forrest.core.webapp}/WEB-INF/classes"/>
+      <pathelement location="${forrest.build.lib-dir}/xml-forrest.jar"/>
+      <pathelement location="${project.home}/${project.classes-dir}"/>
+      <pathelement location="${project.build-dir}"/>
+      <fileset dir="${forrest.plugins-dir}" casesensitive="no">
+        <include name="**/lib/*.jar"/>
+        <include name="**/lib/*.zip"/>
+      </fileset>
+      <fileset dir="${forrest.jetty.lib-dir}" casesensitive="no">
+        <include name="*.jar"/>
+        <include name="*.zip"/>
+      </fileset>
+      <fileset dir="${forrest.endorsed.lib-dir}"  casesensitive="no">
+        <include name="*.jar"/>
+        <include name="*.zip"/>
+      </fileset>
+      <fileset dir="${forrest.core.lib-dir}"  casesensitive="no">
+        <include name="*.jar"/>
+        <include name="*.zip"/>
+      </fileset>
+      <fileset dir="${forrest.optional.lib-dir}"  casesensitive="no">
+        <include name="*.jar"/>
+        <include name="*.zip"/>
+      </fileset>
+      <pathelement location="${tools.jar}"/>
     </path>
   </target>
-
-
 <!-- ***************************************************************** -->
 <!-- ***************************************************************** -->
 <!-- **                                                             ** -->
@@ -386,9 +346,7 @@
 <!-- **                                                             ** -->
 <!-- ***************************************************************** -->
 <!-- ***************************************************************** -->
-
-
-  <!-- ===============================================================
+<!-- ===============================================================
        Cleans the site.  (typically before generating the new version)
        param: location to clean ${project.site-dir}
        param: location to clean ${project.temp-dir}
@@ -407,7 +365,6 @@
   </target>
   <target name="clean" depends="clean-site,clean-work"
       description="* Clean all directories and files generated during the build"/>
-
 <!-- ***************************************************************** -->
 <!-- ***************************************************************** -->
 <!-- **                                                             ** -->
@@ -417,12 +374,9 @@
 <!-- **                                                             ** -->
 <!-- ***************************************************************** -->
 <!-- ***************************************************************** -->
-
-
   <target name="run"
    depends="init, check-contentdir, ensure-content, run_custom_jetty, run_default_jetty"
    description="* Run Jetty (instant live webapp)"/>
-
   <target name="run_custom_jetty"
    if="custom_jetty_config"
    description="Run Jetty with configuration file found in the project">
@@ -432,7 +386,7 @@
     <if>
       <os family="dos"/>
       <then>
-      <echo>
+        <echo>
          ... and reply 'n' and press [Enter] 
   	     when asked about aborting the batch!
       </echo>
@@ -443,22 +397,21 @@
           fork="yes"
           maxmemory="${forrest.maxmemory}"
           failonerror="yes">
-       <classpath>
-         <path refid="forrest.cp"/>
-       </classpath>
-       <jvmarg line="${forrest.jvmargs}"/>
-       <jvmarg
+      <classpath>
+        <path refid="forrest.cp"/>
+      </classpath>
+      <jvmarg line="${forrest.jvmargs}"/>
+      <jvmarg
          value="-Djava.endorsed.dirs=${java.endorsed.dirs}${path.separator}${forrest.endorsed.lib-dir}"/>
-       <arg line="${content-dir}/jettyconf.xml" />
-       <syspropertyset>
-         <propertyref prefix="forrest."/>
-         <propertyref prefix="project."/>
-         <propertyref name="user.home"/>
-         <propertyref name="global.home"/>
-       </syspropertyset>
+      <arg line="${content-dir}/jettyconf.xml" />
+      <syspropertyset>
+        <propertyref prefix="forrest."/>
+        <propertyref prefix="project."/>
+        <propertyref name="user.home"/>
+        <propertyref name="global.home"/>
+      </syspropertyset>
     </java>
   </target>
-
   <target name="run_default_jetty"
    description="Run Jetty with configuration file found in Forrest">
     <echo>
@@ -467,7 +420,7 @@
     <if>
       <os family="dos"/>
       <then>
-      <echo>
+        <echo>
          ... and reply 'n' and press [Enter] 
   	     when asked about aborting the batch!
       </echo>
@@ -478,22 +431,21 @@
           fork="yes"
           maxmemory="${forrest.maxmemory}"
           failonerror="yes">
-       <classpath>
-         <path refid="forrest.cp"/>
-       </classpath>
-       <jvmarg line="${forrest.jvmargs}"/>
-       <jvmarg
+      <classpath>
+        <path refid="forrest.cp"/>
+      </classpath>
+      <jvmarg line="${forrest.jvmargs}"/>
+      <jvmarg
          value="-Djava.endorsed.dirs=${java.endorsed.dirs}${path.separator}${forrest.endorsed.lib-dir}"/>
-       <arg value="${forrest.core.webapp}/jettyconf.xml" />
-       <syspropertyset>
-         <propertyref prefix="forrest."/>
-         <propertyref prefix="project."/>
-         <propertyref name="user.home"/>
-         <propertyref name="global.home"/>
-       </syspropertyset>
+      <arg value="${forrest.core.webapp}/jettyconf.xml" />
+      <syspropertyset>
+        <propertyref prefix="forrest."/>
+        <propertyref prefix="project."/>
+        <propertyref name="user.home"/>
+        <propertyref name="global.home"/>
+      </syspropertyset>
     </java>
   </target>
-
 <!-- ***************************************************************** -->
 <!-- ***************************************************************** -->
 <!-- **                                                             ** -->
@@ -516,5 +468,4 @@
       </else>
     </if>
   </target>
-
 </project>

Modified: forrest/trunk/main/module.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/module.xml?view=diff&rev=527004&r1=527003&r2=527004
==============================================================================
--- forrest/trunk/main/module.xml (original)
+++ forrest/trunk/main/module.xml Mon Apr  9 20:02:54 2007
@@ -15,16 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--+
     | Gump descriptor for Apache Forrest 
     +-->
 <module name="xml-forrest">
-
   <url href="http://forrest.apache.org/"/>
-
   <svn repository="forrest" dir="trunk/"/>
-
   <mailing-lists>
     <mailing-list mail="dev@forrest.apache.org"
        subscribe="dev-subscribe@forrest.apache.org"
@@ -32,8 +28,8 @@
        user="developer"/>
   </mailing-lists>
   <description>
-   Apache Forrest is an XML standards-oriented documentation framework
-   based upon Apache Cocoon.
+    Apache Forrest is an XML standards-oriented documentation framework based
+    upon Apache Cocoon.
   </description>
   <detailed>
      Apache Forrest is an XML standards-oriented documentation framework
@@ -57,14 +53,12 @@
     <credit>Apache Ant (http://ant.apache.org/)</credit>
     <credit>Chaperon (http://chaperon.sourceforge.net/)</credit>
   </credits>
-
   <project name="xml-forrest">
     <version fix="0" major="0" minor="7" tag="-dev"/>
     <package>org.apache.forrest</package>
     <ant/>
-
-    <!-- Project jars Forrest build strictly depends on -->
-    <!-- needed for build -->
+<!-- Project jars Forrest build strictly depends on -->
+<!-- needed for build -->
     <depend project="jakarta-ant"/>
     <depend project="ant-contrib"/>
     <depend project="xml-xerces"/>
@@ -72,42 +66,33 @@
     <depend project="cocoon" inherit="all"/>
     <depend project="jakarta-oro"/>
     <depend project="nekopull"/>
-
-    <!-- Project jars Forrest build can optionally use  -->
-    <!-- <option project="xxx"/> -->
-
-    <!-- Work dirs to be included in classpath  -->
+<!-- Project jars Forrest build can optionally use  -->
+<!-- <option project="xxx"/> -->
+<!-- Work dirs to be included in classpath  -->
     <work nested="build/components/classes"/>
     <work nested="build/scratchpad/classes"/>
-
     <home nested="build"/>
-
-    <!-- jars - the result of the build  -->
+<!-- jars - the result of the build  -->
     <jar id="components" name="xml-forrest.jar"/>
     <jar id="scratchpad" name="xml-forrest-scratchpad.jar"/>
-
-    <!-- Javadocs - location in the build dirs  -->
-    <!--    <javadoc parent="build/javadocs"/>   -->
-
-    <!-- Getting ready for automatic site updates
+<!-- Javadocs - location in the build dirs  -->
+<!--    <javadoc parent="build/javadocs"/>   -->
+<!-- Getting ready for automatic site updates
     <deliver fromdir="build/xml-forrest/docs"
              tosite="xml-apache-org"
              todir="forrest/" />
     -->
-
     <nag from="nicolaken@apache.org" to="dev@forrest.apache.org"/>
   </project>
-
   <project name="nekopull">
     <url href="http://www.apache.org/~andyc/neko/doc/pull/index.html"/>
     <description>
-      NekoPull is an XML document parsing API that extends the
-      Xerces Native Interface (XNI) to provide pull parsing functionality.
+      NekoPull is an XML document parsing API that extends the Xerces Native
+      Interface (XNI) to provide pull parsing functionality.
     </description>
     <home nested="lib/core"/>
     <jar name="nekopull-0.2.4.jar"/>
   </project>
-
   <project name="xml-forrest-forrestbar">
     <ant target="forrestbar"/>
     <home nested="build"/>
@@ -116,7 +101,6 @@
     <jar id="forrestbar" name="forrestbar.xpi"/>
     <nag from="nicolaken@apache.org" to="dev@forrest.apache.org"/>
   </project>
-
   <project name="xml-forrest-scratchpad-forrestdoc">
     <ant basedir="scratchpad/forrestdoc" target="jar" >
       <property name="version" value="@@DATE@@"/>
@@ -132,7 +116,6 @@
     <jar id="forrestdoc" name="xml-forrest-scratchpad-forrestdoc-@@DATE@@.jar"/>
     <nag from="nicolaken@apache.org" to="dev@forrest.apache.org"/>
   </project>
-
   <project name="xml-forrest-scratchpad-forrestdoc-autotest">
     <ant basedir="scratchpad/forrestdoc" target="project" />
     <home nested="scratchpad/forrestdoc/build"/>



Mime
View raw message