Author: crossley
Date: Thu Aug 5 23:13:57 2004
New Revision: 36024
Modified:
forrest/trunk/src/core/forrest.build.xml
forrest/trunk/src/core/targets/site.xml
Log:
Temporarily revert revision 35742 so that we can refer to a stable revision.
Modified: forrest/trunk/src/core/forrest.build.xml
==============================================================================
--- forrest/trunk/src/core/forrest.build.xml (original)
+++ forrest/trunk/src/core/forrest.build.xml Thu Aug 5 23:13:57 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 Thu Aug 5 23:13:57 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}"/>
|