svn commit: rev 22983 - in forrest/trunk: . src/core src/core/targets

[br...@apache.org]

Author: brondsem
Date: Fri Jul 16 15:50:16 2004
New Revision: 22983

Modified:
   forrest/trunk/src/core/forrest.build.xml
   forrest/trunk/src/core/targets/site.xml
   forrest/trunk/src/core/targets/validate.xml
   forrest/trunk/src/core/targets/webapp.xml
   forrest/trunk/status.xml
Log:
Add more desriptions to forrest targets.  Highlight the most common ones.

Modified: forrest/trunk/src/core/forrest.build.xml
==============================================================================
--- forrest/trunk/src/core/forrest.build.xml	(original)
+++ forrest/trunk/src/core/forrest.build.xml	Fri Jul 16 15:50:16 2004
@@ -287,7 +287,7 @@
         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">
+    description=">> Seeds a directory with a template project doc structure">
      <copy todir="${project.home}" overwrite="false">
         <fileset dir="${forrest.home}/fresh-site"/>
      </copy>
@@ -312,7 +312,8 @@
 
 
   <target name="run" 
-   depends="init, webapp-local, run_custom_jetty, run_default_jetty"/>
+   depends="init, webapp-local, run_custom_jetty, run_default_jetty"
+   description=">> Run Jetty (instant live webapp)"/>
  
   <target name="run_custom_jetty"
    if="custom_jetty_config"

Modified: forrest/trunk/src/core/targets/site.xml
==============================================================================
--- forrest/trunk/src/core/targets/site.xml	(original)
+++ forrest/trunk/src/core/targets/site.xml	Fri Jul 16 15:50:16 2004
@@ -30,7 +30,7 @@
 
    <target name="site" depends="init, prepare-context, -prepare-classpath, check-contentdir" 
                        if="project.content.present"
-                       description="Generates a static HTML website for this project">
+                       description=">> Generates a static HTML website for this project">
     <!-- clean out the temp space, if we don't cocoon fails on this.
          actually clears the cache, not yet sure why it is really needed? -->
     <delete dir="${project.cocoon-work-dir}"/>

Modified: forrest/trunk/src/core/targets/validate.xml
==============================================================================
--- forrest/trunk/src/core/targets/validate.xml	(original)
+++ forrest/trunk/src/core/targets/validate.xml	Fri Jul 16 15:50:16 2004
@@ -19,7 +19,7 @@
 
   <target name="validate" depends="validation-props, validate-xdocs,
     validate-skinconf, validate-sitemap, validate-skins, validate-skinchoice,
-    validate-stylesheets"  description="Conduct various validations: xdocs, skins, sitemap"/>
+    validate-stylesheets"  description="Validate all: xdocs, skins, sitemap, etc"/>
     
   <target name="validation-props" depends="examine-proj">
     <!-- Validation flags -->
@@ -150,7 +150,7 @@
   </target>
 
   <target name="validate-skinconf" depends="validation-props"
-          if="validate.skinconf">
+          if="validate.skinconf" description="Validate skinconf">
     <xmlvalidate failonerror="${forrest.validate.skinconf.failonerror}" 
                  lenient="no" warn="yes">
       <xmlcatalog refid="fcatalog" />
@@ -190,7 +190,7 @@
   </target>
 
   <target name="validate-stylesheets" depends="validation-props"
-    if="validate.stylesheets">
+    if="validate.stylesheets" description="Validate XSL files">
     <jing rngfile="${forrest.home}/context/resources/schema/relaxng/xslt.rng">
       <fileset dir="${stylesheets-dir}"
         includes="${forrest.validate.stylesheets.includes}"
@@ -199,7 +199,7 @@
     <echo message="...validated stylesheets"/>
   </target>
 
-  <target name="validate-skins" depends="validate-skins-stylesheets"/>
+  <target name="validate-skins" depends="validate-skins-stylesheets" description="Validate skins"/>
 
   <target name="validate-skins-stylesheets" depends="validation-props"
     if="validate.skins.stylesheets">
@@ -212,7 +212,7 @@
   </target>
 
   <!-- Check that ${project.skin} points to an existing skin. -->
-  <target name="validate-skinchoice">
+  <target name="validate-skinchoice" depends="validation-props" description="Validate skin choice">
     <condition property="project.skin.present">
       <available file="${project.skin}" type="dir">
         <filepath path="${skins-dir}"/>

Modified: forrest/trunk/src/core/targets/webapp.xml
==============================================================================
--- forrest/trunk/src/core/targets/webapp.xml	(original)
+++ forrest/trunk/src/core/targets/webapp.xml	Fri Jul 16 15:50:16 2004
@@ -36,9 +36,7 @@
   
 <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 'webapp'
-   target if you wish to deploy remotely.">
+   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
     extra project-custom classes then will need to be warred in as well. -->
 <!--  should be already there
@@ -154,7 +152,7 @@
        param: location to put generated war ${project.war}
        =============================================================== -->
  <target name="war" depends="webapp"
-   description="Generates a dynamic servlet-based website (an packaged .war file)">
+   description=">> Generates a dynamic servlet-based website (a packaged .war file)">
 
    <jar destfile="${project.war}" basedir="${project.webapp}"/>
    <echo>

Modified: forrest/trunk/status.xml
==============================================================================
--- forrest/trunk/status.xml	(original)
+++ forrest/trunk/status.xml	Fri Jul 16 15:50:16 2004
@@ -49,6 +49,9 @@
         Added new document to facilitate
         <link href="site:upgrading_06">upgrading to v0.6</link>
       </action>
+      <action dev="DB" type="update" context="build" fixes-bug="FOR-216">
+        Add more desriptions to forrest targets.  Highlight the most common ones.
+      </action>
       <action dev="DC" type="update" context="code">
         Projects can use a local CatalogManager.properties to declare
         additional Catalogs for DTDs and other entities.