svn commit: r365747 - /forrest/trunk/main/forrest.build.xml

[rg...@apache.org]

Author: rgardler
Date: Tue Jan  3 13:07:38 2006
New Revision: 365747

URL: http://svn.apache.org/viewcvs?rev=365747&view=rev
Log:
Was doing check for content too early, was failing when trying to seed content - catch 22

Modified:
    forrest/trunk/main/forrest.build.xml

Modified: forrest/trunk/main/forrest.build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/forrest.build.xml?rev=365747&r1=365746&r2=365747&view=diff
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Tue Jan  3 13:07:38 2006
@@ -329,7 +329,7 @@
   </target>
 
   <!-- Sets up properties and filters -->
-  <target name="init" depends="check-contentdir, ensure-content, check-java-version, init-props, init-skins, init-plugins">
+  <target name="init" depends="check-java-version, init-props, init-skins, init-plugins">
     <available property="xml-forrest.jar.exists" file="${forrest.build.lib-dir}/xml-forrest.jar"/>
     <fail unless="xml-forrest.jar.exists">You must build forrest before you can run it.  In ${forrest.home}/main run './build.sh' (linux) or 'build' (windows)</fail>
   </target>
@@ -424,7 +424,7 @@
 
 
   <target name="run"
-   depends="init, run_custom_jetty, run_default_jetty"
+   depends="init, check-contentdir, ensure-content, run_custom_jetty, run_default_jetty"
    description="* Run Jetty (instant live webapp)"/>
 
   <target name="run_custom_jetty"