December 2017 - tor-commits - lists.torproject.org

[translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
by translation＠torproject.org 20 Dec '17

20 Dec '17

commit c6fc8de8bc575aab8ea02d9696f606f78d99cfd3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 20 09:20:14 2017 +0000 Update translations for tor-messenger-privproperties_completed --- sv/priv.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/priv.properties b/sv/priv.properties index ae9acc871..d14affbfa 100644 --- a/sv/priv.properties +++ b/sv/priv.properties @@ -1,2 +1,2 @@ -priv.account=Skapar privat nyckel +priv.account=Skapar privat nyckel för %S (%S) ... priv.failed=Fel vid skapning av nyckel: %S

1 0

[translation/tor-messenger-privproperties] Update translations for tor-messenger-privproperties
by translation＠torproject.org 20 Dec '17

20 Dec '17

commit 1dedbea94e8cd376e8f1e51e8a213db33eb426f6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 20 09:20:08 2017 +0000 Update translations for tor-messenger-privproperties --- sv/priv.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/priv.properties b/sv/priv.properties index ae9acc871..d14affbfa 100644 --- a/sv/priv.properties +++ b/sv/priv.properties @@ -1,2 +1,2 @@ -priv.account=Skapar privat nyckel +priv.account=Skapar privat nyckel för %S (%S) ... priv.failed=Fel vid skapning av nyckel: %S

1 0

[metrics-web/master] Copy .RData files where they belong.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 3b5aadfce19e1f2093e3df819a4bf21952affba9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 20 09:57:24 2017 +0100 Copy .RData files where they belong. --- build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.xml b/build.xml index f77048a..e948388 100644 --- a/build.xml +++ b/build.xml @@ -369,6 +369,8 @@ <fileset dir="${modulebase}/clients/stats" includes="clients*.csv userstats-combined.csv" /> <fileset dir="${modulebase}/webstats/stats" includes="webstats.csv" /> + </copy> + <copy todir="${rdatadir}" > <fileset dir="${modulebase}/clients/RData" includes="*.RData" /> <fileset dir="${modulebase}/webstats/RData" includes="*.RData" /> </copy>

1 0

[metrics-web/master] Adapt .gitignore to new structure.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 8b82720ea4f87ad365a243e56ac47badbbae49c9 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:18 2017 +0000 Adapt .gitignore to new structure. --- .gitignore | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 8f49baf..8234621 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,23 @@ -# Eclipse files -/.classpath -/.project +# hidden files +.* -# Generated web archive -/website/metrics.war +# Generated stuff +/generated/ +/stats/ +/lib/ +LOGBASE_IS_UNDEFINED/ +cobertura.ser +*.csv +*.RData +*.pyc +*.log -# Compiled class files -*.class - -# Possibly modified config file -/website/etc/context.xml +# library folder +/lib/ # Copied and possibly modified config file -/website/etc/config +config + +# other +*~

1 0

[metrics-web/master] Add ant task for advbwdist run.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 6056b8c800f5a01d3f79514e7e8e1ba62b379179 Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:25 2017 +0000 Add ant task for advbwdist run. Move related sources to main src tree, delete old build.xml and shell script; add ant helper task for running R scripts. --- build.xml | 21 +++++++++++++++++++++ modules/advbwdist/.gitignore | 4 ---- modules/advbwdist/build.xml | 11 ----------- shared/bin/60-run-advbwdist-stats.sh | 6 ------ {modules => src/main/R}/advbwdist/aggregate.R | 0 .../java/org/torproject/metrics/advbwdist/Main.java | 0 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/build.xml b/build.xml index 51596b6..3095512 100644 --- a/build.xml +++ b/build.xml @@ -96,6 +96,14 @@ <antcall target="run-java" /> </target> + <target name="advbwdist"> + <property name="module.name" value="advbwdist" /> + <antcall target="run-java" /> + <antcall target="run-R" > + <param name="module.Rscript" value="aggregate.R" /> + </antcall> + </target> + <target name="hidserv" > <property name="module.name" value="hidserv" /> <antcall target="run-java" /> @@ -138,6 +146,19 @@ </java> </target> + <target name="run-R" > + <echo message="Running R module ${module.name}, script ${module.Rscript} ... " /> + <property name="Rscript" + value="${Rsources}/${module.name}/${module.Rscript}" /> + <exec executable="R" + dir="${modulebase}/${module.name}" + failonerror="true" > + <arg value="--slave"/> + <arg value="-f"/> + <arg value="${Rscript}" /> + </exec> + </target> +  diff --git a/modules/advbwdist/.gitignore b/modules/advbwdist/.gitignore deleted file mode 100644 index 4bb76a5..0000000 --- a/modules/advbwdist/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -classes/ -stats/ -status/ - diff --git a/modules/advbwdist/build.xml b/modules/advbwdist/build.xml deleted file mode 100644 index 9a95bbf..0000000 --- a/modules/advbwdist/build.xml +++ /dev/null @@ -1,11 +0,0 @@ -<project default="run" name="advbwdist" basedir="."> - - <property name="mainclass" value="org.torproject.metrics.advbwdist.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/60-run-advbwdist-stats.sh b/shared/bin/60-run-advbwdist-stats.sh deleted file mode 100755 index a06e848..0000000 --- a/shared/bin/60-run-advbwdist-stats.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -cd modules/advbwdist/ -ant | grep "\[java\]" -R --slave -f aggregate.R -cd ../../ - diff --git a/modules/advbwdist/aggregate.R b/src/main/R/advbwdist/aggregate.R similarity index 100% rename from modules/advbwdist/aggregate.R rename to src/main/R/advbwdist/aggregate.R diff --git a/modules/advbwdist/src/main/java/org/torproject/metrics/advbwdist/Main.java b/src/main/java/org/torproject/metrics/advbwdist/Main.java similarity index 100% rename from modules/advbwdist/src/main/java/org/torproject/metrics/advbwdist/Main.java rename to src/main/java/org/torproject/metrics/advbwdist/Main.java

1 0

[metrics-web/master] Add ant task for onionperf module.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 5b61e9c40a655e2083b34c37f95a5ac9914277a0 Author: iwakeh <iwakeh(a)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

1 0

[metrics-web/master] Add ant task for webstats run.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 71843789443755a4a62b519543adc1d83eb5792c Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:26 2017 +0000 Add ant task for webstats run. Move related sources to main src tree, delete old build.xml and shell script. --- build.xml | 11 +++++++++++ modules/webstats/.gitignore | 3 --- modules/webstats/build.xml | 20 -------------------- shared/bin/90-run-webstats-stats.sh | 10 ---------- .../resources => src/main/R/webstats}/write-RData.R | 0 .../java/org/torproject/metrics/webstats/Main.java | 0 .../main/sql/webstats}/init-webstats.sql | 0 .../org/torproject/metrics/webstats/MainTest.java | 0 8 files changed, 11 insertions(+), 33 deletions(-) diff --git a/build.xml b/build.xml index 3095512..b793a10 100644 --- a/build.xml +++ b/build.xml @@ -109,6 +109,17 @@ <antcall target="run-java" /> </target> + <target name="webstats" > + <property name="module.name" value="webstats" /> + <property name="rdatadir" value="${modulebase}/${module.name}/RData" /> + <mkdir dir="${rdatadir}" /> + + <antcall target="run-java" /> + <antcall target="run-R" > + <param name="module.Rscript" value="write-RData.R" /> + </antcall> + </target> + <target name="run-rserver"> <exec executable="R" dir="${Rsources}/rserver" diff --git a/modules/webstats/.gitignore b/modules/webstats/.gitignore deleted file mode 100644 index a8e4d02..0000000 --- a/modules/webstats/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/stats/*.csv -/RData/*.RData - diff --git a/modules/webstats/build.xml b/modules/webstats/build.xml deleted file mode 100644 index 3a9f9f5..0000000 --- a/modules/webstats/build.xml +++ /dev/null @@ -1,20 +0,0 @@ -<project default="run" name="webstats" basedir="."> - - <property name="mainclass" value="org.torproject.metrics.webstats.Main"/> - - <include file="../../shared/build-base.xml" as="basetask"/> - <target name="clean" depends="basetask.clean"/> - <target name="compile" depends="basetask.compile"/> - <target name="test" depends="basetask.test"/> - <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/90-run-webstats-stats.sh b/shared/bin/90-run-webstats-stats.sh deleted file mode 100755 index 37091b4..0000000 --- a/shared/bin/90-run-webstats-stats.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -cd modules/webstats/ - -ant run | grep "\[java\]" - -R --slave -f src/main/resources/write-RData.R > /dev/null 2>&1 - -cd ../../ - diff --git a/modules/webstats/src/main/resources/write-RData.R b/src/main/R/webstats/write-RData.R similarity index 100% rename from modules/webstats/src/main/resources/write-RData.R rename to src/main/R/webstats/write-RData.R diff --git a/modules/webstats/src/main/java/org/torproject/metrics/webstats/Main.java b/src/main/java/org/torproject/metrics/webstats/Main.java similarity index 100% rename from modules/webstats/src/main/java/org/torproject/metrics/webstats/Main.java rename to src/main/java/org/torproject/metrics/webstats/Main.java diff --git a/modules/webstats/src/main/resources/init-webstats.sql b/src/main/sql/webstats/init-webstats.sql similarity index 100% rename from modules/webstats/src/main/resources/init-webstats.sql rename to src/main/sql/webstats/init-webstats.sql diff --git a/modules/webstats/src/test/java/org/torproject/metrics/webstats/MainTest.java b/src/test/java/org/torproject/metrics/webstats/MainTest.java similarity index 100% rename from modules/webstats/src/test/java/org/torproject/metrics/webstats/MainTest.java rename to src/test/java/org/torproject/metrics/webstats/MainTest.java

1 0

[metrics-web/master] Add main build.xml based on metrics-base.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit 7fe0316a6be7a758db09610034a18190207279be Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:13 2017 +0000 Add main build.xml based on metrics-base. Only some library patternsets are added, no tasks yet. --- build.xml | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..26bbf0e --- /dev/null +++ b/build.xml @@ -0,0 +1,73 @@ +<?xml version="1.0"?> + +<!DOCTYPE project [ + <!ENTITY base SYSTEM "src/build/java/base.xml"> +]> + +<project default="usage" name="metrics-web" basedir="."> + + <property name="javadoc-title" value="MetricsWeb API Documentation"/> + <property name="implementation-title" value="metrics-web" /> + <property name="release.version" value="1.0.0-dev" /> + <property name="metricslibversion" value="2.1.1" /> + <property name="jetty.version" value="-9.2.21.v20170120" /> + <property name="warfile" + value="metrics-web-${release.version}.war"/> + + <property name="name" value="metrics-web"/> + + <property name="project-main-class" + value="org.torproject.TBD" /> + <property name="additional2sign" value="${warfile}" /> + <property name="tardepends" value="war" /> + + <property name="Rsources" value="${basedir}/src/main/R" /> + <property name="pysources" value="${basedir}/src/main/python" /> + +  + <property name="metrics-web.deployment.base" + value="/srv/metrics.torproject.org/metrics" /> + +  + <target name="coverage-check"> + <cobertura-check totallinerate="0" totalbranchrate="0" > +  + </cobertura-check> + </target> + + <patternset id="common" > + <include name="commons-codec-1.10.jar"/> + <include name="commons-lang3-3.5.jar"/> + <include name="commons-lang-2.6.jar"/> + <include name="gson-2.4.jar" /> + <include name="logback-core-1.1.9.jar" /> + <include name="logback-classic-1.1.9.jar" /> + <include name="postgresql-9.4.1212.jar"/> + <include name="REngine.jar"/> + <include name="Rserve.jar"/> + <include name="slf4j-api-1.7.22.jar"/> + </patternset> + + <patternset id="library" > + <patternset refid="common" /> + <include name="metrics-lib-${metricslibversion}.jar"/> + <include name="commons-compress-1.13.jar"/> + <include name="servlet-api-3.1.jar"/> + <include name="xz-1.6.jar"/> + </patternset> + + <patternset id="runtime" > + <patternset refid="library" /> + </patternset> + +  + &base; + +</project> +

1 0

[metrics-web/master] Add ant task for clients run.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit c0e7cd031c0b06b6e61c926ddb3f4b15d14f9eaa Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Dec 4 11:14:28 2017 +0000 Add ant task for clients run. Move related sources to main src tree, delete old build.xml and shell script. --- build.xml | 58 ++++++++++++++++++++++ modules/clients/.gitignore | 2 - modules/clients/build.xml | 11 ---- shared/bin/80-run-clients-stats.sh | 34 ------------- {modules => src/main/R}/clients/merge-clients.R | 0 {modules => src/main/R}/clients/split-clients.R | 0 .../main/R}/clients/userstats-detector.R | 0 .../java/org/torproject/metrics/clients/Main.java | 0 .../main/python}/clients/country_info.py | 0 {modules => src/main/python}/clients/detector.py | 0 .../main/sql}/clients/init-userstats.sql | 0 .../main/sql}/clients/test-userstats.sql | 0 12 files changed, 58 insertions(+), 47 deletions(-) diff --git a/build.xml b/build.xml index 09857ba..78f17d0 100644 --- a/build.xml +++ b/build.xml @@ -155,6 +155,64 @@ <antcall target="run-java" /> </target> + <target name="clients" > + <property name="module.name" value="clients" /> + <property name="localmoddir" value="${modulebase}/${module.name}" /> + + <property name="rdatadir" value="${localmoddir}/RData" /> + <mkdir dir="${rdatadir}" /> + <property name="statsdir" + value="${localmoddir}/stats" /> + <mkdir dir="${statsdir}" /> + + <antcall target="run-java" /> + <apply executable="psql" failonerror="true" > + <arg value="--dbname=userstats"/> + <arg value="-f"/> + <fileset dir="${localmoddir}/out" + includes="*.sql" /> + </apply> + + <exec executable="psql" + dir="${localmoddir}" + failonerror="true" > + <arg value="-c COPY (SELECT * FROM estimated) TO STDOUT WITH CSV HEADER;" /> + <arg value="--dbname=userstats"/> + <arg value="--output=userstats.csv" /> + </exec> + + <exec executable="psql" + dir="${localmoddir}" + failonerror="true" > + <arg value="-c COPY (SELECT * FROM combined) TO STDOUT WITH CSV HEADER;" /> + <arg value="--dbname=userstats"/> + <arg value="--output=userstats-combined.csv" /> + </exec> + + <antcall target="run-R" > + <param name="module.Rscript" value="userstats-detector.R" /> + </antcall> + + <exec executable="python" + dir="${localmoddir}" + failonerror="true" > + <arg value="${pysources}/${module.name}/detector.py" /> + <arg value="userstats-detector.csv" /> + <arg value="userstats-ranges.csv" /> + </exec> + + <antcall target="run-R" > + <param name="module.Rscript" value="merge-clients.R" /> + </antcall> + + <copy file="clients.csv" todir="${statsdir}" /> + <copy file="userstats-combined.csv" todir="${statsdir}" /> + + <antcall target="run-R" > + <param name="module.Rscript" value="split-clients.R" /> + </antcall> + </target> + <target name="webstats" > <property name="module.name" value="webstats" /> <property name="rdatadir" value="${modulebase}/${module.name}/RData" /> diff --git a/modules/clients/.gitignore b/modules/clients/.gitignore deleted file mode 100644 index 29a7166..0000000 --- a/modules/clients/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.csv - diff --git a/modules/clients/build.xml b/modules/clients/build.xml deleted file mode 100644 index f67bdae..0000000 --- a/modules/clients/build.xml +++ /dev/null @@ -1,11 +0,0 @@ -<project default="run" name="clients" basedir="."> - - <property name="mainclass" value="org.torproject.metrics.clients.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/80-run-clients-stats.sh b/shared/bin/80-run-clients-stats.sh deleted file mode 100755 index fe93e44..0000000 --- a/shared/bin/80-run-clients-stats.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -cd modules/clients/ - -echo `date` "Parsing descriptors." -ant | grep "\[java\]" - -for i in $(ls out/*.sql) -do - echo `date` "Importing $i." - psql -f $i userstats -done - -echo `date` "Exporting results." -psql -c 'COPY (SELECT * FROM estimated) TO STDOUT WITH CSV HEADER;' userstats > userstats.csv -psql -c 'COPY (SELECT * FROM combined) TO STDOUT WITH CSV HEADER;' userstats > userstats-combined.csv - -echo `date` "Running censorship detector." -R --slave -f userstats-detector.R > /dev/null 2>&1 -python detector.py - -echo `date` "Merging censorship detector results." -R --slave -f merge-clients.R > /dev/null 2>&1 -mkdir -p stats/ -cp clients.csv stats/ -cp userstats-combined.csv stats/ - -echo `date` "Saving results as .RData files." -R --slave -f split-clients.R > /dev/null 2>&1 - -echo `date` "Terminating." - -cd ../../ - diff --git a/modules/clients/merge-clients.R b/src/main/R/clients/merge-clients.R similarity index 100% rename from modules/clients/merge-clients.R rename to src/main/R/clients/merge-clients.R diff --git a/modules/clients/split-clients.R b/src/main/R/clients/split-clients.R similarity index 100% rename from modules/clients/split-clients.R rename to src/main/R/clients/split-clients.R diff --git a/modules/clients/userstats-detector.R b/src/main/R/clients/userstats-detector.R similarity index 100% rename from modules/clients/userstats-detector.R rename to src/main/R/clients/userstats-detector.R diff --git a/modules/clients/src/main/java/org/torproject/metrics/clients/Main.java b/src/main/java/org/torproject/metrics/clients/Main.java similarity index 100% rename from modules/clients/src/main/java/org/torproject/metrics/clients/Main.java rename to src/main/java/org/torproject/metrics/clients/Main.java diff --git a/modules/clients/country_info.py b/src/main/python/clients/country_info.py similarity index 100% rename from modules/clients/country_info.py rename to src/main/python/clients/country_info.py diff --git a/modules/clients/detector.py b/src/main/python/clients/detector.py similarity index 100% rename from modules/clients/detector.py rename to src/main/python/clients/detector.py diff --git a/modules/clients/init-userstats.sql b/src/main/sql/clients/init-userstats.sql similarity index 100% rename from modules/clients/init-userstats.sql rename to src/main/sql/clients/init-userstats.sql diff --git a/modules/clients/test-userstats.sql b/src/main/sql/clients/test-userstats.sql similarity index 100% rename from modules/clients/test-userstats.sql rename to src/main/sql/clients/test-userstats.sql

1 0

[metrics-web/master] Add ant task for hidserv module.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit a990b80149160cc187e4581b9c81586021cfcf51 Author: iwakeh <iwakeh(a)torproject.org> 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

1 0