X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=trunk%2Fbuild%2Fheader.xml;h=9fac8d996385a4d193dde646d0bd29e82fdc137d;hb=5c9619b1fddda5a6c69b5162dd21d8d20a6a2669;hp=81a3a12c3b5ca38284196cd6a2325a4003a7de72;hpb=ed30976bdf83156a4df3417835bc99b647c7a777;p=utils

diff --git a/trunk/build/header.xml b/trunk/build/header.xml
index 81a3a12c..9fac8d99 100644
--- a/trunk/build/header.xml
+++ b/trunk/build/header.xml
@@ -11,9 +11,16 @@
 
 <property name="project.home" value=".."/>
 <property name="build.dir" value="${project.home}/build"/>
-<property name="lib.dir" value="${project.home}/lib/wamblee"/>
+<property name="lib.dir" value="${project.home}/lib"/>
+<property environment="env"/>
 
 <target name="download.dep">
+  <if>
+    <isset property="proxyhost"/>
+    <then>
+      <setproxy proxyhost="${proxyhost}" proxyport="${proxyport}"/>
+    </then>
+  </if>
   <if>
     <isset property="artifact"/>
     <then>
@@ -75,6 +82,15 @@
   </antcall>
 </target>
 
+<target name="commons-email.d">
+  <antcall target="download.dep">
+    <param name="group" value="commons-email"/>
+    <param name="version" value="1.0"/>
+  </antcall>
+</target>
+
+
+
 
 <target name="logging.d" depends="log4j.d,commons-logging.d">
 </target>
@@ -90,14 +106,14 @@
   </antcall>
 </target>
 
-<target name="xerces.d">
+<target name="ehcache.d">
   <antcall target="download.dep">
     <param name="group" value="ehcache"/>
     <param name="version" value="1.1"/>
   </antcall>
 </target>
 
-<target name="ehcache.d">
+<target name="xerces.d">
   <antcall target="download.dep">
     <param name="group" value="xerces"/>
     <param name="version" value="2.4.0"/>
@@ -141,6 +157,24 @@
   </antcall>
 </target>
 
+<target name="activation.d">
+  <copy todir="${download.dir}">
+    <fileset dir="${special.lib.dir}/jaf-1.0.2">
+       <include name="*.jar"/>
+    </fileset>
+  </copy>
+</target>
+
+<target name="mail.d" depends="activation.d">
+  <copy todir="${download.dir}">
+    <fileset dir="${special.lib.dir}/javamail-1.3.3_01">
+       <include name="*.jar"/>
+    </fileset>
+  </copy>
+</target>
+
+
+
 <target name="httpclient.d">
   <antcall target="download.dep">
     <param name="group" value="commons-httpclient"/>
@@ -155,34 +189,34 @@
   </antcall>
 </target>
 
-<property name="support.dist.dir" value="${lib.dir}/support"/>
+<property name="support.dist.dir" value="${lib.dir}/wamblee/support"/>
 <target name="wamblee.support.d">
   <copy todir="${download.dir}">
     <fileset dir="${support.dist.dir}">
-      <include name="support.jar"/>
+      <include name="wamblee-support.jar"/>
     </fileset>
   </copy>
 </target>
 <target name="wamblee.support.test.d">
   <copy todir="${download.dir}">
     <fileset dir="${support.dist.dir}">
-      <include name="support-test.jar"/>
+      <include name="wamblee-support-test.jar"/>
     </fileset>
   </copy>
 </target>
 
-<property name="crawler.dist.dir" value="${lib.dir}/crawler"/>
+<property name="crawler.dist.dir" value="${lib.dir}/wamblee/crawler/basic"/>
 <target name="wamblee.crawler.d">
   <copy todir="${download.dir}">
     <fileset dir="${crawler.dist.dir}">
-      <include name="crawler.jar"/>
+      <include name="wamblee-crawler-basic.jar"/>
     </fileset>
   </copy>
 </target>
 <target name="wamblee.crawler.test.d">
   <copy todir="${download.dir}">
     <fileset dir="${crawler.dist.dir}">
-      <include name="crawler-test.jar"/>
+      <include name="wamblee-crawler-basic-test.jar"/>
     </fileset>
   </copy>
 </target>
