forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Crossley <cross...@apache.org>
Subject another copyless branch needed (Was: svn commit: rev 36035)
Date Fri, 06 Aug 2004 14:20:48 GMT
Do we need to do this last phase of copyless development
using an svn branch or is it pretty straight forward?

--David

> Author: crossley
> Date: Fri Aug  6 07:10:50 2004
> New Revision: 36035
> 
> Modified:
>    forrest/trunk/src/core/forrest.build.xml
>    forrest/trunk/src/core/targets/site.xml
> Log:
> Rolling back these changes. It is silly to have a broken trunk.
> That stops other people from working.
> 
> 
> Modified: forrest/trunk/src/core/forrest.build.xml
> ==============================================================================
> --- forrest/trunk/src/core/forrest.build.xml	(original)
> +++ forrest/trunk/src/core/forrest.build.xml	Fri Aug  6 07:10:50 2004
> @@ -364,14 +364,14 @@
>  
> 
>    <target name="run" 
> -   depends="init, 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"
>     description="Run Jetty with configuration file found in the project">
>      <java classname="org.mortbay.jetty.Server"
> -          dir="${forrest.home}/context"
> +          dir="${project.webapp}"
>            fork="yes"
>            maxmemory="${forrest.maxmemory}"
>            failonerror="yes">
> @@ -389,7 +389,7 @@
>    <target name="run_default_jetty"
>     description="Run Jetty with configuration file found in Forrest">
>      <java classname="org.mortbay.jetty.Server"
> -          dir="${forrest.home}/context"
> +          dir="${project.webapp}"
>            fork="yes"
>            maxmemory="${forrest.maxmemory}"
>            failonerror="yes">
> 
> Modified: forrest/trunk/src/core/targets/site.xml
> ==============================================================================
> --- forrest/trunk/src/core/targets/site.xml	(original)
> +++ forrest/trunk/src/core/targets/site.xml	Fri Aug  6 07:10:50 2004
> @@ -28,7 +28,7 @@
>         ===============================================================
>     -->
>  
> -   <target name="site" depends="init, -prepare-classpath, check-contentdir" 
> +   <target name="site" depends="init, prepare-context, -prepare-classpath, check-contentdir"

>                         if="project.content.present"
>                         description="* Generates a static HTML website for this project">
>      <!-- clean out the temp space, if we don't cocoon fails on this.
> @@ -52,7 +52,7 @@
>      <parallel>
>        <java classname="org.apache.cocoon.Main"
>          fork="true"
> -        dir="${forrest.home}/context"  
> +        dir="${project.webapp}"  
>          maxmemory="${forrest.maxmemory}"
>          failonerror="true">
>          <jvmarg line="${forrest.jvmargs}"/>


Mime
View raw message