forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: rev 35742 - in forrest/trunk/src/core: . targets
Date Thu, 05 Aug 2004 15:17:32 GMT
Author: nicolaken
Date: Thu Aug  5 08:17:31 2004
New Revision: 35742

Modified:
   forrest/trunk/src/core/forrest.build.xml
   forrest/trunk/src/core/targets/site.xml
Log:
Put back full copyless behaviour.

I know it will create some difficulties with lucene indexing, logfiles and work dir, but I
will work to fix them in these days without needing to revert this.

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 08:17:31 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 08:17:31 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"  
         failonerror="true"
         maxmemory="${forrest.maxmemory}">
         <jvmarg line="${forrest.jvmargs}"/>

Mime
View raw message