commit 3ef4669e970f1a28ab4191ee292ba9efa2a34f59 Author: Sebastian Hahn sebastian@torproject.org Date: Thu Aug 22 19:32:33 2013 +0200

Add submodule for metrics-lib --- .gitmodules | 3 +++ build.xml | 29 +++++++++++++++++++++++------ deps/metrics-lib | 1 + 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c6b6388 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "deps/metrics-lib"] + path = deps/metrics-lib + url = https://git.torproject.org/metrics-lib diff --git a/build.xml b/build.xml index 523d301..e772da4 100644 --- a/build.xml +++ b/build.xml @@ -2,7 +2,6 @@ <property name="sources" value="src"/> <property name="tests" value="test"/> <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" @@ -14,8 +13,16 @@ <property name="warfile" value="onionoo.war"/> <path id="classpath"> <pathelement path="${classes}"/> - <fileset dir="${libs}"> - <include name="*.jar"/> + <fileset dir="/usr/share/java"> + <include name="commons-codec.jar"/> + <include name="commons-compress.jar"/> + <include name="commons-lang.jar"/> + <include name="gson.jar"/> + <include name="junit4.jar"/> + <include name="servlet-api-3.0.jar"/> + </fileset> + <fileset dir="deps/metrics-lib"> + <include name="descriptor.jar"/> </fileset> </path> <target name="init"> @@ -23,8 +30,11 @@ <copy file="${webxmltemplate}" tofile="${webxml}"/> <mkdir dir="${classes}"/> </target> + <target name="metrics-lib"> + <ant dir="deps/metrics-lib"/> + </target> <target name="compile" - depends="init"> + depends="metrics-lib, init"> <javac destdir="${classes}" srcdir="${sources}" source="1.5" @@ -63,8 +73,15 @@ <war destfile="${warfile}" webxml="${webxmlfile}"> <fileset dir="web"/> - <lib dir="${libs}" - excludes="servlet-api.jar"/> + <lib dir="deps/metrics-lib"> + <include name="descriptor.jar"/> + </lib> + <lib dir="/usr/share/java"> + <include name="commons-codec.jar"/> + <include name="commons-compress.jar"/> + <include name="commons-lang.jar"/> + <include name="gson.jar"/> + </lib> <classes dir="${classes}"/> <zipfileset dir="${config}" prefix="WEB-INF/classes" diff --git a/deps/metrics-lib b/deps/metrics-lib new file mode 160000 index 0000000..3e60ccd --- /dev/null +++ b/deps/metrics-lib @@ -0,0 +1 @@ +Subproject commit 3e60ccdaaba598cabb7281d45f9a415299b8e3e3