\rhm

[mir.git] / build.xml

diff --git a/build.xml b/build.xml
index 6385509..2052c81 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -56,10 +56,10 @@
 
 -->
 
-  <property name="app.name"       value="Mir"/>
-  <property name="deploy.home"    value="../${app.name}"/>
+  <property name="app.name"       value="mir"/>
+  <property name="deploy.home"    value="./bin/${app.name}"/>
 
-  <!-- If you want to use the very good jikes compiler, uncomment this -->
+  <!-- don't use unless your Jikes is >= v1.18 -->
   <!-- <property name="build.compiler"   value="jikes"/>-->
 
 
@@ -81,9 +81,13 @@
     <pathelement path="${deploy.home}"/>
     <pathelement path="${deploy.classes}"/>
     <pathelement path="source"/>
+    <pathelement path="etc/extrasource"/>
     <fileset dir="lib">
       <include name="*.jar"/>
     </fileset>
+    <fileset dir="lib/hibernate">
+      <include name="*.jar"/>
+    </fileset>
     <pathelement path="${tomcat.home}/lib/tomcat.jar"/>
   <!-- for libs shared between tomcat and webapps (tomcat 3.3.x) -->
        <fileset dir="${tomcat.home}">
@@ -93,7 +97,7 @@
        <fileset dir="${tomcat.home}">
                <include name="lib/apps/*.jar" />
        </fileset>
-  <!-- for libs shared between tomcat and webapps (tomcat 4.0.x) -->
+  <!-- for libs shared between tomcat and webapps (tomcat 4.x.x) -->
        <fileset dir="${tomcat.home}">
                <include name="common/lib/*.jar" />
        </fileset>
@@ -101,6 +105,13 @@
        <fileset dir="${tomcat.home}">
                <include name="lib/*.jar" />
        </fileset>
+  <!-- for libs shared between webapps (tomcat 4.1.x) -->
+       <fileset dir="${tomcat.home}">
+               <include name="shared/lib/*.jar" />
+       </fileset>
+       <fileset dir="${tomcat.home}">
+               <include name="common/endorsed/*.jar" />
+       </fileset>
   </path>
 
 
@@ -123,7 +134,7 @@
     </copy>
 
     <copy todir="${deploy.webinf}/etc">
-      <fileset dir="etc" excludes="bundles/** web.xml"/>
+      <fileset dir="etc" excludes="bundles/** hibernate.cfg.xml web.xml"/>
     </copy>
     <copy todir="${deploy.classes}/bundles">
         <fileset dir="etc/bundles"/>
@@ -133,16 +144,22 @@
     <copy todir="${deploy.webinf}/templates">
       <fileset dir="templates"/>
     </copy>
-
+    
+    <copy todir="${deploy.webinf}" file="source/default.properties" />
+    
     <copy todir="${deploy.classes}/bundles">
       <fileset dir="bundles"/>
     </copy>
-
+    
+    <copy todir="${deploy.classes}" file="etc/hibernate.cfg.xml"/>
+    
     <copy todir="${deploy.home}/WEB-INF/lib">
       <fileset dir="lib">
         <exclude name="ant.jar"/>
         <exclude name="xerces.jar"/>
       </fileset>
+      <fileset dir="lib/hibernate">
+      </fileset>
     </copy>
   </target>
 
@@ -200,6 +217,10 @@
       <srcfileset
         dir="source"
         includes="**/*.java"/>
+<!-- ML: now why can't this be added?
+      <srcfileset
+        dir="etc/extrasource"
+        includes="**/*.java"/> -->
       <srcfileset
         dir="lib"
         includes="*.jar"/>
@@ -207,8 +228,10 @@
         dir="${deploy.classes}"
         includes="**/*.class"/>
     </dependset>
-    <javac srcdir="source" destdir="${deploy.classes}"
+    <javac destdir="${deploy.classes}"
            debug="on" optimize="off" deprecation="on">
+      <src path="source"/>
+      <src path="etc/extrasource"/>
       <classpath refid="project.class.path"/>
     </javac>
   </target>
@@ -262,5 +285,9 @@
          basedir="${deploy.home}"
          excludes="${dist.war}"/>
   </target>
+  
+  <target name="rundbtest" depends="compile">
+       <java classname="mir.core.test.Test" classpathref="project.class.path"/>
+  </target>
 
 </project>