forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/src/resources/fresh-site forrest.properties
Date Sat, 12 Oct 2002 09:41:36 GMT
jefft       2002/10/12 02:41:36

  Modified:    .        forrest.build.xml status.xml
               src/resources/fresh-site forrest.properties
  Log:
  - Fix bug where logfiles weren't being created because Cocoon wasn't being told
    where logkit.xconf lives.
  - Let users override cocoon.xconf and logkit.xconf
  - Don't 'seed' a project that already has content, to prevent accidents
  - Update changelog
  
  Revision  Changes    Path
  1.11      +33 -9     xml-forrest/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/forrest.build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- forrest.build.xml	12 Oct 2002 06:25:03 -0000	1.10
  +++ forrest.build.xml	12 Oct 2002 09:41:36 -0000	1.11
  @@ -60,7 +60,6 @@
       <property name="project.work-dir"    value="${project.temp-dir}/work"      />
       <property name="project.ctxt-dir"    value="${project.temp-dir}/context"   />
   
  -    <property name="project.logfile"     value="${project.temp-dir}/forrest.log"/>
       <property name="project.brokenlinkfile" value="${project.temp-dir}/brokenlinks.txt"/>
       <property name="project.debuglevel"  value="ERROR"                         />
       <property name="project.start-uri"   value="index.html"                    />
  @@ -68,6 +67,7 @@
       <!-- odd one in the list: forrest provides this, 
            project now has a means to override it? -->
       <property name="project.configfile"  value="${forrest.home}/WEB-INF/cocoon.xconf"/>
  +    <property name="project.logkitfile"  value="${forrest.home}/WEB-INF/logkit.xconf"/>
   
       <!-- use of these property should be removed when the siteplan becomes active -->
       <property name="project.skin"        value="forrest-site" />
  @@ -81,6 +81,7 @@
       <property name="project.skins-dir"   value="${project.content-dir}/skins" />
       <property name="project.skinconf"    value="${project.content-dir}/skinconf.xml"
/>
       <available property="project.skinconf.present" file="${project.skinconf}" type="file"/>
  +    <property name="project.conf-dir"     value="${project.content-dir}/conf" />
       <property name="project.lib-dir"     value="${project.content-dir}/lib" />
       <property name="project.classes-dir" value="${project.content-dir}/classes" />
   
  @@ -136,6 +137,8 @@
         | project.siteplan    = ${project.siteplan} 
         | //cocoon.xconf location
         | project.configfile  = ${project.configfile}
  +      | //logkit.xconf location
  +      | project.logkitfile  = ${project.logkitfile}
         | //temp dir to throw stuf in (i.e. work and ctxt)
         | project.temp-dir    = ${project.temp-dir} 
         | //temp working directory for generation process
  @@ -144,8 +147,6 @@
         | project.ctxt-dir    = ${project.ctxt-dir} 
         | //debuglevel for logging (INFO, DEBUG, WARN, ERROR, FAIL)
         | project.debuglevel  = ${project.debuglevel}
  -      | //logfile location
  -      | project.logfile     = ${project.logfile}
         | //list of broken links put in:
         | project.brokenlinkfile = ${project.brokenlinkfile}
         | //check if you have tools.jar installed.
  @@ -254,11 +255,12 @@
          param: location to find project descriptors == ${project.home} 
          param: location to make temporary context-dir ${project.ctxt-dir} 
          =============================================================== -->
  -  <target name="project-context" depends="init, bare-context, examine-proj, copy-sitemap,
  -    copy-xdocs, copy-stylesheets, copy-images, copy-schema, copy-lib,
  +  <target name="project-context" depends="init, bare-context, examine-proj, copy-conf,
copy-sitemap,
  +    copy-xdocs, copy-stylesheets, copy-images, copy-schema, copy-lib, 
       copy-classes, copy-skins, copy-skinconf, copy-status"/>
   
     <target name="examine-proj">
  +    <available property="conf.present" file="${project.conf-dir}" type="dir"/>
       <available property="sitemap.present" file="${project.sitemap}"/>
       <available property="xdocs.present" file="${project.xdocs-dir}" type="dir"/>
       <available property="images.present" file="${project.images-dir}" type="dir"/>
  @@ -271,6 +273,13 @@
       <available property="status.present" file="${project.status}"/>
     </target>
   
  +  <target name="copy-conf" if="conf.present">
  +    <copy toDir="${project.ctxt-dir}/WEB-INF" filtering="false"
  +      overwrite="true" failonerror="false">
  +      <fileset dir="${project.conf-dir}"/>
  +    </copy>
  + </target>
  +
     <target name="copy-sitemap" if="sitemap.present">
       <copy file="${project.sitemap}" toDir="${project.ctxt-dir}" filtering="true"
         overwrite="true" failonerror="false"/>
  @@ -371,6 +380,16 @@
              type="dir"/>
          </target>
   
  +       <target name="ensure-nocontent" depends="check-contentdir"
  +         if="project.content.present">
  +         <echo>
  +------------------------------------------------
  +This project already has content in ${project.xdocs-dir}.
  +------------------------------------------------
  +         </echo>
  +         <fail message="Project already has content"/>
  +       </target>
  +
          <target name="ensure-content" depends="check-contentdir"
            unless="project.content.present">
            <echo>
  @@ -390,7 +409,7 @@
          param: location to make temporary context-dir ${project.ctxt-dir} 
          param: location to make temporary work-dir ${project.content-dir}
          param: debuglevel for logging ${project.debuglevel}
  -       param: location of log-file ${project.logfile}
  +       param: location of log-file ${project.logkitfile}
          =============================================================== -->
    <target name="site" depends="ensure-content, init, prepare-context, clean-site, prepare-classpath"
      if="project.content.present"
  @@ -406,17 +425,22 @@
         <arg value="-c${project.ctxt-dir}"/>   <!-- input to the process -->
         <arg value="-d${project.site-dir}"/>   <!-- output to be put -->
         <arg value="-w${project.work-dir}"/>   <!-- temp dir to use for e.g. cache
