commented out perms.sh. I don't think it should be used by default. maybe a

[mir.git] / build.xml

diff --git a/build.xml b/build.xml
index f72143b..20f9d47 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -58,9 +58,6 @@
 
   <property name="app.name"       value="Mir"/>
   <property name="deploy.home"    value="../${app.name}"/>
-  <property name="java.home"             value="/usr/lib/j2sdk1.3/"/>
-  <property name="java.localhome" value="/usr/share/java/"/>
-  <property name="tomcat.home"    value="/usr/share/tomcat/"/>
 
 
 <!-- No customization required after this line -->
@@ -72,6 +69,14 @@
   <property name="dist.war"       value="${app.name}.war"/>
   <property name="javadoc.home"   value="${deploy.home}/javadoc"/>
 
+  <!-- If you want to use the very good jikes compiler, uncomment this
+  <property name="build.compiler"   value="jikes"/>-->
+
+  <!-- The following 3 properties seem redundant -->
+  <property name="java.home"             value="/usr/lib/j2sdk1.3/"/>
+  <property name="java.localhome" value="/usr/share/java/"/>
+  <property name="tomcat.home"    value="/usr/share/tomcat/"/>
+
 
   <!-- Construct the classpath -->
   <path id="project.class.path">
@@ -81,14 +86,15 @@
     <fileset dir="lib">
       <include name="*.jar"/>
     </fileset>
-    <fileset dir="${java.home}/lib">
+<!--    <fileset dir="${java.home}/lib">
       <include name="tools.jar"/>
       <include name="rt.jar"/>
     </fileset>
     <fileset dir="${java.localhome}">
       <include name="*.jar"/>
     </fileset>
-    <pathelement path="${tomcat.home}/lib/tomcat.jar"/>
+    <pathelement path="${tomcat.home}/lib/tomcat.jar"/> 
+-->
   </path>
 
 
@@ -124,9 +130,6 @@
         <exclude name="xerces.jar"/>
       </fileset>
     </copy>
-    <copy todir="${deploy.home}/WEB-INF/classes">
-      <fileset dir="bundles"/>
-    </copy>
     <mkdir  dir="${javadoc.home}"/>
     <mkdir  dir="${deploy.home}/log"/>
 
@@ -184,16 +187,11 @@
     </copy>
     <copy   todir="${deploy.home}">
       <fileset dir="source" includes="**/content-types.properties"/>
+      <fileset dir="source" includes="**/server.xml"/>
     </copy>
-       <exec executable="./perms.sh"/>
-
-<!--   <echo>
-               Now you should call perms.sh(-dist) in order to set
-               the permissions of your installed files to a meaningful
-               value. 
-               Have fun with Mir!
-       </echo>
--->
+  <!-- I really don't think this is needed by default. maybe make it a targe?
+    -mh -->
+       <!--<exec executable="./perms.sh"/>-->
   </target>