svn commit: rev 36036 - in forrest/trunk/src/core: . targets

[ni...@apache.org]

Author: nicolaken
Date: Fri Aug  6 07:55:05 2004
New Revision: 36036

Modified:
   forrest/trunk/src/core/forrest.build.xml
   forrest/trunk/src/core/targets/site.xml
Log:
Sorry, but putting back copyless was not meant to break anything big.

What happened is that in the site generation it was looking for the conf files in the wrong directory.

This should not break things badly, if it does please feel free to revert again.

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:55:05 2004
@@ -107,8 +107,8 @@
     <property name="project.cocoon-work-dir"    location="${project.temp-dir}/cocoon-work"      />
     
     <property name="project.brokenlinkfile" location="${project.temp-dir}/brokenlinks.xml"/>
-    <property name="project.configfile"     value="${project.webapp}/WEB-INF/cli.xconf" />
-    <property name="project.logkitfile"     value="${project.webapp}/WEB-INF/logkit.xconf" />
+    <property name="project.configfile"     value="${forrest.home}/context/WEB-INF/cli.xconf" />
+    <property name="project.logkitfile"     value="${forrest.home}/context/WEB-INF/logkit.xconf" />
     <property name="project.logger"         value="debug" />
 
     <property name="status"      location="${project.home}/${project.status}" />
@@ -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	Fri Aug  6 07:55:05 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}"/>