-->
  -      <arg value="-l${project.logfile}"/>    <!-- log of processing -->
         <arg value="-u${project.debuglevel}"/> <!-- threshold for log messages -->
         <arg value="-C${project.configfile}"/>      <!-- cocoon.xconf file to use
-->
         <arg value="-b${project.brokenlinkfile}"/>  <!-- output list of broken links
-->
  +      <arg value="-k${project.logkitfile}"/>  <!-- output list of broken links
-->
         <arg value="${project.start-uri}"/>              <!-- starting page -->
         <arg value="-V" />                          <!-- be verbose -->
       </java>
       <echo>
  -Generation just finished. Please check the file
  +------------------------------
  +Static site generated at:
  +  ${project.site-dir}
  +
  +Please check the file
   ${project.brokenlinkfile}
   for any broken links in the generated site.
  +------------------------------
       </echo>
     </target>
   
  @@ -538,7 +562,7 @@
           dependend task for doing that alone.
           >>> filling this with stuff from smart acorn.xml idea.
          =============================================================== -->
  - <target name="seed"
  + <target name="seed" depends="ensure-nocontent"
            description="Seeds a directory with a template project doc structure">
       <unzip src="${forrest.home}/fresh-site.zip" 
         dest="${project.home}"
  
  
  
  1.17      +12 -6     xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- status.xml	23 Sep 2002 12:02:18 -0000	1.16
  +++ status.xml	12 Oct 2002 09:41:36 -0000	1.17
  @@ -52,11 +52,6 @@
        facility - replacement for */book.xml
       </action>
       <action context="code" dev="open">
  -     PDF generation is not working for every document, because the sitemap.xmap
  -     is missing some matches for special documents (faq, changes, todo, doclist)
  -     and also the match for documents in sub-directories is not working.
  -    </action>
  -    <action context="code" dev="open">
        Images (&lt;figure&gt;) are not yet handled by the PDF generation.
        see <code>skins/forrest-site/xslt/fo/document2fo.xsl</code> and email
        <link href="http://marc.theaimsgroup.com/?l=forrest-dev&amp;m=102725960101549">Re:
document2Fo.xsl</link>
  @@ -99,7 +94,18 @@
   
     <changes>
      <release version="0.1" date="2002">
  -    <action dev="JT" type="fix" context="build">
  +    <action dev="JT" type="fix" context="code">
  +     Fixed a bug where the log files weren't being created. Thanks to Vladimir
  +     Bossicard for reporting.
  +    </action>
  +    <action dev="JT" type="add" context="code">
  +     User projects can now override the default cocoon.xconf and logkit.xconf files,
  +     by placing these files in src/documentation/conf
  +    </action>
  +    <action dev="JT" type="fix" context="docs">
  +     PDFs for faq, changes and todo now work.
  +    </action>
  +     <action dev="JT" type="fix" context="build">
        "Change History" images (update.jpg, add.jpg etc) are now provided by
        default by Forrest (in images/), and need not be supplied by user projects.
       </action>
  
  
  
  1.2       +1 -0      xml-forrest/src/resources/fresh-site/forrest.properties
  
  Index: forrest.properties
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/fresh-site/forrest.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- forrest.properties	11 Oct 2002 07:40:42 -0000	1.1
  +++ forrest.properties	12 Oct 2002 09:41:36 -0000	1.2
  @@ -11,6 +11,7 @@
   # Properties that must be set to override the default locations
   #project.status=${project.home}/status.xml
   #project.content-dir=${project.home}/src/documentation
  +#project.conf-dir=${project.content-dir}/conf
   #project.sitemap=${project.content-dir}/sitemap.xmap
   #project.xdocs-dir=${project.content-dir}/content/xdocs
   #project.stylesheets-dir=${project.content-dir}/resources/stylesheets
  
  
  

Mime
View raw message