forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: rev 10566 - in xml/forrest/branches/copyless/src/core: . targets
Date Sat, 08 May 2004 23:20:13 GMT
Author: nicolaken
Date: Sat May  8 16:20:12 2004
New Revision: 10566

Modified:
   xml/forrest/branches/copyless/src/core/forrest.build.xml
   xml/forrest/branches/copyless/src/core/targets/site.xml
Log:
Remove the copying also in the site target.

Modified: xml/forrest/branches/copyless/src/core/forrest.build.xml
==============================================================================
--- xml/forrest/branches/copyless/src/core/forrest.build.xml	(original)
+++ xml/forrest/branches/copyless/src/core/forrest.build.xml	Sat May  8 16:20:12 2004
@@ -111,8 +111,8 @@
     <property name="project.cocoon-work-dir"    location="${project.temp-dir}/cocoon-work"
     />
     
     <property name="project.brokenlinkfile" location="${project.build-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}" />

Modified: xml/forrest/branches/copyless/src/core/targets/site.xml
==============================================================================
--- xml/forrest/branches/copyless/src/core/targets/site.xml	(original)
+++ xml/forrest/branches/copyless/src/core/targets/site.xml	Sat May  8 16:20:12 2004
@@ -28,40 +28,19 @@
        ===============================================================
    -->
 
-   <target name="site" depends="init, webapp-local, -prepare-classpath" if="project.content.present"
-     description="Generates a static HTML website for this project">
+   <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.
          actually clears the cache, not yet sure why it is really needed? -->
     <delete dir="${project.cocoon-work-dir}"/>
     <mkdir dir="${project.cocoon-work-dir}"/>
 
     <parallel>
-      <!--
+<!-- dir="${project.webapp}" -->
       <java classname="org.apache.cocoon.Main"
         fork="true"
-        maxmemory="${forrest.maxmemory}"
-        dir="."
-        failonerror="true"
-        classpathref="forrest.cp">
-        <jvmarg line="${forrest.jvmargs}"/>
-        <jvmarg line="${forrest.basic.jvmargs}"/>
-        <jvmarg
-          value="-Djava.endorsed.dirs=${forrest.endorsed.lib-dir}${path.separator}${java.endorsed.dirs}"/>
-        <arg value="-c${project.webapp}"/>   <!- input to the process ->
-        <arg value="-d${project.site-dir}"/>   <!- output to be put ->
-        <arg value="-w${project.cocoon-work-dir}"/>   <!- temp dir to use for e.g.
cache ->
-        <arg value="-u${project.debuglevel}"/> <!- threshold for log messages ->
-        <arg value="-C${project.webapp}/WEB-INF/cocoon.xconf"/>      <!- cocoon.xconf
file to use ->
-        <arg value="-b${project.brokenlinkfile}"/>  <!- output list of broken links
->
-        <arg value="-k${project.webapp}/WEB-INF/logkit.xconf"/>  <!- output list
of broken links ->
-        <arg value="${project.start-uri}"/>              <!- starting page ->
-        <arg value="-V" />                          <!- be verbose ->
-      </java>
-      -->
-
-      <java classname="org.apache.cocoon.Main"
-        fork="true"
-        dir="${project.webapp}"
+        dir="${forrest.home}/context"  
         failonerror="true"
         maxmemory="${forrest.maxmemory}">
         <jvmarg line="${forrest.jvmargs}"/>
@@ -77,7 +56,6 @@
           <path refid="forrest.cp"/>
         </classpath>
       </java> 
-
 
       <sequential>
         <!-- 

Mime
View raw message