forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527002 - in /forrest/trunk/main/targets: context.xml plugins.xml seed.xml site.xml skins.xml validate.xml webapp.xml
Date Tue, 10 Apr 2007 02:46:13 GMT
Author: crossley
Date: Mon Apr  9 19:46:10 2007
New Revision: 527002

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

Modified:
    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

Modified: forrest/trunk/main/targets/context.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/context.xml?view=diff&rev=527002&r1=527001&r2=527002
==============================================================================
--- forrest/trunk/main/targets/context.xml (original)
+++ forrest/trunk/main/targets/context.xml Mon Apr  9 19:46:10 2007
@@ -16,8 +16,7 @@
   limitations under the License.
 -->
 <project default="prepare-context" basedir="." name="context">
-
-  <!-- ===============================================================
+<!-- ===============================================================
        Makes the Cocoon context dir to work in and fills it completely.
        That is by depending on:
          bare-context     // for forrest predefines.  
@@ -32,8 +31,7 @@
        param: location to make temporary context-dir ${project.webapp} 
        =============================================================== -->
   <target name="prepare-context" depends="init, bare-context, project-context" />
-
-  <!-- ===============================================================
+<!-- ===============================================================
        Fills the Cocoon context dir for local execution 
        with the forrest-predefines.
        param: name of the skin to use ${project.skin} (now)
@@ -43,22 +41,18 @@
     <echo>____________________________________</echo>
     <echo>Using skin "${project.skin}"</echo>
     <echo>____________________________________</echo>
-
     <mkdir dir="${project.webapp}"/>
-
     <sync todir="${project.webapp}">
       <fileset dir="${forrest.core.webapp}" >
         <include name="**" />
       </fileset>
     </sync>
-
-    <!--Hack to stop the classpath definition breaking. If the project has any
+<!--Hack to stop the classpath definition breaking. If the project has any
     custom jars or classes, they will be added to these dirs -->
     <mkdir dir="${project.webapp}/WEB-INF/lib"/>
     <mkdir dir="${project.webapp}/WEB-INF/classes"/>
   </target>
