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 6f7e15d..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
@@ -113,6 +114,7 @@
     </copy>
     <copy   todir="${deploy.home}">
       <fileset dir="source" includes="**/content-types.properties"/>
+      <fileset dir="source" includes="**/server.xml"/>
     </copy>
   </target>