commit 5b61e9c40a655e2083b34c37f95a5ac9914277a0 Author: iwakeh iwakeh@torproject.org Date: Mon Dec 4 11:14:23 2017 +0000

Add ant task for onionperf module.

Move sources to main src folder, delete old build.xml and shell script; create ant task for running onionperf. --- build.xml | 5 +++++ modules/onionperf/.gitignore | 2 -- modules/onionperf/build.xml | 19 ------------------- shared/bin/40-run-onionperf-stats.sh | 5 ----- .../java/org/torproject/metrics/onionperf/Main.java | 0 .../main/sql/onionperf}/init-onionperf.sql | 0 6 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/build.xml b/build.xml index 0ed97ba..a120461 100644 --- a/build.xml +++ b/build.xml @@ -91,6 +91,11 @@ <antcall target="run-java" /> </target>

+ <target name="onionperf" > + <property name="module.name" value="onionperf" /> + <antcall target="run-java" /> + </target> + <target name="run-rserver"> <exec executable="R" dir="${Rsources}/rserver" diff --git a/modules/onionperf/.gitignore b/modules/onionperf/.gitignore deleted file mode 100644 index 4a8ab3e..0000000 --- a/modules/onionperf/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/stats/*.csv - diff --git a/modules/onionperf/build.xml b/modules/onionperf/build.xml deleted file mode 100644 index 3ddf2d3..0000000 --- a/modules/onionperf/build.xml +++ /dev/null @@ -1,19 +0,0 @@ -<project default="run" name="onionperf" basedir="."> - - <property name="mainclass" value="org.torproject.metrics.onionperf.Main"/> - - <include file="../../shared/build-base.xml" as="basetask"/> - <target name="clean" depends="basetask.clean"/> - <target name="compile" depends="basetask.compile"/> - <target name="run" depends="basetask.run"/> - - <path id="classpath"> - <pathelement path="${classes}"/> - <path refid="base.classpath" /> - <fileset dir="${libs}"> - <include name="postgresql-jdbc3-9.2.jar"/> - </fileset> - </path> - -</project> - diff --git a/shared/bin/40-run-onionperf-stats.sh b/shared/bin/40-run-onionperf-stats.sh deleted file mode 100755 index 6f025e7..0000000 --- a/shared/bin/40-run-onionperf-stats.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -cd modules/onionperf/ -ant | grep "[java]" | grep -Ev " DEBUG | INFO " -cd ../../ - diff --git a/modules/onionperf/src/main/java/org/torproject/metrics/onionperf/Main.java b/src/main/java/org/torproject/metrics/onionperf/Main.java similarity index 100% rename from modules/onionperf/src/main/java/org/torproject/metrics/onionperf/Main.java rename to src/main/java/org/torproject/metrics/onionperf/Main.java diff --git a/modules/onionperf/src/main/resources/init-onionperf.sql b/src/main/sql/onionperf/init-onionperf.sql similarity index 100% rename from modules/onionperf/src/main/resources/init-onionperf.sql rename to src/main/sql/onionperf/init-onionperf.sql