svn commit: rev 10151 - in xml/forrest/branches/copyless/src/core: . targets

[ni...@apache.org]

Author: nicolaken
Date: Wed Apr 21 00:00:17 2004
New Revision: 10151

Modified:
   xml/forrest/branches/copyless/src/core/forrest.build.xml
   xml/forrest/branches/copyless/src/core/targets/context.xml
Log:
Don't do Ant property filterinf on config files anymore, and make don't have the webapp created when jetty is run as it uses all the files in place.

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	Wed Apr 21 00:00:17 2004
@@ -295,7 +295,7 @@
 
 
   <target name="run" 
-   depends="webapp-local, run_custom_jetty, run_default_jetty"/>
+   depends="init, run_custom_jetty, run_default_jetty"/>
  
   <target name="run_custom_jetty"
    if="custom_jetty_config"
@@ -317,10 +317,9 @@
   </target>
   
   <target name="run_default_jetty"
-   description="Run Jetty with configuration file found in Forrest"
-   depends="webapp-local">
+   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: xml/forrest/branches/copyless/src/core/targets/context.xml
==============================================================================
--- xml/forrest/branches/copyless/src/core/targets/context.xml	(original)
+++ xml/forrest/branches/copyless/src/core/targets/context.xml	Wed Apr 21 00:00:17 2004
@@ -59,7 +59,7 @@
       </fileset>
     </copy>
 
-    <copy todir="${project.webapp}/" filtering="true" overwrite="true">
+    <copy todir="${project.webapp}/" filtering="false" overwrite="true">
       <fileset dir="${forrest.home}/context" >
         <include name="*.xmap" />
         <include name="WEB-INF/*.xconf" />
@@ -86,13 +86,13 @@
     validate, init, bare-context, copy-sitemap, copy-conf, upgrade-skinconf, copy-status"/>
 
   <target name="copy-conf" if="conf.present">
-    <copy toDir="${project.webapp}/WEB-INF" filtering="true"
+    <copy toDir="${project.webapp}/WEB-INF" filtering="false"
       overwrite="true" failonerror="false">
       <fileset dir="${conf-dir}">
         <exclude name="*-${version}.xconf"/>
       </fileset>
     </copy>
-    <copy toDir="${project.webapp}/WEB-INF" filtering="true" overwrite="true"
+    <copy toDir="${project.webapp}/WEB-INF" filtering="false" overwrite="true"
       failonerror="false">
       <fileset dir="${conf-dir}">
         <include name="*-${version}.*"/>
@@ -102,14 +102,14 @@
    </target>
 
   <target name="copy-sitemap" if="sitemap.present">
-    <copy toDir="${project.webapp}" filtering="true" overwrite="true" failonerror="false">
+    <copy toDir="${project.webapp}" filtering="false" overwrite="true" failonerror="false">
       <fileset dir="${sitemap-dir}">
         <exclude name="*-${version}.xmap"/>
         <include name="*.xmap"/>
         <include name="jtidy.properties"/>
       </fileset>
     </copy>
-    <copy toDir="${project.webapp}" filtering="true" overwrite="true">
+    <copy toDir="${project.webapp}" filtering="false" overwrite="true">
       <fileset dir="${sitemap-dir}">
         <include name="*-${version}.xmap"/>
       </fileset>