commit 12080dc058b8f61ce2c95bf9d79aee1d50061494 Author: Karsten Loesing karsten.loesing@gmx.net Date: Tue Jan 9 10:21:45 2018 +0100
Update copyright to 2018. --- src/main/java/org/torproject/ernie/cron/Configuration.java | 2 +- src/main/java/org/torproject/ernie/cron/LockFile.java | 2 +- src/main/java/org/torproject/ernie/cron/LoggingConfiguration.java | 2 +- src/main/java/org/torproject/ernie/cron/Main.java | 2 +- .../java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java | 2 +- .../org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java | 2 +- src/main/java/org/torproject/metrics/advbwdist/Main.java | 2 +- src/main/java/org/torproject/metrics/clients/Main.java | 2 +- src/main/java/org/torproject/metrics/collectdescs/Main.java | 2 +- src/main/java/org/torproject/metrics/connbidirect/Main.java | 2 +- src/main/java/org/torproject/metrics/hidserv/Aggregator.java | 2 +- .../java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java | 2 +- src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java | 2 +- src/main/java/org/torproject/metrics/hidserv/Document.java | 2 +- src/main/java/org/torproject/metrics/hidserv/DocumentStore.java | 2 +- .../java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java | 2 +- src/main/java/org/torproject/metrics/hidserv/Extrapolator.java | 2 +- src/main/java/org/torproject/metrics/hidserv/Main.java | 2 +- src/main/java/org/torproject/metrics/hidserv/Parser.java | 2 +- src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java | 2 +- src/main/java/org/torproject/metrics/hidserv/Simulate.java | 2 +- .../java/org/torproject/metrics/stats/ipv6servers/Configuration.java | 2 +- src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java | 2 +- .../org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatus.java | 2 +- .../org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptor.java | 2 +- src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java | 2 +- src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java | 2 +- src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java | 2 +- src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java | 2 +- src/main/java/org/torproject/metrics/web/AboutServlet.java | 2 +- src/main/java/org/torproject/metrics/web/Category.java | 2 +- src/main/java/org/torproject/metrics/web/CollecTorServlet.java | 2 +- .../java/org/torproject/metrics/web/CollectorDirectoryProvider.java | 2 +- src/main/java/org/torproject/metrics/web/ContentProvider.java | 2 +- src/main/java/org/torproject/metrics/web/DataSourceServlet.java | 2 +- src/main/java/org/torproject/metrics/web/DevelopmentServlet.java | 2 +- src/main/java/org/torproject/metrics/web/DirectoryListing.java | 2 +- src/main/java/org/torproject/metrics/web/ErrorServlet.java | 2 +- src/main/java/org/torproject/metrics/web/GlossaryServlet.java | 2 +- src/main/java/org/torproject/metrics/web/GraphServlet.java | 2 +- src/main/java/org/torproject/metrics/web/IndexServlet.java | 2 +- src/main/java/org/torproject/metrics/web/LinkServlet.java | 2 +- src/main/java/org/torproject/metrics/web/Metric.java | 2 +- src/main/java/org/torproject/metrics/web/MetricServlet.java | 2 +- src/main/java/org/torproject/metrics/web/MetricsLibServlet.java | 2 +- src/main/java/org/torproject/metrics/web/News.java | 2 +- src/main/java/org/torproject/metrics/web/NewsServlet.java | 2 +- src/main/java/org/torproject/metrics/web/OnionooServlet.java | 2 +- src/main/java/org/torproject/metrics/web/OperationServlet.java | 2 +- src/main/java/org/torproject/metrics/web/ResearchServlet.java | 2 +- src/main/java/org/torproject/metrics/web/ServerMain.java | 2 +- src/main/java/org/torproject/metrics/web/ServicesServlet.java | 2 +- src/main/java/org/torproject/metrics/web/SourcesServlet.java | 2 +- src/main/java/org/torproject/metrics/web/StatsServlet.java | 2 +- src/main/java/org/torproject/metrics/web/TableServlet.java | 2 +- src/main/java/org/torproject/metrics/web/graphs/BubblesServlet.java | 2 +- src/main/java/org/torproject/metrics/web/graphs/Countries.java | 2 +- src/main/java/org/torproject/metrics/web/graphs/GraphImageServlet.java | 2 +- .../java/org/torproject/metrics/web/graphs/GraphParameterChecker.java | 2 +- src/main/java/org/torproject/metrics/web/graphs/RObject.java | 2 +- src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java | 2 +- .../java/org/torproject/metrics/web/graphs/TableParameterChecker.java | 2 +- .../java/org/torproject/metrics/web/research/ResearchStatsServlet.java | 2 +- src/main/java/org/torproject/metrics/webstats/Main.java | 2 +- src/main/resources/bootstrap-development.sh | 2 +- src/main/sql/clients/init-userstats.sql | 2 +- src/main/sql/ipv6servers/init-ipv6servers.sql | 2 +- src/main/sql/legacy/tordir.sql | 2 +- src/main/sql/onionperf/init-onionperf.sql | 2 +- src/main/sql/webstats/init-webstats.sql | 2 +- src/test/java/org/torproject/metrics/connbidirect/MainTest.java | 2 +- .../org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatusTest.java | 2 +- .../torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptorTest.java | 2 +- src/test/java/org/torproject/metrics/web/DirectoryListingTest.java | 2 +- src/test/java/org/torproject/metrics/webstats/MainTest.java | 2 +- src/test/sql/ipv6servers/test-ipv6servers.sql | 2 +- src/test/sql/userstats/test-userstats.sql | 2 +- 77 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/src/main/java/org/torproject/ernie/cron/Configuration.java b/src/main/java/org/torproject/ernie/cron/Configuration.java index 0c40293..e223566 100644 --- a/src/main/java/org/torproject/ernie/cron/Configuration.java +++ b/src/main/java/org/torproject/ernie/cron/Configuration.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2017 The Tor Project +/* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.ernie.cron; diff --git a/src/main/java/org/torproject/ernie/cron/LockFile.java b/src/main/java/org/torproject/ernie/cron/LockFile.java index 862e1d2..d8ff985 100644 --- a/src/main/java/org/torproject/ernie/cron/LockFile.java +++ b/src/main/java/org/torproject/ernie/cron/LockFile.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2017 The Tor Project +/* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.ernie.cron; diff --git a/src/main/java/org/torproject/ernie/cron/LoggingConfiguration.java b/src/main/java/org/torproject/ernie/cron/LoggingConfiguration.java index f6658c5..9f49dff 100644 --- a/src/main/java/org/torproject/ernie/cron/LoggingConfiguration.java +++ b/src/main/java/org/torproject/ernie/cron/LoggingConfiguration.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2017 The Tor Project +/* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.ernie.cron; diff --git a/src/main/java/org/torproject/ernie/cron/Main.java b/src/main/java/org/torproject/ernie/cron/Main.java index 8b97143..4e272bc 100644 --- a/src/main/java/org/torproject/ernie/cron/Main.java +++ b/src/main/java/org/torproject/ernie/cron/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2017 The Tor Project +/* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.ernie.cron; diff --git a/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java b/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java index 36f2102..99b931c 100644 --- a/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java +++ b/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2017 The Tor Project +/* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.ernie.cron; diff --git a/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java b/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java index c4b8770..c47db13 100644 --- a/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java +++ b/src/main/java/org/torproject/ernie/cron/network/ConsensusStatsFileHandler.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2017 The Tor Project +/* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.ernie.cron.network; diff --git a/src/main/java/org/torproject/metrics/advbwdist/Main.java b/src/main/java/org/torproject/metrics/advbwdist/Main.java index 8928be2..76c701f 100644 --- a/src/main/java/org/torproject/metrics/advbwdist/Main.java +++ b/src/main/java/org/torproject/metrics/advbwdist/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.advbwdist; diff --git a/src/main/java/org/torproject/metrics/clients/Main.java b/src/main/java/org/torproject/metrics/clients/Main.java index ea198ff..0ad3a49 100644 --- a/src/main/java/org/torproject/metrics/clients/Main.java +++ b/src/main/java/org/torproject/metrics/clients/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2017 The Tor Project +/* Copyright 2013--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.clients; diff --git a/src/main/java/org/torproject/metrics/collectdescs/Main.java b/src/main/java/org/torproject/metrics/collectdescs/Main.java index 499dff9..3ed0e71 100644 --- a/src/main/java/org/torproject/metrics/collectdescs/Main.java +++ b/src/main/java/org/torproject/metrics/collectdescs/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2017 The Tor Project +/* Copyright 2015--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.collectdescs; diff --git a/src/main/java/org/torproject/metrics/connbidirect/Main.java b/src/main/java/org/torproject/metrics/connbidirect/Main.java index 6e23ea7..fa24e6e 100644 --- a/src/main/java/org/torproject/metrics/connbidirect/Main.java +++ b/src/main/java/org/torproject/metrics/connbidirect/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2017 The Tor Project +/* Copyright 2015--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.connbidirect; diff --git a/src/main/java/org/torproject/metrics/hidserv/Aggregator.java b/src/main/java/org/torproject/metrics/hidserv/Aggregator.java index d7a1054..c492f4d 100644 --- a/src/main/java/org/torproject/metrics/hidserv/Aggregator.java +++ b/src/main/java/org/torproject/metrics/hidserv/Aggregator.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.hidserv; diff --git a/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java b/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java index 54c80c8..9f14cf7 100644 --- a/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java +++ b/src/main/java/org/torproject/metrics/hidserv/ComputedNetworkFractions.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.hidserv; diff --git a/src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java b/src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java index 5be6800..278ef80 100644 --- a/src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java +++ b/src/main/java/org/torproject/metrics/hidserv/DateTimeHelper.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.hidserv; diff --git a/src/main/java/org/torproject/metrics/hidserv/Document.java b/src/main/java/org/torproject/metrics/hidserv/Document.java index 46ce40d..af1489a 100644 --- a/src/main/java/org/torproject/metrics/hidserv/Document.java +++ b/src/main/java/org/torproject/metrics/hidserv/Document.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.hidserv; diff --git a/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java b/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java index 6dde889..488b89e 100644 --- a/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/hidserv/DocumentStore.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.hidserv; diff --git a/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java b/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java index 60f9ce0..2d89d15 100644 --- a/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java +++ b/src/main/java/org/torproject/metrics/hidserv/ExtrapolatedHidServStats.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.hidserv; diff --git a/src/main/java/org/torproject/metrics/hidserv/Extrapolator.java b/src/main/java/org/torproject/metrics/hidserv/Extrapolator.java index fdeafdf..2372bed 100644 --- a/src/main/java/org/torproject/metrics/hidserv/Extrapolator.java +++ b/src/main/java/org/torproject/metrics/hidserv/Extrapolator.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.hidserv; diff --git a/src/main/java/org/torproject/metrics/hidserv/Main.java b/src/main/java/org/torproject/metrics/hidserv/Main.java index f027f1e..f133e7b 100644 --- a/src/main/java/org/torproject/metrics/hidserv/Main.java +++ b/src/main/java/org/torproject/metrics/hidserv/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.hidserv; diff --git a/src/main/java/org/torproject/metrics/hidserv/Parser.java b/src/main/java/org/torproject/metrics/hidserv/Parser.java index b3f5361..9d3f8dd 100644 --- a/src/main/java/org/torproject/metrics/hidserv/Parser.java +++ b/src/main/java/org/torproject/metrics/hidserv/Parser.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.hidserv; diff --git a/src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java b/src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java index 66a81c4..1bc2c6b 100644 --- a/src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java +++ b/src/main/java/org/torproject/metrics/hidserv/ReportedHidServStats.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.hidserv; diff --git a/src/main/java/org/torproject/metrics/hidserv/Simulate.java b/src/main/java/org/torproject/metrics/hidserv/Simulate.java index 5419da9..1bb1167 100644 --- a/src/main/java/org/torproject/metrics/hidserv/Simulate.java +++ b/src/main/java/org/torproject/metrics/hidserv/Simulate.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.hidserv; diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Configuration.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Configuration.java index ccc1cc6..c940882 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Configuration.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Configuration.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.stats.ipv6servers; diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java index 1d5187b..67afa92 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Database.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.stats.ipv6servers; diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatus.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatus.java index 1600d47..611ca4e 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatus.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.stats.ipv6servers; diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptor.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptor.java index 3655d3e..cb725b0 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptor.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptor.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.stats.ipv6servers; diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java index 28c1d24..5a20b58 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.stats.ipv6servers; diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java index a6a1aa5..a5acfa0 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/OutputLine.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.stats.ipv6servers; diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java index 962ca27..9959b93 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Parser.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.stats.ipv6servers; diff --git a/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java b/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java index 388fb4d..9edb347 100644 --- a/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java +++ b/src/main/java/org/torproject/metrics/stats/ipv6servers/Writer.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.stats.ipv6servers; diff --git a/src/main/java/org/torproject/metrics/web/AboutServlet.java b/src/main/java/org/torproject/metrics/web/AboutServlet.java index 3906a43..30cb606 100644 --- a/src/main/java/org/torproject/metrics/web/AboutServlet.java +++ b/src/main/java/org/torproject/metrics/web/AboutServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2017 The Tor Project +/* Copyright 2014--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/Category.java b/src/main/java/org/torproject/metrics/web/Category.java index 7896e98..5b0185c 100644 --- a/src/main/java/org/torproject/metrics/web/Category.java +++ b/src/main/java/org/torproject/metrics/web/Category.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/CollecTorServlet.java b/src/main/java/org/torproject/metrics/web/CollecTorServlet.java index 2b0a13a..687afb8 100644 --- a/src/main/java/org/torproject/metrics/web/CollecTorServlet.java +++ b/src/main/java/org/torproject/metrics/web/CollecTorServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java index ca0e0af..ecf716c 100644 --- a/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java +++ b/src/main/java/org/torproject/metrics/web/CollectorDirectoryProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/ContentProvider.java b/src/main/java/org/torproject/metrics/web/ContentProvider.java index 4f3a5ad..4c2f9f9 100644 --- a/src/main/java/org/torproject/metrics/web/ContentProvider.java +++ b/src/main/java/org/torproject/metrics/web/ContentProvider.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/DataSourceServlet.java b/src/main/java/org/torproject/metrics/web/DataSourceServlet.java index eb86a1f..f5e83b4 100644 --- a/src/main/java/org/torproject/metrics/web/DataSourceServlet.java +++ b/src/main/java/org/torproject/metrics/web/DataSourceServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java b/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java index 61d8670..a330ab1 100644 --- a/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java +++ b/src/main/java/org/torproject/metrics/web/DevelopmentServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/DirectoryListing.java b/src/main/java/org/torproject/metrics/web/DirectoryListing.java index b83cedb..ceeb2fe 100644 --- a/src/main/java/org/torproject/metrics/web/DirectoryListing.java +++ b/src/main/java/org/torproject/metrics/web/DirectoryListing.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/ErrorServlet.java b/src/main/java/org/torproject/metrics/web/ErrorServlet.java index 338f0f1..f3d6974 100644 --- a/src/main/java/org/torproject/metrics/web/ErrorServlet.java +++ b/src/main/java/org/torproject/metrics/web/ErrorServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/GlossaryServlet.java b/src/main/java/org/torproject/metrics/web/GlossaryServlet.java index 694e814..30fd3c6 100644 --- a/src/main/java/org/torproject/metrics/web/GlossaryServlet.java +++ b/src/main/java/org/torproject/metrics/web/GlossaryServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2017 The Tor Project +/* Copyright 2014--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/GraphServlet.java b/src/main/java/org/torproject/metrics/web/GraphServlet.java index 7df5294..e05e15d 100644 --- a/src/main/java/org/torproject/metrics/web/GraphServlet.java +++ b/src/main/java/org/torproject/metrics/web/GraphServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/IndexServlet.java b/src/main/java/org/torproject/metrics/web/IndexServlet.java index 983315d..ed76081 100644 --- a/src/main/java/org/torproject/metrics/web/IndexServlet.java +++ b/src/main/java/org/torproject/metrics/web/IndexServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2017 The Tor Project +/* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/LinkServlet.java b/src/main/java/org/torproject/metrics/web/LinkServlet.java index 2319660..b2687f1 100644 --- a/src/main/java/org/torproject/metrics/web/LinkServlet.java +++ b/src/main/java/org/torproject/metrics/web/LinkServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/Metric.java b/src/main/java/org/torproject/metrics/web/Metric.java index 50f3978..a5604eb 100644 --- a/src/main/java/org/torproject/metrics/web/Metric.java +++ b/src/main/java/org/torproject/metrics/web/Metric.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/MetricServlet.java b/src/main/java/org/torproject/metrics/web/MetricServlet.java index 0b3bb11..f5b29dd 100644 --- a/src/main/java/org/torproject/metrics/web/MetricServlet.java +++ b/src/main/java/org/torproject/metrics/web/MetricServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/MetricsLibServlet.java b/src/main/java/org/torproject/metrics/web/MetricsLibServlet.java index d71ea7a..4f1915e 100644 --- a/src/main/java/org/torproject/metrics/web/MetricsLibServlet.java +++ b/src/main/java/org/torproject/metrics/web/MetricsLibServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/News.java b/src/main/java/org/torproject/metrics/web/News.java index 9afa598..eddb162 100644 --- a/src/main/java/org/torproject/metrics/web/News.java +++ b/src/main/java/org/torproject/metrics/web/News.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/NewsServlet.java b/src/main/java/org/torproject/metrics/web/NewsServlet.java index 227f949..7840a40 100644 --- a/src/main/java/org/torproject/metrics/web/NewsServlet.java +++ b/src/main/java/org/torproject/metrics/web/NewsServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/OnionooServlet.java b/src/main/java/org/torproject/metrics/web/OnionooServlet.java index 1133f10..848790e 100644 --- a/src/main/java/org/torproject/metrics/web/OnionooServlet.java +++ b/src/main/java/org/torproject/metrics/web/OnionooServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/OperationServlet.java b/src/main/java/org/torproject/metrics/web/OperationServlet.java index e41ceed..1e434f5 100644 --- a/src/main/java/org/torproject/metrics/web/OperationServlet.java +++ b/src/main/java/org/torproject/metrics/web/OperationServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/ResearchServlet.java b/src/main/java/org/torproject/metrics/web/ResearchServlet.java index ba5021f..fbfb70d 100644 --- a/src/main/java/org/torproject/metrics/web/ResearchServlet.java +++ b/src/main/java/org/torproject/metrics/web/ResearchServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/ServerMain.java b/src/main/java/org/torproject/metrics/web/ServerMain.java index 882ab80..d45090d 100644 --- a/src/main/java/org/torproject/metrics/web/ServerMain.java +++ b/src/main/java/org/torproject/metrics/web/ServerMain.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/ServicesServlet.java b/src/main/java/org/torproject/metrics/web/ServicesServlet.java index c96f22c..c9fa3ad 100644 --- a/src/main/java/org/torproject/metrics/web/ServicesServlet.java +++ b/src/main/java/org/torproject/metrics/web/ServicesServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/SourcesServlet.java b/src/main/java/org/torproject/metrics/web/SourcesServlet.java index 8ac6874..03dcfc5 100644 --- a/src/main/java/org/torproject/metrics/web/SourcesServlet.java +++ b/src/main/java/org/torproject/metrics/web/SourcesServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/StatsServlet.java b/src/main/java/org/torproject/metrics/web/StatsServlet.java index fe08494..ca04a5c 100644 --- a/src/main/java/org/torproject/metrics/web/StatsServlet.java +++ b/src/main/java/org/torproject/metrics/web/StatsServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/TableServlet.java b/src/main/java/org/torproject/metrics/web/TableServlet.java index 650921a..e745da0 100644 --- a/src/main/java/org/torproject/metrics/web/TableServlet.java +++ b/src/main/java/org/torproject/metrics/web/TableServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/main/java/org/torproject/metrics/web/graphs/BubblesServlet.java b/src/main/java/org/torproject/metrics/web/graphs/BubblesServlet.java index 0348924..1cea611 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/BubblesServlet.java +++ b/src/main/java/org/torproject/metrics/web/graphs/BubblesServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2017 The Tor Project +/* Copyright 2013--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web.graphs; diff --git a/src/main/java/org/torproject/metrics/web/graphs/Countries.java b/src/main/java/org/torproject/metrics/web/graphs/Countries.java index b153940..8472bd7 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/Countries.java +++ b/src/main/java/org/torproject/metrics/web/graphs/Countries.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2017 The Tor Project +/* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web.graphs; diff --git a/src/main/java/org/torproject/metrics/web/graphs/GraphImageServlet.java b/src/main/java/org/torproject/metrics/web/graphs/GraphImageServlet.java index f544b9f..473c743 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/GraphImageServlet.java +++ b/src/main/java/org/torproject/metrics/web/graphs/GraphImageServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2017 The Tor Project +/* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web.graphs; diff --git a/src/main/java/org/torproject/metrics/web/graphs/GraphParameterChecker.java b/src/main/java/org/torproject/metrics/web/graphs/GraphParameterChecker.java index e08a5bf..ed4943b 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/GraphParameterChecker.java +++ b/src/main/java/org/torproject/metrics/web/graphs/GraphParameterChecker.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2017 The Tor Project +/* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web.graphs; diff --git a/src/main/java/org/torproject/metrics/web/graphs/RObject.java b/src/main/java/org/torproject/metrics/web/graphs/RObject.java index c8ce10a..8f5c231 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/RObject.java +++ b/src/main/java/org/torproject/metrics/web/graphs/RObject.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2017 The Tor Project +/* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web.graphs; diff --git a/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java b/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java index c81d4dd..4ea8186 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java +++ b/src/main/java/org/torproject/metrics/web/graphs/RObjectGenerator.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2017 The Tor Project +/* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web.graphs; diff --git a/src/main/java/org/torproject/metrics/web/graphs/TableParameterChecker.java b/src/main/java/org/torproject/metrics/web/graphs/TableParameterChecker.java index eb13531..3a13439 100644 --- a/src/main/java/org/torproject/metrics/web/graphs/TableParameterChecker.java +++ b/src/main/java/org/torproject/metrics/web/graphs/TableParameterChecker.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2017 The Tor Project +/* Copyright 2011--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web.graphs; diff --git a/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java b/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java index ab4b954..c173000 100644 --- a/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java +++ b/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2017 The Tor Project +/* Copyright 2013--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web.research; diff --git a/src/main/java/org/torproject/metrics/webstats/Main.java b/src/main/java/org/torproject/metrics/webstats/Main.java index 1b4072a..18433d2 100644 --- a/src/main/java/org/torproject/metrics/webstats/Main.java +++ b/src/main/java/org/torproject/metrics/webstats/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.webstats; diff --git a/src/main/resources/bootstrap-development.sh b/src/main/resources/bootstrap-development.sh index 28fb975..d301e25 100755 --- a/src/main/resources/bootstrap-development.sh +++ b/src/main/resources/bootstrap-development.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016--2017 The Tor Project +# Copyright 2016--2018 The Tor Project # See LICENSE for licensing information # # Use for submodule initialization and checkout. diff --git a/src/main/sql/clients/init-userstats.sql b/src/main/sql/clients/init-userstats.sql index 25422a6..733a516 100644 --- a/src/main/sql/clients/init-userstats.sql +++ b/src/main/sql/clients/init-userstats.sql @@ -1,4 +1,4 @@ --- Copyright 2013--2017 The Tor Project +-- Copyright 2013--2018 The Tor Project -- See LICENSE for licensing information
-- Use enum types for dimensions that may only change if we write new code diff --git a/src/main/sql/ipv6servers/init-ipv6servers.sql b/src/main/sql/ipv6servers/init-ipv6servers.sql index 6a72167..a5d56f3 100644 --- a/src/main/sql/ipv6servers/init-ipv6servers.sql +++ b/src/main/sql/ipv6servers/init-ipv6servers.sql @@ -1,4 +1,4 @@ --- Copyright 2017 The Tor Project +-- Copyright 2017--2018 The Tor Project -- See LICENSE for licensing information
-- Table of all relevant parts contained in relay or bridge server descriptors. diff --git a/src/main/sql/legacy/tordir.sql b/src/main/sql/legacy/tordir.sql index 5a77c92..e0ea651 100644 --- a/src/main/sql/legacy/tordir.sql +++ b/src/main/sql/legacy/tordir.sql @@ -1,4 +1,4 @@ --- Copyright 2010, 2017 The Tor Project +-- Copyright 2010, 2018 The Tor Project -- See LICENSE for licensing information
CREATE LANGUAGE plpgsql; diff --git a/src/main/sql/onionperf/init-onionperf.sql b/src/main/sql/onionperf/init-onionperf.sql index 466c1d7..eddfe0f 100644 --- a/src/main/sql/onionperf/init-onionperf.sql +++ b/src/main/sql/onionperf/init-onionperf.sql @@ -1,4 +1,4 @@ --- Copyright 2017 The Tor Project +-- Copyright 2017--2018 The Tor Project -- See LICENSE for licensing information
CREATE TABLE IF NOT EXISTS measurements ( diff --git a/src/main/sql/webstats/init-webstats.sql b/src/main/sql/webstats/init-webstats.sql index 5c23176..e44205f 100644 --- a/src/main/sql/webstats/init-webstats.sql +++ b/src/main/sql/webstats/init-webstats.sql @@ -1,4 +1,4 @@ --- Copyright 2016--2017 The Tor Project +-- Copyright 2016--2018 The Tor Project -- See LICENSE for licensing information
CREATE TYPE method AS ENUM ('GET', 'HEAD'); diff --git a/src/test/java/org/torproject/metrics/connbidirect/MainTest.java b/src/test/java/org/torproject/metrics/connbidirect/MainTest.java index c35fe80..0f387a6 100644 --- a/src/test/java/org/torproject/metrics/connbidirect/MainTest.java +++ b/src/test/java/org/torproject/metrics/connbidirect/MainTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2017 The Tor Project +/* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.connbidirect; diff --git a/src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatusTest.java b/src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatusTest.java index 9069218..aaadcbf 100644 --- a/src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatusTest.java +++ b/src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6NetworkStatusTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.stats.ipv6servers; diff --git a/src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptorTest.java b/src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptorTest.java index 1842315..7b63c1e 100644 --- a/src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptorTest.java +++ b/src/test/java/org/torproject/metrics/stats/ipv6servers/Ipv6ServerDescriptorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.stats.ipv6servers; diff --git a/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java b/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java index 509785e..3bd354f 100644 --- a/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java +++ b/src/test/java/org/torproject/metrics/web/DirectoryListingTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.web; diff --git a/src/test/java/org/torproject/metrics/webstats/MainTest.java b/src/test/java/org/torproject/metrics/webstats/MainTest.java index 7b59c54..76268b1 100644 --- a/src/test/java/org/torproject/metrics/webstats/MainTest.java +++ b/src/test/java/org/torproject/metrics/webstats/MainTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017 The Tor Project +/* Copyright 2017--2018 The Tor Project * See LICENSE for licensing information */
package org.torproject.metrics.webstats; diff --git a/src/test/sql/ipv6servers/test-ipv6servers.sql b/src/test/sql/ipv6servers/test-ipv6servers.sql index 7e5ca2e..797cfd0 100644 --- a/src/test/sql/ipv6servers/test-ipv6servers.sql +++ b/src/test/sql/ipv6servers/test-ipv6servers.sql @@ -1,4 +1,4 @@ --- Copyright 2017 The Tor Project +-- Copyright 2017--2018 The Tor Project -- See LICENSE for licensing information
-- Hint: You'll need pgTAP in order to run these tests! diff --git a/src/test/sql/userstats/test-userstats.sql b/src/test/sql/userstats/test-userstats.sql index 299f4ab..405bf51 100644 --- a/src/test/sql/userstats/test-userstats.sql +++ b/src/test/sql/userstats/test-userstats.sql @@ -1,4 +1,4 @@ --- Copyright 2013--2017 The Tor Project +-- Copyright 2013--2018 The Tor Project -- See LICENSE for licensing information
-- Hint: You'll need pgTAP in order to run these tests!