@@ -284,14 +318,11 @@
             in case the source is in a subdirectory and not necessarily
             in the top-level directory --> 
    
-    <property name="ant.lib.dir" value="${project.home}/lib/ant"/>
-    <property name="ant.downloaded.lib.dir" value="${project.home}/lib/ant/downloaded"/>
+    <property name="ant.lib.dir" value="${build.dir}/lib/ant"/>
+    <property name="ant.downloaded.lib.dir" value="${build.dir}/lib/ant/downloaded"/>
     <property name="external.lib.dir" value="lib/external"/>
     <property name="test.lib.dir" value="lib/test"/>
-    <property name="special.lib.dir" value="${project.home}/lib/special"/>
-    <property name="forrest.xdocs.dir" value="${project.home}/site/xdocs"/>
-    <property name="forrest.build.dir" value="${project.home}/site/build"/>
-    <property name="forrest.build.site.dir" value="${forrest.build.dir}/site"/>
+    <property name="special.lib.dir" value="${build.dir}/lib/special"/>
     <property name="build.properties.dir" value="${project.home}" />
     <property name="build.properties.name" value="build.properties" />
     
@@ -473,14 +504,12 @@
 	               replace="/"
 	               global="true"
 	               defaultValue="${module.name}"/>
-	<property name="module.build.dir"
-		value="${build.dir}/${module.reldir}" />
-
+	<!-- property name="module.build.dir"
+		value="${build.dir}/${module.reldir}" / -->
+    <property name="module.build.dir" value="build"/>
 	<property name="module.api.forrest.dir" value="${forrest.build.site.dir}/api/${module.name}" />
-	<!-- property name="module.classes.dir"     value="${module.build.dir}/bin"/ -->
-	<!-- property name="module.testclasses.dir" value="${module.build.dir}/testbin"/ -->
-	<property name="module.classes.dir" value="bin" />
-	<property name="module.testclasses.dir" value="testbin" />
+	<property name="module.classes.dir" value="${module.build.dir}/bin" />
+	<property name="module.testclasses.dir" value="${module.build.dir}/testbin" />
 	<!-- Directory where generated SQL will be put by the schema export-->
 	<property name="module.sql.dir" value="${module.build.dir}/sql" />
 
@@ -509,7 +538,7 @@
         <property name="module.emmareport.dir"
 	        value="${module.report.dir}/html/emma"/>
 	<property name="module.docbase.dir"
-		value="${module.build.dir}/javadoc" />
+		value="${module.build.dir}/docs" />
 	<property name="module.javadoc.dir"
 		value="${module.docbase.dir}/api" />
 	<property name="module.javadocjar.name"
@@ -522,6 +551,8 @@
 		value="${module.docbase.dir}/pdf" />
 	<property name="module.doccheck.dir"
 		value="${module.docbase.dir}/doccheck" />
+	<property name="module.checkstyle.dir"
+	    value="${module.docbase.dir}/checkstyle" />
 	<property name="module.jar.name" value="${module.name}.jar" />
 	
 	<!--  Replace the dash by a / to create a relative directory 
@@ -559,6 +590,9 @@
     
       Preparation:
       
+      To execute with a specific proxy host and port, start ant with the 
+      command-line options   -Dproxyhost=hostname -Dproxyport=portnumber.
+      
       deps:          Download dependencies, this is necessary for using 
                      any of the build targets.
       clean-deps:    Remove downloaded dependencies. 
@@ -594,6 +628,10 @@
       
       javadoc:       Generates javadoc. Target: ${module.javadoc.dir} 
       doccheck:      Checks documentation. Target: ${module.doccheck.dir}
+	  
+	  Forrest:
+	  
+	  forrest:       Generates project docs using forrest. 
       
       Code analysis: 
       
@@ -601,7 +639,7 @@
       format:        Formats to the code in accordance with the checkstyle rules.
       simian:        Analyse similarities in the code.
       
-      Database targets: 
+      Database targets:  ** database targets are not functional yet **
       
       For all targets below the database is configured using 
       hibernate.properties (hibernate.dialect property) and