forrest-svn mailing list archives

Author: brondsem
Date: Mon Nov 22 06:31:41 2004
New Revision: 106185

Modified:
   forrest/trunk/tools/forrestbot/core/forrestbot.xml
   forrest/trunk/tools/forrestbot/core/getsrc.xml
Log:
update FB per new dir structure

Modified: forrest/trunk/tools/forrestbot/core/forrestbot.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/tools/forrestbot/core/forrestbot.xml?view=diff&rev=106185&p1=forrest/trunk/tools/forrestbot/core/forrestbot.xml&r1=106184&p2=forrest/trunk/tools/forrestbot/core/forrestbot.xml&r2=106185
==============================================================================
--- forrest/trunk/tools/forrestbot/core/forrestbot.xml	(original)
+++ forrest/trunk/tools/forrestbot/core/forrestbot.xml	Mon Nov 22 06:31:41 2004
@@ -18,10 +18,10 @@
 <project name="forrestbot" basedir="." default="main">
 
   <property environment="ENV"/>
-  <property name="forrest.home" location="${ENV.FORREST_HOME}"/>
-  <property name="bot.home" location="${forrest.home}/../../../tools/forrestbot"/>
+  <property name="forrest.root-dir" location="${ENV.FORREST_HOME}"/>
+  <property name="bot.home" location="${forrest.root-dir}/tools/forrestbot"/>
 
-  <import file="${forrest.home}/forrest.build.xml"/>
+  <import file="${forrest.root-dir}/main/forrest.build.xml"/>
 
   <!-- include workstage implementations -->
   <import file="${bot.home}/core/getsrc.xml"/>

Modified: forrest/trunk/tools/forrestbot/core/getsrc.xml
Url: http://svn.apache.org/viewcvs/forrest/trunk/tools/forrestbot/core/getsrc.xml?view=diff&rev=106185&p1=forrest/trunk/tools/forrestbot/core/getsrc.xml&r1=106184&p2=forrest/trunk/tools/forrestbot/core/getsrc.xml&r2=106185
==============================================================================
--- forrest/trunk/tools/forrestbot/core/getsrc.xml	(original)
+++ forrest/trunk/tools/forrestbot/core/getsrc.xml	Mon Nov 22 06:31:41 2004
@@ -62,7 +62,7 @@
 
     <echo>Loading ${build.cvsmodule-dir}/${getsrc.cvs.module}/forrest.properties..</echo>
     <loadproperties srcFile="${build.cvsmodule-dir}/${getsrc.cvs.module}/forrest.properties"/>
-    <loadproperties srcFile="${forrest.home}/context/default-forrest.properties"/>
+    <loadproperties srcFile="${forrest.home}/webapp/default-forrest.properties"/>
 
     <!-- only the project.content-dir directory -->
     <echo><![CDATA[<cvs cvsRoot=":pserver:${getsrc.cvs.user}@${getsrc.cvs.host}:${getsrc.cvs.root}"
@@ -103,6 +103,7 @@
 
   <target name="getsrc.svn" description="FB: Get source from an SVN repository">
     <!-- non-recursive; just to get forrest.properties -->
+	<echo>svn: ${getsrc.svn.url} -> ${build.svn-dir}/${ant.project.name}</echo>
     <svncheckout repositoryUrl="${getsrc.svn.url}"
       destination="${build.svn-dir}/${ant.project.name}"
       revision="${getsrc.svn.revision}"
@@ -111,9 +112,10 @@
 
     <echo>Loading ${build.svn-dir}/${ant.project.name}/forrest.properties..</echo>
     <loadproperties srcFile="${build.svn-dir}/${ant.project.name}/forrest.properties"/>
-    <loadproperties srcFile="${forrest.home}/context/default-forrest.properties"/>
+    <loadproperties srcFile="${forrest.home}/webapp/default-forrest.properties"/>
     
     <!-- only the project.content-dir directory -->
+	<echo>svn: ${getsrc.svn.url}/${project.content-dir} -> ${build.svn-dir}/${ant.project.name}/${project.content-dir}</echo>
     <svncheckout repositoryUrl="${getsrc.svn.url}/${project.content-dir}"
       destination="${build.svn-dir}/${ant.project.name}/${project.content-dir}"
       revision="${getsrc.svn.revision}"