[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [metrics-web/master] Add ant task for hidserv module.
commit a990b80149160cc187e4581b9c81586021cfcf51
Author: iwakeh <iwakeh@xxxxxxxxxxxxxx>
Date: Mon Dec 4 11:14:24 2017 +0000
Add ant task for hidserv module.
Move sources to main src folder,
delete old build.xml and shell script;
create ant task for running hidserv.
---
build.xml | 5 +++++
modules/hidserv/.gitignore | 4 ----
modules/hidserv/build.xml | 11 -----------
shared/bin/70-run-hidserv-stats.sh | 5 -----
.../main/java/org/torproject/metrics/hidserv/Aggregator.java | 0
.../torproject/metrics/hidserv/ComputedNetworkFractions.java | 0
.../java/org/torproject/metrics/hidserv/DateTimeHelper.java | 0
.../main/java/org/torproject/metrics/hidserv/Document.java | 0
.../java/org/torproject/metrics/hidserv/DocumentStore.java | 0
.../torproject/metrics/hidserv/ExtrapolatedHidServStats.java | 0
.../java/org/torproject/metrics/hidserv/Extrapolator.java | 0
.../main/java/org/torproject/metrics/hidserv/Main.java | 0
.../main/java/org/torproject/metrics/hidserv/Parser.java | 0
.../org/torproject/metrics/hidserv/ReportedHidServStats.java | 0
.../main/java/org/torproject/metrics/hidserv/Simulate.java | 0
15 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/build.xml b/build.xml
index a120461..51596b6 100644
--- a/build.xml
+++ b/build.xml
@@ -96,6 +96,11 @@
<antcall target="run-java" />
</target>
+ <target name="hidserv" >
+ <property name="module.name" value="hidserv" />
+ <antcall target="run-java" />
+ </target>
+
<target name="run-rserver">
<exec executable="R"
dir="${Rsources}/rserver"
diff --git a/modules/hidserv/.gitignore b/modules/hidserv/.gitignore
deleted file mode 100644
index 4bb76a5..0000000
--- a/modules/hidserv/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-classes/
-stats/
-status/
-
diff --git a/modules/hidserv/build.xml b/modules/hidserv/build.xml
deleted file mode 100644
index 5c15d0e..0000000
--- a/modules/hidserv/build.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project default="run" name="hidserv" basedir=".">
-
- <property name="mainclass" value="org.torproject.metrics.hidserv.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"/>
-
-</project>
-
diff --git a/shared/bin/70-run-hidserv-stats.sh b/shared/bin/70-run-hidserv-stats.sh
deleted file mode 100755
index a924f31..0000000
--- a/shared/bin/70-run-hidserv-stats.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-cd modules/hidserv/
-ant | grep "\[java\]"
-cd ../../
-
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Aggregator.java b/src/main/java/org/torproject/metrics/hidserv/Aggregator.java
similarity index 100%
rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Aggregator.java
rename to src/main/java/org/torproject/metrics/hidserv/Aggregator.java
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java b/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java
similarity index 100%
rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java
rename to src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java b/src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java
similarity index 100%
rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java
rename to src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Document.java b/src/main/java/org/torproject/metrics/hidserv/Document.java
similarity index 100%
rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Document.java
rename to src/main/java/org/torproject/metrics/hidserv/Document.java
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java b/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java
similarity index 100%
rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java
rename to src/main/java/org/torproject/metrics/hidserv/DocumentStore.java
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java b/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java
similarity index 100%
rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java
rename to src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Extrapolator.java b/src/main/java/org/torproject/metrics/hidserv/Extrapolator.java
similarity index 100%
rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Extrapolator.java
rename to src/main/java/org/torproject/metrics/hidserv/Extrapolator.java
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Main.java b/src/main/java/org/torproject/metrics/hidserv/Main.java
similarity index 100%
rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Main.java
rename to src/main/java/org/torproject/metrics/hidserv/Main.java
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Parser.java b/src/main/java/org/torproject/metrics/hidserv/Parser.java
similarity index 100%
rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Parser.java
rename to src/main/java/org/torproject/metrics/hidserv/Parser.java
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java b/src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java
similarity index 100%
rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java
rename to src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java
diff --git a/modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Simulate.java b/src/main/java/org/torproject/metrics/hidserv/Simulate.java
similarity index 100%
rename from modules/hidserv/src/main/java/org/torproject/metrics/hidserv/Simulate.java
rename to src/main/java/org/torproject/metrics/hidserv/Simulate.java
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits