first cut of merge of STABLE-pre1_0 into HEAD. I won't even guarantee that it

[mir.git] / build.xml

diff --git a/build.xml b/build.xml
index 71db9e8..11c97f7 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -66,7 +66,10 @@
     <mkdir  dir="${deploy.home}/WEB-INF/classes"/>
     <mkdir  dir="${deploy.home}/WEB-INF/lib"/>
     <copy todir="${deploy.home}/WEB-INF/lib">
-      <fileset dir="lib"/>
+      <fileset dir="lib">
+        <exclude name="ant.jar"/>
+        <exclude name="xerces.jar"/>
+      </fileset>
     </copy>
     <mkdir  dir="${javadoc.home}"/>
     <mkdir  dir="${deploy.home}/log"/>
@@ -108,6 +111,12 @@
     <copy   todir="${deploy.home}/WEB-INF/classes">
       <fileset dir="source" includes="**/*.properties"/>
     </copy>
+    <copy   todir="${deploy.home}/WEB-INF/classes">
+      <fileset dir="source" includes="**/*.xml"/>
+    </copy>
+    <copy   todir="${deploy.home}">
+      <fileset dir="source" includes="**/content-types.properties"/>
+    </copy>
   </target>
 
 
@@ -141,11 +150,14 @@
      the source code for this application, if you wish to distribute
      that separately.
 -->
-
   <target name="dist" depends="prepare,compile">
-    <jar jarfile="${dist.home}/${dist.src}"
+    <jar jarfile="mirbase.jar"
+        includes="mir/**"
+        basedir="../Mir/WEB-INF/classes"/>
+    <jar jarfile="${dist.src}"
          basedir="./source"/>
-    <jar jarfile="${dist.home}/${dist.war}"
+    <jar jarfile="${dist.war}"
          basedir="${deploy.home}"/>
   </target>
+
 </project>