Add submodule for metrics-lib

Also clean up the build process a little

Include required libraries while constructing ernie.war

Thanks Karsten for spotting a mistake here

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "deps/metrics-lib"]
+	path = deps/metrics-lib
+	url = https://git.torproject.org/metrics-lib

build.xml

@@ -3,7 +3,6 @@
   <!-- Define build paths. -->
   <property name="sources" value="src"/>
   <property name="classes" value="classes"/>
-  <property name="libs" value="lib"/>
   <property name="config" value="etc"/>
   <property name="webxmlfile" value="${config}/web.xml"/>
   <property name="contextxmltemplate"
@@ -12,11 +11,21 @@
   <property name="warfile" value="ernie.war"/>
   <path id="classpath">
     <pathelement path="${classes}"/>
-    <pathelement location="lib/commons-codec-1.4.jar"/>
-    <pathelement location="lib/commons-compress-1.3.jar"/>
-    <pathelement location="lib/postgresql-9.1-903.jdbc3.jar"/>
-    <pathelement location="lib/junit-4.8.2.jar"/>
-    <pathelement location="lib/descriptor.jar"/>
+    <fileset dir="/usr/share/java">
+      <include name="commons-codec.jar"/>
+      <include name="commons-compress.jar"/>
+      <include name="postgresql-jdbc3.jar"/>
+      <include name="junit4.jar"/>
+      <include name="servlet-api-3.0.jar"/>
+      <include name="commons-lang.jar"/>
+    </fileset>
+    <fileset dir="deps/metrics-lib">
+      <include name="descriptor.jar"/>
+    </fileset>
+    <fileset dir="lib">
+      <include name="REngine.jar"/>
+      <include name="RserveEngine.jar"/>
+    </fileset>
   </path>
 
   <target name="init">
@@ -24,10 +33,12 @@
     <copy file="config.template" tofile="config"/>
     <mkdir dir="${classes}"/>
   </target>
+  <target name="metrics-lib">
+    <ant dir="deps/metrics-lib"/>
+  </target>
 
   <!-- Compile all servlets and plain Java classes. -->
-  <target name="compile"
-          depends="init">
+  <target name="compile" depends="metrics-lib,init">
     <javac destdir="${classes}"
            srcdir="${sources}"
            source="1.5"
@@ -37,9 +48,7 @@
            optimize="false"
            failonerror="true"
            includeantruntime="false">
-      <classpath>
-        <fileset dir="${libs}"/>
-      </classpath>
+      <classpath refid="classpath"/>
     </javac>
   </target>
 
@@ -88,8 +97,22 @@
     <war destfile="${warfile}"
          webxml="${webxmlfile}">
       <fileset dir="web"/>
-      <lib dir="${libs}"
-           excludes="servlet-api.jar"/>
+      <lib dir="lib">
+          <include name="jstl.jar"/>
+          <include name="REngine.jar"/>
+          <include name="RserveEngine.jar"/>
+          <include name="standard.jar"/>
+      </lib>
+      <lib dir="/usr/share/java">
+          <include name="commons-codec.jar"/>
+          <include name="commons-compress.jar"/>
+          <include name="postgresql-jdbc3.jar"/>
+          <include name="junit4.jar"/>
+          <include name="commons-lang.jar"/>
+      </lib>
+      <lib dir="deps/metrics-lib">
+          <include name="descriptor.jar"/>
+      </lib>
       <classes dir="${classes}"/>
       <zipfileset dir="${config}"
                   prefix="WEB-INF/classes"

deps/metrics-lib

@@ -0,0 +1 @@
+Subproject commit 3e60ccdaaba598cabb7281d45f9a415299b8e3e3