the application is now copied and compiles into the \rdirectory mir/bin.\ri changed...

[mir.git] / build.xml

diff --git a/build.xml b/build.xml
index 387cc36..b4429b4 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}"/>
 
-  <!-- don't use unless your Jikes is >= v1.17 and you know what you are doing -->
+  <!-- don't use unless your Jikes is >= v1.18 -->
   <!-- <property name="build.compiler"   value="jikes"/>-->
 
 
@@ -94,7 +94,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>
@@ -102,6 +102,10 @@
        <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>
   </path>
 
 
@@ -134,16 +138,17 @@
     <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.home}/WEB-INF/lib">
       <fileset dir="lib">
         <exclude name="ant.jar"/>
         <exclude name="xerces.jar"/>
-        <exclude name="servlet-2.2.jar"/>
       </fileset>
     </copy>
   </target>