Return-Path: 
 <svn-return-349-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 8301 invoked from network); 6 Aug 2004 06:21:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 6 Aug 2004 06:21:39 -0000
Received: (qmail 93491 invoked by uid 500); 6 Aug 2004 06:21:39 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 93405 invoked by uid 500); 6 Aug 2004 06:21:38 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
list-post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 93391 invoked by uid 99); 6 Aug 2004 06:21:38 -0000
X-ASF-Spam-Status: No, hits=-2.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.27.1) with SMTP; Thu, 05 Aug 2004 23:21:38 -0700
Received: (qmail 8276 invoked by uid 65534); 6 Aug 2004 06:21:37 -0000
Date: 6 Aug 2004 06:21:37 -0000
Message-ID: <20040806062137.8269.qmail@minotaur.apache.org>
From: crossley@apache.org
To: svn@forrest.apache.org
Subject: svn commit: rev 36025 - in forrest/trunk/src/core: . targets
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: crossley
Date: Thu Aug  5 23:21:36 2004
New Revision: 36025

Modified:
   forrest/trunk/src/core/forrest.build.xml
   forrest/trunk/src/core/targets/site.xml
Log:
Return to the changes from r35742.


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:21:36 2004
@@ -364,14 +364,14 @@
 
 
   <target name="run" 
-   depends="init, webapp-local, run_custom_jetty, run_default_jetty"
+   depends="init, 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="${project-webapp}"
+          dir="${forrest.home}/context"
           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="${project-webapp"
+          dir="${forrest.home}/context"
           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:21:36 2004
@@ -28,7 +28,7 @@
        ===============================================================
    -->
 
-   <target name="site" depends="init, prepare-context, -prepare-classpath, check-contentdir" 
+   <target name="site" depends="init, -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="${project.webapp}"  
+        dir="${forrest.home}/context"  
         maxmemory="${forrest.maxmemory}"
         failonerror="true">
         <jvmarg line="${forrest.jvmargs}"/>