Ok, big merge. here's the new xml-config stuff in action. There's a few

[mir.git] / build.xml

diff --git a/build.xml b/build.xml
index 4ae38f4..83bbe4c 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -38,6 +38,7 @@
   <property name="dist.src"       value="${app.name}.jar"/>
   <property name="dist.war"       value="${app.name}.war"/>
   <property name="javadoc.home"   value="${deploy.home}/javadoc"/>
+  <property name="build.compiler"   value="jikes"/>
 
 
 <!-- The "prepare" target is used to construct the deployment home
@@ -111,6 +112,10 @@
     <copy   todir="${deploy.home}/WEB-INF/classes">
       <fileset dir="source" includes="**/*.properties"/>
     </copy>
+    <copy   todir="${deploy.home}">
+      <fileset dir="source" includes="**/content-types.properties"/>
+      <fileset dir="source" includes="**/server.xml"/>
+    </copy>
   </target>
 
 
@@ -154,4 +159,4 @@
          basedir="${deploy.home}"/>
   </target>
 
-</project>
\ No newline at end of file
+</project>