[tor-commits] [metrics-web/master] Simplify build.xml.

[karsten@xxxxxxxxxxxxxx]

commit b517a1358a4976397b0acbf9f9c4a321aa5a0929
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Tue Jan 21 17:32:57 2014 +0100

    Simplify build.xml.
---
 website/build.xml |   50 +++++++++++++++++++-------------------------------
 1 file changed, 19 insertions(+), 31 deletions(-)

diff --git a/website/build.xml b/website/build.xml
index fe75453..17b63bc 100644
--- a/website/build.xml
+++ b/website/build.xml
@@ -1,31 +1,10 @@
 <project default="war" name="metrics-web" basedir=".">
 
-  <!-- Define build paths. -->
-  <property name="sources" value="src"/>
-  <property name="classes" value="classes"/>
-  <property name="config" value="etc"/>
-  <property name="webxmlfile" value="${config}/web.xml"/>
-  <property name="warfile" value="ernie.war"/>
-  <path id="classpath">
-    <pathelement path="${classes}"/>
-    <fileset dir="/usr/share/java">
-      <include name="commons-codec.jar"/>
-      <include name="servlet-api-3.0.jar"/>
-    </fileset>
-    <fileset dir="lib">
-      <include name="REngine.jar"/>
-      <include name="RserveEngine.jar"/>
-    </fileset>
-  </path>
-
-  <target name="init">
-    <mkdir dir="${classes}"/>
-  </target>
-
   <!-- Compile all servlets. -->
-  <target name="compile" depends="init">
-    <javac destdir="${classes}"
-           srcdir="${sources}"
+  <target name="compile">
+    <mkdir dir="classes"/>
+    <javac destdir="classes"
+           srcdir="src"
            source="1.5"
            target="1.5"
            debug="true"
@@ -33,15 +12,24 @@
            optimize="false"
            failonerror="true"
            includeantruntime="false">
-      <classpath refid="classpath"/>
+      <classpath>
+        <fileset dir="/usr/share/java">
+          <include name="commons-codec.jar"/>
+          <include name="servlet-api-3.0.jar"/>
+        </fileset>
+        <fileset dir="lib">
+          <include name="REngine.jar"/>
+          <include name="RserveEngine.jar"/>
+        </fileset>
+      </classpath>
     </javac>
   </target>
 
   <!-- Create a .war file for deployment. -->
   <target name="war"
           depends="compile">
-    <war destfile="${warfile}"
-         webxml="${webxmlfile}">
+    <war destfile="ernie.war"
+         webxml="etc/web.xml">
       <fileset dir="web"/>
       <lib dir="lib">
           <include name="jstl.jar"/>
@@ -52,11 +40,11 @@
       <lib dir="/usr/share/java">
           <include name="commons-codec.jar"/>
       </lib>
-      <classes dir="${classes}"/>
-      <zipfileset dir="${config}"
+      <classes dir="classes"/>
+      <zipfileset dir="etc"
                   prefix="WEB-INF/classes"
                   includes="logging.properties"/>
-      <metainf dir="${config}"
+      <metainf dir="etc"
                includes="context.xml"/>
     </war>
   </target>



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits