[metrics-web/master] Rename packages.
commit 92567231daea83b07453a77b86abece823b83567 Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Tue Jan 30 11:48:43 2018 +0100 Rename packages. - Rename root package org.torproject.metrics to org.torproject.metrics.stats to make it part of the Tor Metrics name space. - ernie.cron becomes org.torproject.metrics.stats.servers to get rid of the legacy name and to reflect that it's all about servers and bandwidth (provided by servers). - org.torproject.metrics.web remains unchanged. - org.torproject.metrics.web.graphs and org.torproject.metrics.web.research are merged into org.torproject.metrics.web. - Remove special treatment for legacy package names, which is not necessary anymore. Resolves #24294. --- build.xml | 9 +++------ .../java/org/torproject/metrics/{ => stats}/advbwdist/Main.java | 2 +- .../java/org/torproject/metrics/{ => stats}/clients/Main.java | 2 +- .../org/torproject/metrics/{ => stats}/collectdescs/Main.java | 2 +- .../org/torproject/metrics/{ => stats}/connbidirect/Main.java | 2 +- .../org/torproject/metrics/{ => stats}/hidserv/Aggregator.java | 2 +- .../metrics/{ => stats}/hidserv/ComputedNetworkFractions.java | 2 +- .../torproject/metrics/{ => stats}/hidserv/DateTimeHelper.java | 2 +- .../org/torproject/metrics/{ => stats}/hidserv/Document.java | 2 +- .../torproject/metrics/{ => stats}/hidserv/DocumentStore.java | 2 +- .../metrics/{ => stats}/hidserv/ExtrapolatedHidServStats.java | 2 +- .../org/torproject/metrics/{ => stats}/hidserv/Extrapolator.java | 2 +- .../java/org/torproject/metrics/{ => stats}/hidserv/Main.java | 2 +- .../java/org/torproject/metrics/{ => stats}/hidserv/Parser.java | 2 +- .../metrics/{ => stats}/hidserv/ReportedHidServStats.java | 2 +- .../org/torproject/metrics/{ => stats}/hidserv/Simulate.java | 2 +- .../java/org/torproject/metrics/{ => stats}/onionperf/Main.java | 2 +- .../{ernie/cron => metrics/stats/servers}/Configuration.java | 2 +- .../stats/servers}/ConsensusStatsFileHandler.java | 2 +- .../{ernie/cron => metrics/stats/servers}/LockFile.java | 2 +- .../cron => metrics/stats/servers}/LoggingConfiguration.java | 2 +- .../torproject/{ernie/cron => metrics/stats/servers}/Main.java | 4 +--- .../stats/servers}/RelayDescriptorDatabaseImporter.java | 2 +- .../java/org/torproject/metrics/{ => stats}/webstats/Main.java | 2 +- .../org/torproject/metrics/web/{graphs => }/BubblesServlet.java | 5 +---- .../java/org/torproject/metrics/web/{graphs => }/Countries.java | 2 +- .../torproject/metrics/web/{graphs => }/GraphImageServlet.java | 2 +- .../metrics/web/{graphs => }/GraphParameterChecker.java | 5 +---- src/main/java/org/torproject/metrics/web/GraphServlet.java | 3 --- src/main/java/org/torproject/metrics/web/News.java | 2 -- src/main/java/org/torproject/metrics/web/NewsServlet.java | 2 -- .../java/org/torproject/metrics/web/{graphs => }/RObject.java | 2 +- .../torproject/metrics/web/{graphs => }/RObjectGenerator.java | 5 +---- .../metrics/web/{research => }/ResearchStatsServlet.java | 2 +- .../metrics/web/{graphs => }/TableParameterChecker.java | 5 +---- src/main/java/org/torproject/metrics/web/TableServlet.java | 3 --- src/main/resources/web.xml | 8 ++++---- .../torproject/metrics/{ => stats}/connbidirect/MainTest.java | 2 +- .../org/torproject/metrics/{ => stats}/webstats/MainTest.java | 2 +- 39 files changed, 40 insertions(+), 67 deletions(-) diff --git a/build.xml b/build.xml index 996d2a3..c9005d1 100644 --- a/build.xml +++ b/build.xml @@ -265,7 +265,7 @@ <!-- Expects legacy.config file in the base directory. --> <target name="legacy" > - <property name="module.name" value="legacy" /> + <property name="module.name" value="servers" /> <property name="localmoddir" value="${modulebase}/${module.name}" /> <property name="statsdir" value="${localmoddir}/stats" /> @@ -274,10 +274,7 @@ <copy file="${basedir}/legacy.config" tofile="${localmoddir}/config"/> - <antcall target="run-java"> - <param name="module.main" - value="org.torproject.ernie.cron.Main" /> - </antcall> + <antcall target="run-java" /> <exec executable="psql" dir="${localmoddir}" @@ -443,7 +440,7 @@ <fail unless="have.jar" message="Please run 'ant jar' first."/> <condition property="mainclass" value="${module.main}" - else="org.torproject.metrics.${module.name}.Main" > + else="org.torproject.metrics.stats.${module.name}.Main" > <isset property="module.main"/> </condition> <property name="workingdir" value="${modulebase}/${module.name}" /> diff --git a/src/main/java/org/torproject/metrics/advbwdist/Main.java b/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java similarity index 99% rename from src/main/java/org/torproject/metrics/advbwdist/Main.java rename to src/main/java/org/torproject/metrics/stats/advbwdist/Main.java index 76c701f..6565961 100644 --- a/src/main/java/org/torproject/metrics/advbwdist/Main.java +++ b/src/main/java/org/torproject/metrics/stats/advbwdist/Main.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.advbwdist; +package org.torproject.metrics.stats.advbwdist; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorReader; diff --git a/src/main/java/org/torproject/metrics/clients/Main.java b/src/main/java/org/torproject/metrics/stats/clients/Main.java similarity index 99% rename from src/main/java/org/torproject/metrics/clients/Main.java rename to src/main/java/org/torproject/metrics/stats/clients/Main.java index 0ad3a49..4f083b9 100644 --- a/src/main/java/org/torproject/metrics/clients/Main.java +++ b/src/main/java/org/torproject/metrics/stats/clients/Main.java @@ -1,7 +1,7 @@ /* Copyright 2013--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.clients; +package org.torproject.metrics.stats.clients; import org.torproject.descriptor.BandwidthHistory; import org.torproject.descriptor.BridgeNetworkStatus; diff --git a/src/main/java/org/torproject/metrics/collectdescs/Main.java b/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java similarity index 95% rename from src/main/java/org/torproject/metrics/collectdescs/Main.java rename to src/main/java/org/torproject/metrics/stats/collectdescs/Main.java index 3ed0e71..04dc86d 100644 --- a/src/main/java/org/torproject/metrics/collectdescs/Main.java +++ b/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java @@ -1,7 +1,7 @@ /* Copyright 2015--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.collectdescs; +package org.torproject.metrics.stats.collectdescs; import org.torproject.descriptor.DescriptorCollector; import org.torproject.descriptor.DescriptorSourceFactory; diff --git a/src/main/java/org/torproject/metrics/connbidirect/Main.java b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java similarity index 99% rename from src/main/java/org/torproject/metrics/connbidirect/Main.java rename to src/main/java/org/torproject/metrics/stats/connbidirect/Main.java index fa24e6e..1911472 100644 --- a/src/main/java/org/torproject/metrics/connbidirect/Main.java +++ b/src/main/java/org/torproject/metrics/stats/connbidirect/Main.java @@ -1,7 +1,7 @@ /* Copyright 2015--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.connbidirect; +package org.torproject.metrics.stats.connbidirect; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorReader; diff --git a/src/main/java/org/torproject/metrics/hidserv/Aggregator.java b/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java similarity index 99% rename from src/main/java/org/torproject/metrics/hidserv/Aggregator.java rename to src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java index c492f4d..a57fde5 100644 --- a/src/main/java/org/torproject/metrics/hidserv/Aggregator.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Aggregator.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.hidserv; +package org.torproject.metrics.stats.hidserv; import java.io.BufferedWriter; import java.io.File; diff --git a/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java b/src/main/java/org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java similarity index 99% rename from src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java rename to src/main/java/org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java index 9f14cf7..48f3679 100644 --- a/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/ComputedNetworkFractions.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.hidserv; +package org.torproject.metrics.stats.hidserv; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java b/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java similarity index 98% rename from src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java rename to src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java index 278ef80..58a785e 100644 --- a/src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/DateTimeHelper.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.hidserv; +package org.torproject.metrics.stats.hidserv; import java.text.DateFormat; import java.text.ParseException; diff --git a/src/main/java/org/torproject/metrics/hidserv/Document.java b/src/main/java/org/torproject/metrics/stats/hidserv/Document.java similarity index 95% rename from src/main/java/org/torproject/metrics/hidserv/Document.java rename to src/main/java/org/torproject/metrics/stats/hidserv/Document.java index af1489a..7c915a1 100644 --- a/src/main/java/org/torproject/metrics/hidserv/Document.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Document.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.hidserv; +package org.torproject.metrics.stats.hidserv; /** Common interface of documents that are supposed to be serialized and * stored in document files and later retrieved and de-serialized. */ diff --git a/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java b/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java similarity index 99% rename from src/main/java/org/torproject/metrics/hidserv/DocumentStore.java rename to src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java index 488b89e..118071e 100644 --- a/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.hidserv; +package org.torproject.metrics.stats.hidserv; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java b/src/main/java/org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java similarity index 99% rename from src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java rename to src/main/java/org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java index 2d89d15..d4a741d 100644 --- a/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/ExtrapolatedHidServStats.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.hidserv; +package org.torproject.metrics.stats.hidserv; /** Extrapolated network totals of hidden-service statistics reported by a * single relay. Extrapolated values are based on reported statistics and diff --git a/src/main/java/org/torproject/metrics/hidserv/Extrapolator.java b/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java similarity index 99% rename from src/main/java/org/torproject/metrics/hidserv/Extrapolator.java rename to src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java index 2372bed..4bce0e6 100644 --- a/src/main/java/org/torproject/metrics/hidserv/Extrapolator.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Extrapolator.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.hidserv; +package org.torproject.metrics.stats.hidserv; import java.io.File; import java.util.HashSet; diff --git a/src/main/java/org/torproject/metrics/hidserv/Main.java b/src/main/java/org/torproject/metrics/stats/hidserv/Main.java similarity index 98% rename from src/main/java/org/torproject/metrics/hidserv/Main.java rename to src/main/java/org/torproject/metrics/stats/hidserv/Main.java index f133e7b..a23c17f 100644 --- a/src/main/java/org/torproject/metrics/hidserv/Main.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Main.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.hidserv; +package org.torproject.metrics.stats.hidserv; import java.io.File; diff --git a/src/main/java/org/torproject/metrics/hidserv/Parser.java b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java similarity index 99% rename from src/main/java/org/torproject/metrics/hidserv/Parser.java rename to src/main/java/org/torproject/metrics/stats/hidserv/Parser.java index 9d3f8dd..f2abc78 100644 --- a/src/main/java/org/torproject/metrics/hidserv/Parser.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Parser.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.hidserv; +package org.torproject.metrics.stats.hidserv; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorReader; diff --git a/src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java b/src/main/java/org/torproject/metrics/stats/hidserv/ReportedHidServStats.java similarity index 99% rename from src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java rename to src/main/java/org/torproject/metrics/stats/hidserv/ReportedHidServStats.java index 1bc2c6b..0ff5fd4 100644 --- a/src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/ReportedHidServStats.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.hidserv; +package org.torproject.metrics.stats.hidserv; /* Hidden-service statistics reported by a single relay covering a single * statistics interval of usually 24 hours. These statistics are reported diff --git a/src/main/java/org/torproject/metrics/hidserv/Simulate.java b/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java similarity index 99% rename from src/main/java/org/torproject/metrics/hidserv/Simulate.java rename to src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java index 1bb1167..a7bc1c3 100644 --- a/src/main/java/org/torproject/metrics/hidserv/Simulate.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/Simulate.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.hidserv; +package org.torproject.metrics.stats.hidserv; import java.io.BufferedWriter; import java.io.File; diff --git a/src/main/java/org/torproject/metrics/onionperf/Main.java b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java similarity index 99% rename from src/main/java/org/torproject/metrics/onionperf/Main.java rename to src/main/java/org/torproject/metrics/stats/onionperf/Main.java index f77b85d..76c2809 100644 --- a/src/main/java/org/torproject/metrics/onionperf/Main.java +++ b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java @@ -1,4 +1,4 @@ -package org.torproject.metrics.onionperf; +package org.torproject.metrics.stats.onionperf; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorReader; diff --git a/src/main/java/org/torproject/ernie/cron/Configuration.java b/src/main/java/org/torproject/metrics/stats/servers/Configuration.java similarity index 99% rename from src/main/java/org/torproject/ernie/cron/Configuration.java rename to src/main/java/org/torproject/metrics/stats/servers/Configuration.java index e223566..5be8d88 100644 --- a/src/main/java/org/torproject/ernie/cron/Configuration.java +++ b/src/main/java/org/torproject/metrics/stats/servers/Configuration.java @@ -1,7 +1,7 @@ /* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.ernie.cron; +package org.torproject.metrics.stats.servers; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java similarity index 99% rename from src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java rename to src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java index c47db13..8ccb3b5 100644 --- a/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java +++ b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java @@ -1,7 +1,7 @@ /* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.ernie.cron.network; +package org.torproject.metrics.stats.servers; import org.torproject.descriptor.BridgeNetworkStatus; import org.torproject.descriptor.Descriptor; diff --git a/src/main/java/org/torproject/ernie/cron/LockFile.java b/src/main/java/org/torproject/metrics/stats/servers/LockFile.java similarity index 97% rename from src/main/java/org/torproject/ernie/cron/LockFile.java rename to src/main/java/org/torproject/metrics/stats/servers/LockFile.java index d8ff985..c6c63bb 100644 --- a/src/main/java/org/torproject/ernie/cron/LockFile.java +++ b/src/main/java/org/torproject/metrics/stats/servers/LockFile.java @@ -1,7 +1,7 @@ /* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.ernie.cron; +package org.torproject.metrics.stats.servers; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/src/main/java/org/torproject/ernie/cron/LoggingConfiguration.java b/src/main/java/org/torproject/metrics/stats/servers/LoggingConfiguration.java similarity index 98% rename from src/main/java/org/torproject/ernie/cron/LoggingConfiguration.java rename to src/main/java/org/torproject/metrics/stats/servers/LoggingConfiguration.java index 9f49dff..f14241b 100644 --- a/src/main/java/org/torproject/ernie/cron/LoggingConfiguration.java +++ b/src/main/java/org/torproject/metrics/stats/servers/LoggingConfiguration.java @@ -1,7 +1,7 @@ /* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.ernie.cron; +package org.torproject.metrics.stats.servers; import java.io.IOException; import java.text.SimpleDateFormat; diff --git a/src/main/java/org/torproject/ernie/cron/Main.java b/src/main/java/org/torproject/metrics/stats/servers/Main.java similarity index 95% rename from src/main/java/org/torproject/ernie/cron/Main.java rename to src/main/java/org/torproject/metrics/stats/servers/Main.java index 4e272bc..5db867d 100644 --- a/src/main/java/org/torproject/ernie/cron/Main.java +++ b/src/main/java/org/torproject/metrics/stats/servers/Main.java @@ -1,9 +1,7 @@ /* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.ernie.cron; - -import org.torproject.ernie.cron.network.ConsensusStatsFileHandler; +package org.torproject.metrics.stats.servers; import java.io.File; import java.util.logging.Logger; diff --git a/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java b/src/main/java/org/torproject/metrics/stats/servers/RelayDescriptorDatabaseImporter.java similarity index 99% rename from src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java rename to src/main/java/org/torproject/metrics/stats/servers/RelayDescriptorDatabaseImporter.java index 99b931c..38afeec 100644 --- a/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/stats/servers/RelayDescriptorDatabaseImporter.java @@ -1,7 +1,7 @@ /* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.ernie.cron; +package org.torproject.metrics.stats.servers; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorReader; diff --git a/src/main/java/org/torproject/metrics/webstats/Main.java b/src/main/java/org/torproject/metrics/stats/webstats/Main.java similarity index 99% rename from src/main/java/org/torproject/metrics/webstats/Main.java rename to src/main/java/org/torproject/metrics/stats/webstats/Main.java index 18433d2..f70963f 100644 --- a/src/main/java/org/torproject/metrics/webstats/Main.java +++ b/src/main/java/org/torproject/metrics/stats/webstats/Main.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.webstats; +package org.torproject.metrics.stats.webstats; import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; import org.slf4j.Logger; diff --git a/src/main/java/org/torproject/metrics/web/graphs/BubblesServlet.java b/src/main/java/org/torproject/metrics/web/BubblesServlet.java similarity index 92% rename from src/main/java/org/torproject/metrics/web/graphs/BubblesServlet.java rename to src/main/java/org/torproject/metrics/web/BubblesServlet.java index 1cea611..8f83184 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/BubblesServlet.java +++ b/src/main/java/org/torproject/metrics/web/BubblesServlet.java @@ -1,10 +1,7 @@ /* Copyright 2013--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.web.graphs; - -import org.torproject.metrics.web.Category; -import org.torproject.metrics.web.MetricServlet; +package org.torproject.metrics.web; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/org/torproject/metrics/web/graphs/Countries.java b/src/main/java/org/torproject/metrics/web/Countries.java similarity index 99% rename from src/main/java/org/torproject/metrics/web/graphs/Countries.java rename to src/main/java/org/torproject/metrics/web/Countries.java index 8472bd7..a2d3cea 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/Countries.java +++ b/src/main/java/org/torproject/metrics/web/Countries.java @@ -1,7 +1,7 @@ /* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.web.graphs; +package org.torproject.metrics.web; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/torproject/metrics/web/graphs/GraphImageServlet.java b/src/main/java/org/torproject/metrics/web/GraphImageServlet.java similarity index 98% rename from src/main/java/org/torproject/metrics/web/graphs/GraphImageServlet.java rename to src/main/java/org/torproject/metrics/web/GraphImageServlet.java index 473c743..0644fa2 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/GraphImageServlet.java +++ b/src/main/java/org/torproject/metrics/web/GraphImageServlet.java @@ -1,7 +1,7 @@ /* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.web.graphs; +package org.torproject.metrics.web; import java.io.BufferedOutputStream; import java.io.IOException; diff --git a/src/main/java/org/torproject/metrics/web/graphs/GraphParameterChecker.java b/src/main/java/org/torproject/metrics/web/GraphParameterChecker.java similarity index 98% rename from src/main/java/org/torproject/metrics/web/graphs/GraphParameterChecker.java rename to src/main/java/org/torproject/metrics/web/GraphParameterChecker.java index ed4943b..2168ab5 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/GraphParameterChecker.java +++ b/src/main/java/org/torproject/metrics/web/GraphParameterChecker.java @@ -1,10 +1,7 @@ /* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.web.graphs; - -import org.torproject.metrics.web.ContentProvider; -import org.torproject.metrics.web.Metric; +package org.torproject.metrics.web; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/main/java/org/torproject/metrics/web/GraphServlet.java b/src/main/java/org/torproject/metrics/web/GraphServlet.java index e05e15d..31116b4 100644 --- a/src/main/java/org/torproject/metrics/web/GraphServlet.java +++ b/src/main/java/org/torproject/metrics/web/GraphServlet.java @@ -3,9 +3,6 @@ package org.torproject.metrics.web; -import org.torproject.metrics.web.graphs.Countries; -import org.torproject.metrics.web.graphs.GraphParameterChecker; - import java.io.IOException; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/src/main/java/org/torproject/metrics/web/News.java b/src/main/java/org/torproject/metrics/web/News.java index 53ca7b4..f21d4e3 100644 --- a/src/main/java/org/torproject/metrics/web/News.java +++ b/src/main/java/org/torproject/metrics/web/News.java @@ -3,8 +3,6 @@ package org.torproject.metrics.web; -import org.torproject.metrics.web.graphs.Countries; - import java.util.List; import java.util.SortedMap; import java.util.TreeMap; diff --git a/src/main/java/org/torproject/metrics/web/NewsServlet.java b/src/main/java/org/torproject/metrics/web/NewsServlet.java index 15717bd..131bd11 100644 --- a/src/main/java/org/torproject/metrics/web/NewsServlet.java +++ b/src/main/java/org/torproject/metrics/web/NewsServlet.java @@ -3,8 +3,6 @@ package org.torproject.metrics.web; -import org.torproject.metrics.web.graphs.Countries; - import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; diff --git a/src/main/java/org/torproject/metrics/web/graphs/RObject.java b/src/main/java/org/torproject/metrics/web/RObject.java similarity index 93% rename from src/main/java/org/torproject/metrics/web/graphs/RObject.java rename to src/main/java/org/torproject/metrics/web/RObject.java index 8f5c231..3e38dd0 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/RObject.java +++ b/src/main/java/org/torproject/metrics/web/RObject.java @@ -1,7 +1,7 @@ /* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.web.graphs; +package org.torproject.metrics.web; public class RObject { diff --git a/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java similarity index 98% rename from src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java rename to src/main/java/org/torproject/metrics/web/RObjectGenerator.java index 4ea8186..06177bf 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java +++ b/src/main/java/org/torproject/metrics/web/RObjectGenerator.java @@ -1,10 +1,7 @@ /* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.web.graphs; - -import org.torproject.metrics.web.ContentProvider; -import org.torproject.metrics.web.Metric; +package org.torproject.metrics.web; import org.rosuda.REngine.Rserve.RConnection; import org.rosuda.REngine.Rserve.RserveException; diff --git a/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java b/src/main/java/org/torproject/metrics/web/ResearchStatsServlet.java similarity index 98% rename from src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java rename to src/main/java/org/torproject/metrics/web/ResearchStatsServlet.java index c173000..415e5b5 100644 --- a/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java +++ b/src/main/java/org/torproject/metrics/web/ResearchStatsServlet.java @@ -1,7 +1,7 @@ /* Copyright 2013--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.web.research; +package org.torproject.metrics.web; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/src/main/java/org/torproject/metrics/web/graphs/TableParameterChecker.java b/src/main/java/org/torproject/metrics/web/TableParameterChecker.java similarity index 96% rename from src/main/java/org/torproject/metrics/web/graphs/TableParameterChecker.java rename to src/main/java/org/torproject/metrics/web/TableParameterChecker.java index 3a13439..02e9acb 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/TableParameterChecker.java +++ b/src/main/java/org/torproject/metrics/web/TableParameterChecker.java @@ -1,10 +1,7 @@ /* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.web.graphs; - -import org.torproject.metrics.web.ContentProvider; -import org.torproject.metrics.web.Metric; +package org.torproject.metrics.web; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/main/java/org/torproject/metrics/web/TableServlet.java b/src/main/java/org/torproject/metrics/web/TableServlet.java index e745da0..d37852f 100644 --- a/src/main/java/org/torproject/metrics/web/TableServlet.java +++ b/src/main/java/org/torproject/metrics/web/TableServlet.java @@ -3,9 +3,6 @@ package org.torproject.metrics.web; -import org.torproject.metrics.web.graphs.RObjectGenerator; -import org.torproject.metrics.web.graphs.TableParameterChecker; - import org.apache.commons.lang3.text.StrSubstitutor; import java.io.IOException; diff --git a/src/main/resources/web.xml b/src/main/resources/web.xml index 09ab129..e6e6a69 100644 --- a/src/main/resources/web.xml +++ b/src/main/resources/web.xml @@ -86,7 +86,7 @@ <servlet> <servlet-name>Bubbles</servlet-name> <servlet-class> - org.torproject.metrics.web.graphs.BubblesServlet + org.torproject.metrics.web.BubblesServlet </servlet-class> </servlet> <servlet-mapping> @@ -97,7 +97,7 @@ <servlet> <servlet-name>ResearchStats</servlet-name> <servlet-class> - org.torproject.metrics.web.research.ResearchStatsServlet + org.torproject.metrics.web.ResearchStatsServlet </servlet-class> <init-param> <param-name>statsDir</param-name> @@ -114,7 +114,7 @@ <servlet> <servlet-name>GraphImage</servlet-name> <servlet-class> - org.torproject.metrics.web.graphs.GraphImageServlet + org.torproject.metrics.web.GraphImageServlet </servlet-class> </servlet> <servlet-mapping> @@ -408,7 +408,7 @@ <listener> <listener-class> - org.torproject.metrics.web.graphs.RObjectGenerator + org.torproject.metrics.web.RObjectGenerator </listener-class> </listener> diff --git a/src/test/java/org/torproject/metrics/connbidirect/MainTest.java b/src/test/java/org/torproject/metrics/stats/connbidirect/MainTest.java similarity index 99% rename from src/test/java/org/torproject/metrics/connbidirect/MainTest.java rename to src/test/java/org/torproject/metrics/stats/connbidirect/MainTest.java index 0f387a6..255cccf 100644 --- a/src/test/java/org/torproject/metrics/connbidirect/MainTest.java +++ b/src/test/java/org/torproject/metrics/stats/connbidirect/MainTest.java @@ -1,7 +1,7 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.connbidirect; +package org.torproject.metrics.stats.connbidirect; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/src/test/java/org/torproject/metrics/webstats/MainTest.java b/src/test/java/org/torproject/metrics/stats/webstats/MainTest.java similarity index 98% rename from src/test/java/org/torproject/metrics/webstats/MainTest.java rename to src/test/java/org/torproject/metrics/stats/webstats/MainTest.java index 76268b1..a4e88d1 100644 --- a/src/test/java/org/torproject/metrics/webstats/MainTest.java +++ b/src/test/java/org/torproject/metrics/stats/webstats/MainTest.java @@ -1,7 +1,7 @@ /* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.webstats; +package org.torproject.metrics.stats.webstats; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse;
participants (1)
-
karsten＠torproject.org