Cleaned up build.xml.

[mir.git] / build.xml

diff --git a/build.xml b/build.xml
index d26d695..c68923d 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -62,20 +62,18 @@
 
 <!-- No customization required after this line -->
 
+  <property environment="env"/>
   <property name="dist.home"      value="${deploy.home}"/>
   <property name="deploy.webinf"  value="${deploy.home}/WEB-INF"/>
   <property name="deploy.classes" value="${deploy.webinf}/classes"/>
   <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="tomcat.home"    value="${env.TOMCAT_HOME}"/>
 
-  <!-- If you want to use the very good jikes compiler, uncomment this
-  <property name="build.compiler"   value="jikes"/>-->
+  <!-- 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 -->
@@ -86,15 +84,10 @@
     <fileset dir="lib">
       <include name="*.jar"/>
     </fileset>
-<!--    <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"/>
--->
+       <fileset dir="${tomcat.home}/lib/common">
+               <include name="*.jar" />
+       </fileset>
   </path>
 
 
@@ -192,9 +185,12 @@
     <copy   todir="${deploy.classes}/bundles">
       <fileset dir="bundles" includes="**/*.properties"/>
     </copy>
-  <!-- I really don't think this is needed by default. maybe make it a targe?
-    -mh -->
-       <!--<exec executable="./perms.sh"/>-->
+  </target>
+
+
+
+  <target name="perms">
+       <exec executable="./perms.sh"/>
   </target>