-
-  <!-- ===============================================================
+<!-- ===============================================================
        Fills the Cocoon context dir to work in 
        with the project-content-parts 
          (now: copy stuff from param ${content-dir}
@@ -69,7 +63,6 @@
        =============================================================== -->
   <target name="project-context" depends="examine-proj, ensure-content,
     validate, init, bare-context, copy-sitemap, copy-conf, copy-status"/>
-
   <target name="copy-conf" if="conf.present">
     <copy toDir="${project.webapp}/WEB-INF" filtering="false"
       overwrite="true" failonerror="false">
@@ -84,8 +77,7 @@
       </fileset>
       <mapper type="glob" from="*-${forrest.version}.xconf" to="*.xconf"/>
     </copy>
-   </target>
-
+  </target>
   <target name="copy-sitemap" if="sitemap.present">
 <!--FIXME: Now that we don't copy anymore, this target should be renamed -->
     <copy toDir="${project.webapp}" filtering="false" overwrite="true" failonerror="false">
@@ -94,12 +86,10 @@
       </fileset>
     </copy>
   </target>
-
   <target name="copy-status" if="status.present">
     <copy file="${status}" todir="${project.webapp}" />
   </target>
-
-  <!-- ===============================================================
+<!-- ===============================================================
        Checks if the current project contains Forrest docs, and sets
        the 'project.empty' property if no docs are found.
        =============================================================== -->
@@ -107,7 +97,6 @@
     <available property="project.content.present" file="${content-dir}"
       type="dir"/>
   </target>
-
   <target name="ensure-nocontent" depends="check-contentdir"
     if="project.content.present" unless="skip.contentcheck">
     <fail>
@@ -118,7 +107,6 @@
 ------------------------------------------------
     </fail>
   </target>
-
   <target name="ensure-content" depends="check-contentdir"
     unless="project.content.present">
     <fail>
@@ -128,36 +116,33 @@
 ------------------------------------------------
     </fail>
   </target>
-
- 
-  <!-- ===============================================================
+<!-- ===============================================================
        Prepares the Lucene context indexing the site. 
        =============================================================== -->
   <target name="lucene-index" depends="init-skinprops" if="use-lucene-indexer">
-   <java classname="org.apache.cocoon.Main"
+    <java classname="org.apache.cocoon.Main"
         dir="${project.webapp}"
         fork="true"
         failonerror="true"
         maxmemory="${forrest.maxmemory}">
-        <jvmarg line="${forrest.jvmargs}"/>
-        <jvmarg value="-Djava.endorsed.dirs=${forrest.endorsed.lib-dir}${path.separator}${java.endorsed.dirs}"/>
-        <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="--followLinks=false"/>
-        <arg value="lucene-update.html"/>
-        <classpath>
-          <path refid="forrest.cp"/>
-        </classpath>
-        <syspropertyset>
-          <propertyref prefix="forrest."/>
-          <propertyref prefix="project."/>
-          <propertyref name="user.home"/>
-          <propertyref name="global.home"/>
-        </syspropertyset>
-      </java>
-</target>
-
+      <jvmarg line="${forrest.jvmargs}"/>
+      <jvmarg value="-Djava.endorsed.dirs=${forrest.endorsed.lib-dir}${path.separator}${java.endorsed.dirs}"/>
+      <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="--followLinks=false"/>
+      <arg value="lucene-update.html"/>
+      <classpath>
+        <path refid="forrest.cp"/>
+      </classpath>
+      <syspropertyset>
+        <propertyref prefix="forrest."/>
+        <propertyref prefix="project."/>
+        <propertyref name="user.home"/>
+        <propertyref name="global.home"/>
+      </syspropertyset>
+    </java>
+  </target>
 </project>

Modified: forrest/trunk/main/targets/plugins.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/plugins.xml?view=diff&rev=527002&r1=527001&r2=527002
==============================================================================
--- forrest/trunk/main/targets/plugins.xml (original)
+++ forrest/trunk/main/targets/plugins.xml Mon Apr  9 19:46:10 2007
@@ -15,10 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <project basedir="." name="plugins">
-   <!-- public targets -->     
-     
+<!-- public targets -->
   <target name="available-plugins"
           depends="init-props, plugin-unavailable, fetch-plugins-descriptors"
           description="What plugins are available?">
@@ -29,17 +27,15 @@
       <sequential>
         <xslt in="@{plugin-descriptor-file}" 
           out="${project.temp-dir}/pluginlist2echobuild.xml"
-          style="${forrest.core}/var/pluginlist2echo.xsl"/>  
-    <ant antfile="${project.temp-dir}/pluginlist2echobuild.xml"/>
+          style="${forrest.core}/var/pluginlist2echo.xsl"/>
+        <ant antfile="${project.temp-dir}/pluginlist2echobuild.xml"/>
       </sequential>
     </for>
-  </target>   
-
-  <target name="plugin-unavailable">   
+  </target>
+  <target name="plugin-unavailable">
     <property name="plugin.unavailable" value="true"/>
-  </target>  
-  
-  <target name="check-plugin">  
+  </target>
+  <target name="check-plugin">
     <condition property="plugin.unavailable">
       <and>
         <not>
@@ -59,31 +55,32 @@
         <echo>${versioned.name} is available in the build dir. Trying to update it...</echo>
       </else>
     </if>
-  </target>  
-            
+  </target>
   <target name="unpack-plugin"
            if="downloaded"
           depends="init-props">
-     <if>
-       <available file="${forrest.plugins-dir}/${versioned.name}.zip"/>
-       <then>
-         <antcall target="extract-plugin">
-           <param name="plugin" value="${versioned.name}"/>
-         </antcall>
-       </then>
-       <else>
-         <if>
-           <available file="${forrest.plugins-dir}/${plugin.name}.zip"/>
-           <then>
-             <antcall target="extract-plugin">
-               <param name="plugin" value="${plugin.name}"/>
-             </antcall>
-           </then>
-           <else>
-             <if>
-               <not><available file="${forrest.plugins-dir}/${plugin.name}"/></not>
-               <then>
-                 <echo>
+    <if>
+      <available file="${forrest.plugins-dir}/${versioned.name}.zip"/>
+      <then>
+        <antcall target="extract-plugin">
+          <param name="plugin" value="${versioned.name}"/>
+        </antcall>
+      </then>
+      <else>
+        <if>
+          <available file="${forrest.plugins-dir}/${plugin.name}.zip"/>
+          <then>
+            <antcall target="extract-plugin">
+              <param name="plugin" value="${plugin.name}"/>
+            </antcall>
+          </then>
+          <else>
+            <if>
+              <not>
+                <available file="${forrest.plugins-dir}/${plugin.name}"/>
+              </not>
+              <then>
+                <echo>
 ERROR
 =====
        
@@ -107,42 +104,39 @@
 Note that once the plugins have been installed, they will not need
 to be installed again unless you delete them or wish to upgrade them.
                  </echo>
-                 <fail message="Unable to install required plugins. See error messages above for more detail."/>
-               </then>
-             </if>
-           </else>
-         </if>
-       </else>
-   </if>
-  </target>  
-  
+                <fail message="Unable to install required plugins. See error messages above for more detail."/>
+              </then>
+            </if>
+          </else>
+        </if>
+      </else>
+    </if>
+  </target>
   <target name="extract-plugin">
-   <unzip dest="${forrest.plugins-dir}/${plugin}">
-     <fileset dir="${forrest.plugins-dir}/">
+    <unzip dest="${forrest.plugins-dir}/${plugin}">
+      <fileset dir="${forrest.plugins-dir}/">
         <include name="${plugin}.zip"/>
       </fileset>
-   </unzip>
-
-   <!-- add to the entity catalog -->
-   <copy file="${forrest.core}/var/initial_catalog.xcat"
+    </unzip>
+<!-- add to the entity catalog -->
+    <copy file="${forrest.core}/var/initial_catalog.xcat"
      tofile="${forrest.plugins-dir}/catalog.xcat"
      overwrite="false"/>
-   <if>
-     <available file="${forrest.plugins-dir}/${plugin}/resources/schema/catalog.xcat"/>
-     <then>
-       <xslt in="${forrest.plugins-dir}/catalog.xcat"
+    <if>
+      <available file="${forrest.plugins-dir}/${plugin}/resources/schema/catalog.xcat"/>
+      <then>
+        <xslt in="${forrest.plugins-dir}/catalog.xcat"
            out="${forrest.plugins-dir}/catalog.xcat.new"
            style="${forrest.core}/var/catalogMountSnippet.xsl"
            force="true">
-         <param name="plugin-catalog-path"
+          <param name="plugin-catalog-path"
            expression="${plugin}/resources/schema/catalog.xcat"/>
-       </xslt>
-       <move file="${forrest.plugins-dir}/catalog.xcat.new" 
+        </xslt>
+        <move file="${forrest.plugins-dir}/catalog.xcat.new" 
          tofile="${forrest.plugins-dir}/catalog.xcat"/>
-     </then>
-   </if>
+      </then>
+    </if>
   </target>
-  
   <target name="configure-plugin"
     unless="plugin.unavailable">
     <if>
@@ -223,77 +217,72 @@
       </else>
     </if>
   </target>
-  
   <target name="configure-input-plugin">
-     <!-- add the snippet to plugins/input.xmap that will mount the plugin
+<!-- add the snippet to plugins/input.xmap that will mount the plugin
           specific input.xmap -->
-     <echo>Mounting input plugin: ${plugin}</echo>
-     <xslt in="${project.temp-dir}/input.xmap"
+    <echo>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"
        force="true">
-           <param name="plugin-name" expression="${plugin}"/>  
-           <param name="plugin-type" expression="input"/>  
-     </xslt>
-     <move file="${project.temp-dir}/input.xmap.new" 
+      <param name="plugin-name" expression="${plugin}"/>
+      <param name="plugin-type" expression="input"/>
+    </xslt>
+    <move file="${project.temp-dir}/input.xmap.new" 
        tofile="${project.temp-dir}/input.xmap"/>
-     <xslt in="${project.temp-dir}/resources.xmap"
+    <xslt in="${project.temp-dir}/resources.xmap"
        out="${project.temp-dir}/resources.xmap.new"
        style="${forrest.core}/var/pluginMountSnippet.xsl"
        force="true">
-           <param name="plugin-name" expression="${plugin}"/>  
-           <param name="plugin-type" expression="resources"/>  
-     </xslt>
-     <move file="${project.temp-dir}/resources.xmap.new" 
+      <param name="plugin-name" expression="${plugin}"/>
+      <param name="plugin-type" expression="resources"/>
+    </xslt>
+    <move file="${project.temp-dir}/resources.xmap.new" 
        tofile="${project.temp-dir}/resources.xmap"/>
   </target>
-  
   <target name="configure-output-plugin">
-     <!-- add the snippet to plugins/output.xmap that will mount the plugin
+<!-- add the snippet to plugins/output.xmap that will mount the plugin
           specific input.xmap -->
-     <echo>Mounting output plugin: ${plugin}</echo>
-     <xslt in="${project.temp-dir}/output.xmap"
+    <echo>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"
        force="true">
-           <param name="plugin-name" expression="${plugin}"/>  
-           <param name="plugin-type" expression="output"/>  
-     </xslt>
-     <move file="${project.temp-dir}/output.xmap.new" 
+      <param name="plugin-name" expression="${plugin}"/>
+      <param name="plugin-type" expression="output"/>
+    </xslt>
+    <move file="${project.temp-dir}/output.xmap.new" 
        tofile="${project.temp-dir}/output.xmap"/>
   </target>
-  
   <target name="configure-internal-plugin">
-     <!-- add the snippet to plugins/internal.xmap that will mount the plugin
+<!-- add the snippet to plugins/internal.xmap that will mount the plugin
           specific input.xmap -->
-     <echo>Mounting internal plugin: ${plugin}</echo>
-     <xslt in="${project.temp-dir}/internal.xmap"
+    <echo>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"
        force="true">
-           <param name="plugin-name" expression="${plugin}"/>  
-           <param name="plugin-type" expression="internal"/>  
-     </xslt>
-     <move file="${project.temp-dir}/internal.xmap.new" 
+      <param name="plugin-name" expression="${plugin}"/>
+      <param name="plugin-type" expression="internal"/>
+    </xslt>
+    <move file="${project.temp-dir}/internal.xmap.new" 
        tofile="${project.temp-dir}/internal.xmap"/>
   </target>
-  
   <target name="configure-plugin-locationmap">
-     <!-- add the snippet to plugins/locationmap.xml that will mount the plugin
+<!-- add the snippet to plugins/locationmap.xml that will mount the plugin
           specific locationmap -->
-     <echo>Mounting plugin locationmap for ${plugin}</echo>
-     <xslt in="${project.temp-dir}/locationmap.xml"
+    <echo>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"
        force="true">
-           <param name="plugin-name" expression="${plugin}"/>  
-     </xslt>
-     <move file="${project.temp-dir}/locationmap.xml.new" 
+      <param name="plugin-name" expression="${plugin}"/>
+    </xslt>
+    <move file="${project.temp-dir}/locationmap.xml.new" 
        tofile="${project.temp-dir}/locationmap.xml"/>
   </target>
-
   <target name="fetch-plugins-descriptors" depends="init-proxy" unless="plugins.desc.already.fetched">
-    <!-- Copy the initial local descriptors, then replace them with the
+<!-- Copy the initial local descriptors, then replace them with the
       published descriptors. This enables offline operation. -->
     <copy file="${forrest.home}/plugins/plugins.xml"
       tofile="${project.temp-dir}/plugins-1.xml"
@@ -313,7 +302,6 @@
         <math result="plugin-counter" operand1="${plugin-counter}" operation="+" operand2="1" datatype="int"/>
       </sequential>
     </for>
-    
     <var name="plugin-counter" value="1"/>
     <for list="${forrest.plugins.descriptors}" param="url">
       <sequential>
@@ -335,40 +323,39 @@
         <math result="plugin-counter" operand1="${plugin-counter}" operation="+" operand2="1" datatype="int"/>
       </sequential>
     </for>
-  </target>  
-  
+  </target>
   <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>
     <trycatch property="plugin-found">
       <try>
-      	<for param="plugin-descriptor-file">
-      		<path>
-        		<fileset dir="${project.temp-dir}" includes="plugins-*.xml"/>
-      		</path>
-      		<sequential>
-      		  <echo>Using the descriptor file @{plugin-descriptor-file}...</echo>
-		        <xslt in="@{plugin-descriptor-file}" 
+        <for param="plugin-descriptor-file">
+          <path>
+            <fileset dir="${project.temp-dir}" includes="plugins-*.xml"/>
+          </path>
+          <sequential>
+            <echo>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"
 		          force="true">
-		          <param name="plugin-name" expression="${plugin.name}"/>  
-		          <param name="plugin-version" expression="${plugin.version}"/>  
-		          <param name="plugin-dir" expression="${forrest.plugins-dir}/"/>  
-		          <param name="plugin-src-dir" expression="${project.required.plugins.src}"/>
-		          <param name="forrest-version" expression="${forrest.version}"/>   
-		       	</xslt>  
-		       	<antfetch antfile="${project.temp-dir}/pluginlist2fetchbuild.xml" return="plugin-found,downloaded"/>
-		       	<fail if="plugin-found"/>
-      		</sequential>
-		    </for>
+              <param name="plugin-name" expression="${plugin.name}"/>
+              <param name="plugin-version" expression="${plugin.version}"/>
+              <param name="plugin-dir" expression="${forrest.plugins-dir}/"/>
+              <param name="plugin-src-dir" expression="${project.required.plugins.src}"/>
+              <param name="forrest-version" expression="${forrest.version}"/>
+            </xslt>
+            <antfetch antfile="${project.temp-dir}/pluginlist2fetchbuild.xml" return="plugin-found,downloaded"/>
+            <fail if="plugin-found"/>
+          </sequential>
+        </for>
       </try>
       <catch>
         <echo>Fetch-plugin Ok, installing !</echo>
       </catch>
     </trycatch>
-    <!-- Here we stop if the description of a plugin has not been found... -->
+<!-- Here we stop if the description of a plugin has not been found... -->
     <fail unless="plugin-found">STOP GENERATION !
     WARNING - Cannot find the plugin description
     ============================================ 
@@ -380,17 +367,13 @@
       - Check the name of the plugin and correct it in case it is wrong,
       - Add the missing descriptor file in the list in the forrest.plugins.descriptors variable (forrest.properties) if necessary...
     </fail>
-  </target>    
-  
+  </target>
   <target name="install-plugin" depends="check-plugin, fetch-plugin, unpack-plugin"/>
-  
   <target name="init-plugins" depends="init-props, fetch-plugins-descriptors"
     description="Ensure the required plugins are available locally, if any are not, download them automatically">
-    
     <mkdir dir="${forrest.plugins-dir}"/>
     <mkdir dir="${project.temp-dir}"/>
-        <mkdir dir="${project.webapp}/conf"/>
-        
+    <mkdir dir="${project.webapp}/conf"/>
     <copy file="${forrest.core}/var/initial_plugins_sitemap.xmap"
       tofile="${project.temp-dir}/input.xmap"
       overwrite="true"/>
@@ -406,8 +389,7 @@
     <copy file="${forrest.core}/var/initial_plugins_locationmap.xml"
           tofile="${project.temp-dir}/locationmap.xml"
       overwrite="true"/>
-
-      <for list="${project.required.plugins}" param="name">
+    <for list="${project.required.plugins}" param="name">
       <sequential>
         <echo>
       --------------------------------------------------------------
@@ -443,5 +425,4 @@
       </sequential>
     </for>
   </target>
-  
 </project>

Modified: forrest/trunk/main/targets/seed.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/seed.xml?view=diff&rev=527002&r1=527001&r2=527002
==============================================================================
--- forrest/trunk/main/targets/seed.xml (original)
+++ forrest/trunk/main/targets/seed.xml Mon Apr  9 19:46:10 2007
@@ -16,9 +16,6 @@
   limitations under the License.
 -->
 <project default="seed" basedir="." name="Forrest Seed Targets">
-
-
-
 <!-- ***************************************************************** -->
 <!-- ***************************************************************** -->
 <!-- **                                                             ** -->
@@ -28,51 +25,50 @@
 <!-- **                                                             ** -->
 <!-- ***************************************************************** -->
 <!-- ***************************************************************** -->
-
-
-  <!-- ===============================================================
+<!-- ===============================================================
         Copies a template structure over to your project dir.
        =============================================================== -->
   <target name="seed" depends="ensure-nocontent"
     description="Seeds a directory with a template project doc structure">
-     <copy todir="${project.home}" overwrite="false">
-        <fileset dir="${forrest.core}/fresh-site"/>
-     </copy>
-     <loadfile  property="template-project-created-message" srcFile="${forrest.core}/var/template-project-created-message-sample.txt">
-        <filterchain><expandproperties/></filterchain>
+    <copy todir="${project.home}" overwrite="false">
+      <fileset dir="${forrest.core}/fresh-site"/>
+    </copy>
+    <loadfile  property="template-project-created-message" srcFile="${forrest.core}/var/template-project-created-message-sample.txt">
+      <filterchain>
+        <expandproperties/>
+      </filterchain>
     </loadfile>
     <echo>${template-project-created-message}</echo>
   </target>
-  
   <target name="seed-sample" description="* Seeds a directory with a template project doc structure">
     <antcall target="seed"/>
   </target>
-  
   <target name="seed-basic" depends="ensure-nocontent"
     description="* Seeds a basic example (1 file) and structure">
-     <copy todir="${project.home}" overwrite="false">
-        <fileset dir="${forrest.core}/template-sites/basic"/>
-     </copy>
-     <loadfile  property="template-project-created-message" srcFile="${forrest.core}/var/template-project-created-message-basic.txt">
-        <filterchain><expandproperties/></filterchain>
+    <copy todir="${project.home}" overwrite="false">
+      <fileset dir="${forrest.core}/template-sites/basic"/>
+    </copy>
+    <loadfile  property="template-project-created-message" srcFile="${forrest.core}/var/template-project-created-message-basic.txt">
+      <filterchain>
+        <expandproperties/>
+      </filterchain>
     </loadfile>
     <echo>${template-project-created-message}</echo>
   </target>
-
   <target name="seed-benchmark" depends="ensure-nocontent"
     description="* Seeds a site to use for benchmarking measurements">
-     <copy todir="${project.home}" overwrite="false">
+    <copy todir="${project.home}" overwrite="false">
       <fileset dir="${forrest.core}/template-sites/benchmark"/>
-     </copy>
-     <loadfile property="template-project-created-message" srcFile="${forrest.core}/var/template-project-created-message-basic.txt">
-      <filterchain><expandproperties/></filterchain>
+    </copy>
+    <loadfile property="template-project-created-message" srcFile="${forrest.core}/var/template-project-created-message-basic.txt">
+      <filterchain>
+        <expandproperties/>
+      </filterchain>
     </loadfile>
     <echo>${template-project-created-message}</echo>
   </target>
-
   <target name="seedTestBusiness"  depends="ensure-nocontent"
     description="A test business site">
-    
     <property name="project.display.name" value="The Forresters"/>
     <property name="project.description" value="The Forresters is a (fictitious) company providing support for the users and developers of the Apache Forrest Project."/>
     <property name="project.domain" value="forrest.apache.org"/>
@@ -84,20 +80,16 @@
     <property name="copyright.owner" value="The Apache Software Foundation"/>
     <property name="search.provider" value="google"/>
     <property name="search.box.location" value="default"/>
-    
     <property name="seed-template" value="business"/>
     <antcall target="-copyTemplate"/>
   </target>
-
   <target name="seed-business"  depends="ensure-nocontent, getProperties"
     description="A typical business site">
     <property name="seed-template" value="business"/>
     <antcall target="-copyTemplate"/>
   </target>
-
   <target name="getProperties" 
     depends="getProjectProperties, getGroupProperties, getSearchProperties"/>
-  
   <target name="getProjectProperties">
     <input message="What is the name of the project you wish to create a site for?"
            addproperty="project.display.name"/>
@@ -108,7 +100,6 @@
     <input message="What is the URL for this project?"
            addproperty="project.url"/>
   </target>
-  
   <target name="getGroupProperties">
     <input message="What name of the group you wish to create a site for?"
            addproperty="group.display.name"/>
@@ -121,7 +112,6 @@
     <input message="Who is the copyright owner of the site?"
            addproperty="copyright.owner"/>
   </target>
-  
   <target name="getSearchProperties">
     <input message="Which search provider would you like to use?"
            validargs="google,lucene"
@@ -132,26 +122,25 @@
            defaultvalue="default"
            addproperty="search.box.location"/>
   </target>
-  
   <target name="-copyTemplate">
-     <copy todir="${project.home}" overwrite="false" filtering="true">
-        <fileset dir="${forrest.core}/template-sites/${seed-template}"/>
-        <filterset>
-          <!-- Project properties -->
-          <filter token="project.display.name" value="${project.display.name}"/>
-          <filter token="project.description" value="${project.description}"/>
-          <filter token="project.domain" value="${project.domain}"/>
-          <filter token="project.url" value="${project.url}"/>
-          <!-- Group properties -->
-          <filter token="group.display.name" value="${group.display.name}"/>
-          <filter token="group.description" value="${group.description}"/>
-          <filter token="group.domain" value="${group.domain}"/>
-          <filter token="group.url" value="${group.url}"/>
-          <filter token="copyright.owner" value="${copyright.owner}"/>
-          <!-- Search properties -->
-          <filter token="search.provider" value="${search.provider}"/>
-          <filter token="search.box.location" value="${search.box.location}"/>
-        </filterset>
-     </copy>
+    <copy todir="${project.home}" overwrite="false" filtering="true">
+      <fileset dir="${forrest.core}/template-sites/${seed-template}"/>
+      <filterset>
+<!-- Project properties -->
+        <filter token="project.display.name" value="${project.display.name}"/>
+        <filter token="project.description" value="${project.description}"/>
+        <filter token="project.domain" value="${project.domain}"/>
+        <filter token="project.url" value="${project.url}"/>
+<!-- Group properties -->
+        <filter token="group.display.name" value="${group.display.name}"/>
+        <filter token="group.description" value="${group.description}"/>
+        <filter token="group.domain" value="${group.domain}"/>
+        <filter token="group.url" value="${group.url}"/>
+        <filter token="copyright.owner" value="${copyright.owner}"/>
+<!-- Search properties -->
+        <filter token="search.provider" value="${search.provider}"/>
+        <filter token="search.box.location" value="${search.box.location}"/>
+      </filterset>
+    </copy>
   </target>
 </project>

Modified: forrest/trunk/main/targets/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/site.xml?view=diff&rev=527002&r1=527001&r2=527002
==============================================================================
--- forrest/trunk/main/targets/site.xml (original)
+++ forrest/trunk/main/targets/site.xml Mon Apr  9 19:46:10 2007
@@ -15,10 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <project default="site" basedir="." name="site">
-  
-   <!-- ===============================================================
+<!-- ===============================================================
        Makes the site.
        param: name of the skin to use ${project.skin} (now)
        param: location to find the content ${content-dir}(now)
@@ -28,11 +26,9 @@
        param: location of log-file ${project.logkitfile}
        ===============================================================
    -->
-
-   <target name="site" depends="init, -prepare-classpath, check-contentdir, validate" 
+  <target name="site" depends="init, -prepare-classpath, check-contentdir, validate" 
                        if="project.content.present"
                        description="* Generates a static HTML website for this project">
-
     <sequential>
       <parallel>
         <java classname="org.apache.cocoon.Main"
@@ -61,14 +57,13 @@
             <propertyref name="user.home"/>
             <propertyref name="global.home"/>
           </syspropertyset>
-        </java> 
-  
+        </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.
@@ -76,33 +71,33 @@
           <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="${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 -->
+<!-- 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. -->
+<!-- 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">
-               <exclude name="**/*.xslt"/>
-             </fileset>
+            <fileset dir="${forrest.skins-dir}/common/images">
+              <exclude name="**/*.xslt"/>
+            </fileset>
           </copy>
           <copy toDir="${project.site-dir}/skin/images" overwrite="true"
             failonerror="false">
-             <fileset dir="${forrest.skins-dir}/${project.skin}/images">
-               <exclude name="**/*.xslt"/>
-             </fileset>
-          </copy>
-  
-          <!-- Copy project skin images -->
-          <!-- Do the common ones first followed by those for the skin. -->
+            <fileset dir="${forrest.skins-dir}/${project.skin}/images">
+              <exclude name="**/*.xslt"/>
+            </fileset>
+          </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">
@@ -114,9 +109,8 @@
               <exclude name="**/*.xslt"/>
             </fileset>
           </copy>
-  
-          <!-- Copy all other non-resource files -->
-          <!-- Do the common ones first followed by those for the skin. -->
+<!-- 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"
@@ -140,10 +134,8 @@
               <exclude name="skinconf.xsl"/>
             </fileset>
           </copy>
-          
-          
-          <!-- Copy all other non-resource files from project skins-->
-          <!-- Do the common ones first followed by those for the skin. -->
+<!-- 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"
@@ -176,14 +168,12 @@
   - in column 1: *=okay X=brokenLink ^=pageSkipped (see FAQ).
   </echo>
         </sequential>
-      </parallel>     
-      
+      </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>
@@ -201,8 +191,7 @@
         </fail>
       </then>
     </if>
-
-    <!-- Fix inconsistent line endings. Workaround for FOR-492
+<!-- Fix inconsistent line endings. Workaround for FOR-492
       Default "eol" attribute will set line endings appropriate to current OS.
     -->
 <!-- However, due to Ant bug 39585, fixcrlf/@eol is broken on "Mac OS X" so
@@ -215,18 +204,17 @@
       <equals arg1="${isUnix}" arg2="true"/>
       <then>
         <fixcrlf srcdir="${project.site-dir}" eol="unix">
-                <include name="**/*.html"/>
+          <include name="**/*.html"/>
         </fixcrlf>
       </then>
       <else>
         <fixcrlf srcdir="${project.site-dir}">
-                <include name="**/*.html"/>
-                <!-- The CSS Includes are a workaround for FOR-925 -->
-                <include name="**/*.css"/>
+          <include name="**/*.html"/>
+<!-- The CSS Includes are a workaround for FOR-925 -->
+          <include name="**/*.css"/>
         </fixcrlf>
       </else>
     </if>
-
     <echo>
 -----------------------------
 Static site was successfully generated at:
@@ -234,6 +222,4 @@
 ------------------------------
     </echo>
   </target>
-  
-
 </project>

Modified: forrest/trunk/main/targets/skins.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/skins.xml?view=diff&rev=527002&r1=527001&r2=527002
==============================================================================
--- forrest/trunk/main/targets/skins.xml (original)
+++ forrest/trunk/main/targets/skins.xml Mon Apr  9 19:46:10 2007
@@ -15,11 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <project basedir="." name="skins">
-   <!-- public targets -->     
-     
-    <target name="available-skins"
+<!-- public targets -->
+  <target name="available-skins"
           depends="init-props, skin-unavailable, fetch-skins-descriptors"
           description="What skins are available?">
     <for param="skin-descriptor-file">
@@ -29,12 +27,11 @@
       <sequential>
         <xslt in="@{skin-descriptor-file}" 
           out="${project.temp-dir}/skinlist2echobuild.xml"
-          style="${forrest.core}/var/skinlist2echo.xsl"/>  
-    <ant antfile="${project.temp-dir}/skinlist2echobuild.xml"/>
+          style="${forrest.core}/var/skinlist2echo.xsl"/>
+        <ant antfile="${project.temp-dir}/skinlist2echobuild.xml"/>
       </sequential>
     </for>
-  </target>  
-  
+  </target>
   <target name="package-skin" description="Make a package of an existing skin" depends="init-props">
     <input message="Which skin do you want to package?"
            addproperty="skin-name"/>
@@ -42,20 +39,15 @@
        basedir="${forrest.skins-dir}/"
        includes="${skin-name}/**"/>
   </target>
-
   <target name="install-skin" 
           depends = "init-skins"
           description="Install the needed skin from the remote repository"/>
-          
-  <!-- private -->        
-                
-  <target name="init-skins" depends="init-props, check-skin, fetch-skin, unpack-skins"/>   
-
-  <target name="skin-unavailable">   
+<!-- private -->
+  <target name="init-skins" depends="init-props, check-skin, fetch-skin, unpack-skins"/>
+  <target name="skin-unavailable">
     <property name="skin.unavailable" value="true"/>
-  </target>  
-  
-  <target name="check-skin">   
+  </target>
+  <target name="check-skin">
     <condition property="skin.unavailable">
       <and>
         <not>
@@ -66,30 +58,27 @@
         </not>
         <not>
           <available type="dir" file="${skins-dir}/${project.skin}"/>
-        </not>        
+        </not>
       </and>
     </condition>
-  </target>  
-            
+  </target>
   <target name="unpack-skins"
           depends="init-props">
-     <unzip dest="${forrest.skins-dir}/">
-       <fileset dir="${forrest.skins-dir}/">
-          <include name="*.zip"/>
-        </fileset>
-     </unzip>       
-     <delete>
-        <fileset dir="${forrest.skins-dir}/">
-          <include name="*.zip"/>
-        </fileset>
-     </delete>
-  </target>  
-
+    <unzip dest="${forrest.skins-dir}/">
+      <fileset dir="${forrest.skins-dir}/">
+        <include name="*.zip"/>
+      </fileset>
+    </unzip>
+    <delete>
+      <fileset dir="${forrest.skins-dir}/">
+        <include name="*.zip"/>
+      </fileset>
+    </delete>
+  </target>
   <target name="fetch-skins-descriptors" if="skin.unavailable" depends="init-proxy">
     <delete>
       <fileset dir="${forrest.skins-dir}" includes="skins-*.xml"/>
     </delete>
-  
     <var name="skin-counter" value="1"/>
     <for list="${forrest.skins.descriptors}" param="url">
       <sequential>
@@ -98,11 +87,11 @@
            dest="${forrest.skins-dir}/skins-${skin-counter}.xml"
            verbose="true" usetimestamp="true" ignoreerrors="true"/>
         <if>
-        <not>
-       		<available file="${forrest.skins-dir}/skins-${skin-counter}.xml"/>
-       	</not>
-       <then>
-       <fail>Stopped...
+          <not>
+            <available file="${forrest.skins-dir}/skins-${skin-counter}.xml"/>
+          </not>
+          <then>
+            <fail>Stopped...
 ERROR
 =====
        
@@ -112,13 +101,12 @@
 the file. If you are behind a firewall then set the proxy.host 
 and proxy.port values in the forrest.properties file.
        </fail>
-     </then>
-   </if>
+          </then>
+        </if>
         <math result="skin-counter" operand1="${skin-counter}" operation="+" operand2="1" datatype="int"/>
       </sequential>
     </for>
-  </target>  
-  
+  </target>
   <target name="fetch-skin" 
           if = "skin.unavailable"
           depends="init-props, fetch-skins-descriptors">
@@ -131,12 +119,11 @@
           out="${project.temp-dir}/skinlist2fetchbuild.xml"
           style="${forrest.core}/var/skinlist2fetch.xsl"
           force="true">
-      <param name="skin-name" expression="${project.skin}"/>      
-      <param name="forrest-version" expression="${forrest.version}"/>   
-    </xslt>  
-    <ant antfile="${project.temp-dir}/skinlist2fetchbuild.xml"/>
+          <param name="skin-name" expression="${project.skin}"/>
+          <param name="forrest-version" expression="${forrest.version}"/>
+        </xslt>
+        <ant antfile="${project.temp-dir}/skinlist2fetchbuild.xml"/>
       </sequential>
     </for>
-  </target>    
-  
+  </target>
 </project>

Modified: forrest/trunk/main/targets/validate.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/validate.xml?view=diff&rev=527002&r1=527001&r2=527002
==============================================================================
--- forrest/trunk/main/targets/validate.xml (original)
+++ forrest/trunk/main/targets/validate.xml Mon Apr  9 19:46:10 2007
@@ -15,16 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <project default="validate" basedir="." name="validate">
-
   <target name="validate" depends="validation-props, validate-xdocs,
     validate-skinconf, validate-sitemap, validate-skins, validate-skinchoice,
     validate-stylesheets"  description="Validate all: xdocs, skins, sitemap, etc"/>
-    
   <target name="validation-props" depends="examine-proj">
-    <!-- Validation flags -->
-
+<!-- Validation flags -->
     <property name="forrest.validate" value="true" />
     <condition property="validate">
       <istrue value="${forrest.validate}"/>
@@ -32,7 +28,6 @@
     <property name="forrest.validate.failonerror" value="true" />
     <property name="forrest.validate.includes" value="**/*"/>
     <property name="forrest.validate.excludes" value=""/>
-
     <property name="forrest.validate.xdocs" value="${forrest.validate}"/>
     <condition property="validate.xdocs">
       <and>
@@ -44,7 +39,6 @@
     <property name="forrest.validate.xdocs.excludes" value="site.xml,.*.swp"/>
     <property name="forrest.validate.xdocs.failonerror"
       value="${forrest.validate.failonerror}" />
-
     <property name="forrest.validate.skinconf" value="${forrest.validate}"/>
     <condition property="validate.skinconf">
       <and>
@@ -57,7 +51,6 @@
     <property name="forrest.validate.skinconf.excludes" value=""/>
     <property name="forrest.validate.skinconf.failonerror"
       value="${forrest.validate.failonerror}" />
-
     <property name="forrest.validate.sitemap" value="${forrest.validate}"/>
     <condition property="validate.sitemap">
       <and>
@@ -65,12 +58,10 @@
         <isset property="sitemap.present"/>
       </and>
     </condition>
-
     <property name="forrest.validate.sitemap.includes" value=""/>
     <property name="forrest.validate.sitemap.excludes" value=""/>
     <property name="forrest.validate.sitemap.failonerror"
       value="${forrest.validate.failonerror}" />
-
     <property name="forrest.validate.stylesheets" value="${forrest.validate}"/>
     <condition property="validate.stylesheets">
       <and>
@@ -82,7 +73,6 @@
     <property name="forrest.validate.stylesheets.excludes" value=""/>
     <property name="forrest.validate.stylesheets.failonerror"
       value="${forrest.validate.failonerror}" />
-
     <property name="forrest.validate.skins" value="${forrest.validate}"/>
     <condition property="validate.skins">
       <and>
@@ -94,7 +84,6 @@
     <property name="forrest.validate.skins.excludes" value="**/*.xsl"/>
     <property name="forrest.validate.skins.failonerror"
       value="${forrest.validate.failonerror}" />
-
     <property name="forrest.validate.skins.stylesheets" value="${forrest.validate.skins}"/>
     <condition property="validate.skins.stylesheets">
       <and>
@@ -107,8 +96,6 @@
     <property name="forrest.validate.skins.stylesheets.failonerror"
       value="${forrest.validate.skins.failonerror}" />
   </target>
-    
-    
   <target name="validate-site" depends="load-project-props">
     <condition property="forrest.validate.skinconf.disable-xml-link">
       <and>
@@ -140,7 +127,6 @@
     </xmlvalidate>
     <echo message="...validated site"/>
   </target>
-
   <target name="validate-xdocs" depends="validation-props" if="validate.xdocs"
       description="Validate the project xdocs">
     <echo level="verbose" message="Using these catalog descriptors:
@@ -156,7 +142,6 @@
     </xmlvalidate>
     <echo message="...validated xdocs"/>
   </target>
-
   <target name="validate-skinconf" depends="validation-props"
           if="validate.skinconf" description="Validate skinconf">
     <xmlvalidate failonerror="${forrest.validate.skinconf.failonerror}" 
@@ -168,7 +153,6 @@
     </xmlvalidate>
     <echo message="...validated skinconf"/>
   </target>
-
   <target name="validate-sitemap" depends="validation-props"
     if="validate.sitemap" description="Validate the project sitemap">
     <jing rngfile="${forrest.core.webapp}/resources/schema/relaxng/sitemap-v06.rng">
@@ -180,7 +164,6 @@
     </jing>
     <echo message="...validated project sitemap"/>
   </target>
-
   <target name="validate-stylesheets" depends="validation-props"
     if="validate.stylesheets" description="Validate XSL files">
     <jing rngfile="${forrest.core.webapp}/resources/schema/relaxng/xslt.rng">
@@ -190,9 +173,7 @@
     </jing>
     <echo message="...validated stylesheets"/>
   </target>
-
   <target name="validate-skins" depends="validate-skins-stylesheets" description="Validate skins"/>
-
   <target name="validate-skins-stylesheets" depends="validation-props"
     if="validate.skins.stylesheets">
     <jing rngfile="${forrest.core.webapp}/resources/schema/relaxng/xslt.rng">
@@ -202,8 +183,7 @@
     </jing>
     <echo message="...validated skin stylesheets"/>
   </target>
-
-  <!-- Check that ${project.skin} points to an existing skin. -->
+<!-- Check that ${project.skin} points to an existing skin. -->
   <target name="validate-skinchoice" depends="validation-props" description="Validate skin choice">
     <condition property="project.skin.present">
       <available file="${project.skin}" type="dir">
@@ -211,15 +191,14 @@
         <filepath path="${forrest.skins-dir}"/>
       </available>
     </condition>
-
     <loadfile property="skin-not-found-message" srcFile="${forrest.core}/var/skin-not-found-message.txt">
-      <filterchain><expandproperties/></filterchain>
+      <filterchain>
+        <expandproperties/>
+      </filterchain>
     </loadfile>
-      
     <fail unless="project.skin.present">
       ${skin-not-found-message}
     </fail>
     <echo 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?view=diff&rev=527002&r1=527001&r2=527002
==============================================================================
--- forrest/trunk/main/targets/webapp.xml (original)
+++ forrest/trunk/main/targets/webapp.xml Mon Apr  9 19:46:10 2007
@@ -15,10 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <project default="run-webapp" basedir="." name="run-webapp">
-  
-    <target name="project.webapp.defined" unless="project.webapp">
+  <target name="project.webapp.defined" unless="project.webapp">
     <fail>
       ------------------------------------------------
       Error: $${project.webapp} variable has not been set. This is where the
@@ -26,66 +24,56 @@
       ------------------------------------------------
     </fail>
   </target>
-  
-  <!-- ===============================================================
+<!-- ===============================================================
        Builds a cocoon webapp for local execution.
        Note, this webapp is not suitable for deploying remotely as it
        is configured to allow editing of files in the ${project.home} 
        directory.
        param: location to put generated webapp ${project.webapp}
        =============================================================== -->
-  
-<target name="webapp-local" depends="init, validate, project.webapp.defined, ensure-content, prepare-context,
+  <target name="webapp-local" depends="init, validate, project.webapp.defined, ensure-content, prepare-context,
          load-project-props"
    description="Generates a dynamic servlet-based website (an unpackaged webapp).  Note this webapp is suitable for local execution only, use the 'war' or 'webapp' target if you wish to deploy remotely.">
-    <!-- this will need revisions in the case of the siteplan
+<!-- this will need revisions in the case of the siteplan
     extra project-custom classes then will need to be warred in as well. -->
 <!--  should be already there
     <mkdir dir="${project.webapp}/WEB-INF"/>
     <copy file="${forrest.core.webapp}/WEB-INF/web.xml" filtering="true" 
       todir="${project.webapp}/WEB-INF"/>
 -->
-    
-    <!-- Prepare the Lucene search index -->
+<!-- Prepare the Lucene search index -->
     <condition property="use-lucene-indexer">
-        <equals arg1="${skinconfig.search.provider}" arg2="lucene"/>
+      <equals arg1="${skinconfig.search.provider}" arg2="lucene"/>
     </condition>
     <antcall target="lucene-index" />
-
     <available file="${content-dir}/jettyconf.xml" 
       property="custom_jetty_config"/>
-
     <loadfile  property="webapp-local-generated-message" srcFile="${forrest.core}/var/webapp-local-generated-message.txt">
-        <filterchain><expandproperties/></filterchain>
+      <filterchain>
+        <expandproperties/>
+      </filterchain>
     </loadfile>
     <echo>${webapp-local-generated-message}</echo>
   </target>
-  
-
-
-
 <!-- ===============================================================
        Builds a cocoon webapp of your project for remote deployment.
        param: location to put generated webapp ${project.webapp}
        =============================================================== -->
   <target name="run-webapp" depends="webapp-local, copy-xdocs, copy-content"
    description="Generates a dynamic servlet-based website (an unpackaged webapp).">
-   
-   <!--
+<!--
      Copy libs
    -->
     <copy toDir="${project.webapp}/WEB-INF/lib" 
       overwrite="true" failonerror="false">
       <fileset dir="${lib-dir}"/>
     </copy>
-
     <copy toDir="${project.webapp}/WEB-INF/classes" 
       overwrite="true" failonerror="false">
       <fileset dir="${classes-dir}"/>
     </copy>
-  
     <copy todir="${project.webapp}/WEB-INF/lib">
-    <!-- Note: no overwriting, so user's libs and classes get preference -->
+<!-- Note: no overwriting, so user's libs and classes get preference -->
       <fileset dir="${forrest.core.lib-dir}">
         <include name="**.jar"/>
       </fileset>
@@ -96,26 +84,22 @@
         <include name="**.jar"/>
       </fileset>
     </copy>
-    
     <copy todir="${project.webapp}/WEB-INF/lib">
       <fileset dir="${forrest.build.lib-dir}">
         <include name="**.jar"/>
       </fileset>
     </copy>
-                  
     <copy toDir="${project.webapp}/WEB-INF/classes">
       <fileset dir="${forrest.core.webapp}/WEB-INF/classes"/>
     </copy>
-
-    <!-- Copy XML jars if not running JDK 1.4 (where they're built-in) -->
+<!-- Copy XML jars if not running JDK 1.4 (where they're built-in) -->
     <available property="jdk1.4+" classname="java.lang.CharSequence"/>
     <copy todir="${project.webapp}/WEB-INF/lib">
       <fileset dir="${forrest.endorsed.lib-dir}">
         <include name="*jar" unless="jdk1.4+"/>
       </fileset>
     </copy>
-
-    <!-- Copy custom plugin jars -->
+<!-- Copy custom plugin jars -->
     <for list="${project.required.plugins}" param="name">
       <sequential>
         <copy file="${forrest.plugins-dir}/lib/@{name}.jar"
@@ -123,28 +107,24 @@
 	        failonerror="false"/>
       </sequential>
     </for>
-    
-   <!-- 
+<!-- 
     | Copy all non-xdocs content across to the webapp
    -->
-   <mkdir dir="${project.webapp}/project"/>   
-   <copy toDir="${project.webapp}/project" overwrite="true" failonerror="false">
-     <fileset dir="${project.home}">
-       <include name="forrest.properties"/>
-       <include name="${project.status}"/>
-       <include name="${project.content-dir}/**"/>
-     </fileset>
-   </copy>
-
-    <!-- Copy the file which contains the build information -->
+    <mkdir dir="${project.webapp}/project"/>
+    <copy toDir="${project.webapp}/project" overwrite="true" failonerror="false">
+      <fileset dir="${project.home}">
+        <include name="forrest.properties"/>
+        <include name="${project.status}"/>
+        <include name="${project.content-dir}/**"/>
+      </fileset>
+    </copy>
+<!-- Copy the file which contains the build information -->
     <copy toDir="${project.webapp}/project/build/tmp"
       file="${project.temp-dir}/build-info.xml"/>
-
-    <!-- Copy the generated locationmap for plugins -->
+<!-- Copy the generated locationmap for plugins -->
     <copy toDir="${project.webapp}/project/build/tmp"
       file="${project.temp-dir}/locationmap.xml"/>
-
-    <!-- Grab the plugin xmaps as these are no longer in the
+<!-- Grab the plugin xmaps as these are no longer in the
          plugins-dir.
 
          During the build, the plugin information is copied during the
@@ -156,47 +136,39 @@
 
          The value of "todir" below corresponds to 
          {properties:temp-dir} when running as a web application. -->
-
     <copy todir="${project.webapp}/project/build/tmp">
-     <fileset dir="${project.temp-dir}">
-       <include name="*.xmap"/>
-     </fileset>
+      <fileset dir="${project.temp-dir}">
+        <include name="*.xmap"/>
+      </fileset>
     </copy>
-
     <loadfile  property="webapp-generated-message" 
       srcFile="${forrest.core}/var/webapp-generated-message.txt">
-        <filterchain><expandproperties/></filterchain>
+      <filterchain>
+        <expandproperties/>
+      </filterchain>
     </loadfile>
     <echo>${webapp-generated-message}</echo>
   </target>
-       
-  <target name="copy-xdocs" if="xdocs.present">
-  </target>
-  
-  <target name="copy-content" if="raw-content.present">
-  </target>
-
- <!-- ===============================================================
+  <target name="copy-xdocs" if="xdocs.present"></target>
+  <target name="copy-content" if="raw-content.present"></target>
+<!-- ===============================================================
        Builds a cocoon .war for your project based on the siteplan.
        param: location to put generated war ${project.war}
        =============================================================== -->
- <target name="war" depends="run-webapp"
+  <target name="war" depends="run-webapp"
    description="* Generates a dynamic servlet-based website (a packaged .war file)">
-
-   <move file="${project.webapp}/WEB-INF/xconf/forrest-core-webapp.xconf" tofile="${project.webapp}/WEB-INF/xconf/forrest-core.xconf"/>
-     
-   <jar destfile="${project.war}">
-    <fileset dir="${project.webapp}"/>
-	<fileset dir="${forrest.home}">
-      <include name="${build.plugins-dir}/**"/>
-    </fileset>
-   </jar>
-   <echo>
+    <move file="${project.webapp}/WEB-INF/xconf/forrest-core-webapp.xconf" tofile="${project.webapp}/WEB-INF/xconf/forrest-core.xconf"/>
+    <jar destfile="${project.war}">
+      <fileset dir="${project.webapp}"/>
+      <fileset dir="${forrest.home}">
+        <include name="${build.plugins-dir}/**"/>
+      </fileset>
+    </jar>
+    <echo>
 ---------------------------------
 Webapp .war file generated:
 ${project.war}
 ---------------------------------
    </echo>
-  </target> 
-
+  </target>
 </project>



Mime
View raw message