forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject cvs commit: xml-forrest status.xml
Date Mon, 09 Feb 2004 02:47:45 GMT
rgardler    2004/02/08 18:47:45

  Modified:    src/core forrest.build.xml
               src/core/targets webapp.xml
               .        status.xml
  Log:
  Putting a jettyconf.xml file in your document directory will override
  the one supplied in the default Forrest context. Also no longer copies
  jettyconf.xml to build dir (one more file closer to no copying ;-))
  
  Revision  Changes    Path
  1.30      +28 -6     xml-forrest/src/core/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/forrest.build.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- forrest.build.xml	5 Feb 2004 14:58:14 -0000	1.29
  +++ forrest.build.xml	9 Feb 2004 02:47:45 -0000	1.30
  @@ -22,7 +22,7 @@
     <description>
       *=======================================================*
       |                 Forrest Site Builder                  |
  -    |                        0.6-dev                        |
  +    |                        ${version}                        |
       |             $Date$              |
       *=======================================================*
     
  @@ -247,6 +247,7 @@
           <exclude name="skins/**" />
           <exclude name="resources/**" />        
           <exclude name="WEB-INF/*.xconf" />
  +        <exclude name="jettyconf.xml" />
         </fileset>
       </copy>
   
  @@ -342,13 +343,12 @@
          param: location to clean ${project.webapp}
          param: file to clean ${project.brokenlinkfile}
          =============================================================== -->
  -  <target name="clean" depends="init-props" description="Clean all directories and files
generated during the build">
  +  <target name="clean-site" depends="init-props" description="Clean all directories
and files generated during the build">
       <delete failonerror="false" dir="${project.site-dir}"/>
       <delete failonerror="false" dir="${project.temp-dir}"/>
       <delete failonerror="false" dir="${project.webapp}"/>
       <delete failonerror="false" file="${project.brokenlinkfile}"/>
     </target>
  -  <target name="clean-site" depends="clean"/>
     
     <!-- ===============================================================
          Checks if the current project contains Forrest docs, and sets
  @@ -448,7 +448,29 @@
   
   
     <target name="run" 
  -   description="Run Jetty with configuration set by the jetty.run property"
  +   depends="webapp-local, run_custom_jetty, run_default_jetty"/>
  + 
  +  <target name="run_custom_jetty"
  +   if="custom_jetty_config"
  +   description="Run Jetty with configuration file found in the project">
  +    <java classname="org.mortbay.jetty.Server"
  +          dir="${project.webapp}"
  +          fork="yes"
  +          maxmemory="${forrest.maxmemory}"
  +          failonerror="yes">
  +       <classpath>
  +         <path refid="forrest.cp"/>
  +       </classpath>
  +       <jvmarg line="${forrest.jvmargs}"/>
  +       <jvmarg line="${forrest.basic.jvmargs}"/>
  +       <jvmarg
  +         value="-Djava.endorsed.dirs=${java.endorsed.dirs}${path.separator}${forrest.home}/lib/endorsed"/>
  +       <arg line="${content-dir}/jettyconf.xml" />
  +    </java>
  +  </target>
  +  
  +  <target name="run_default_jetty"
  +   description="Run Jetty with configuration file found in Forrest"
      depends="webapp-local">
       <java classname="org.mortbay.jetty.Server"
             dir="${project.webapp}"
  @@ -462,7 +484,7 @@
          <jvmarg line="${forrest.basic.jvmargs}"/>
          <jvmarg
            value="-Djava.endorsed.dirs=${java.endorsed.dirs}${path.separator}${forrest.home}/lib/endorsed"/>
  -       <arg line="jettyconf.xml" />
  +       <arg line="${forrest.home}/context/jettyconf.xml" />
       </java>
     </target>  
   
  
  
  
  1.2       +3 -0      xml-forrest/src/core/targets/webapp.xml
  
  Index: webapp.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/targets/webapp.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- webapp.xml	5 Feb 2004 13:36:26 -0000	1.1
  +++ webapp.xml	9 Feb 2004 02:47:45 -0000	1.2
  @@ -44,6 +44,9 @@
         </and>
       </condition>
       <antcall target="lucene-index"/>
  +    
  +    <available file="${content-dir}/jettyconf.xml" 
  +      property="custom_jetty_config"/>
   
       <loadfile  property="webapp-local-generated-message" srcFile="${forrest.home}/var/webapp-local-generated-message.txt">
           <filterchain><expandproperties/></filterchain>
  
  
  
  1.284     +6 -1      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.283
  retrieving revision 1.284
  diff -u -r1.283 -r1.284
  --- status.xml	5 Feb 2004 00:48:45 -0000	1.283
  +++ status.xml	9 Feb 2004 02:47:45 -0000	1.284
  @@ -29,6 +29,11 @@
   
     <changes>
       <release version="0.6-dev" date="unreleased">
  +      <action dev="rdg" type="update" context="skins">
  +        Putting a jettyconf.xml file in your document directory will override
  +        the one supplied in the default Forrest context. Also no longer copies 
  +        jettyconf.xml to build dir (one more file closer to no copying ;-))
  +      </action>
         <action dev="JJP" type="fix" context="skins">
           Allow a full url image to be included on a pdf file.
           Use only tmp as the temporal directory.
  
  
  

Mime
View raw message