commit 93a0d52e1d3c33e46258c4a052d4e8baf42b046f Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Thu Nov 16 09:41:22 2017 +0100 Rename root package to o.t.metrics.exonerator. Implements #24292. --- CHANGELOG.md | 8 ++++++++ build.xml | 6 +++--- .../{ => metrics}/exonerator/ExoneraTorDatabaseImporter.java | 2 +- .../torproject/{ => metrics}/exonerator/ExoneraTorServlet.java | 2 +- .../org/torproject/{ => metrics}/exonerator/QueryResponse.java | 2 +- .../org/torproject/{ => metrics}/exonerator/QueryServlet.java | 2 +- .../java/org/torproject/{ => metrics}/exonerator/ServerMain.java | 2 +- src/main/resources/test-web.xml | 4 ++-- src/main/resources/web.xml | 4 ++-- .../{ => metrics}/exonerator/ExoneraTorServletTest.java | 2 +- .../torproject/{ => metrics}/exonerator/QueryResponseTest.java | 2 +- 11 files changed, 22 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e21cf6..7f4cb50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Changes in version 2.0.1 - 2017-11-?? + + * Minor changes + - Rename root package org.torproject.exonerator to + org.torproject.metrics.exonerator to make it part of the Tor + Metrics name space. + + # Changes in version 2.0.0 - 2017-11-14 * Major changes diff --git a/build.xml b/build.xml index 62ad941..779e4a0 100644 --- a/build.xml +++ b/build.xml @@ -17,7 +17,7 @@ <property name="name" value="exonerator"/> <property name="project-main-class" - value="org.torproject.exonerator.ExoneraTorDatabaseImporter" /> + value="org.torproject.metrics.exonerator.ExoneraTorDatabaseImporter" /> <property name="additional2sign" value="${warfile}" /> <property name="tardepends" value="war" /> @@ -134,7 +134,7 @@ <attribute name="Implementation-Version" value="${release.version}-${git.revision}"/> <attribute name="Main-Class" - value="org.torproject.exonerator.ServerMain" /> + value="org.torproject.metrics.exonerator.ServerMain" /> </manifest> </war> </target> @@ -161,7 +161,7 @@ <attribute name="Implementation-Version" value="${release.version}-${git.revision}"/> <attribute name="Main-Class" - value="org.torproject.exonerator.ServerMain" /> + value="org.torproject.metrics.exonerator.ServerMain" /> </manifest> </jar> </target> diff --git a/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java similarity index 99% rename from src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java rename to src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java index 155506c..fade470 100644 --- a/src/main/java/org/torproject/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java @@ -1,7 +1,7 @@ /* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ -package org.torproject.exonerator; +package org.torproject.metrics.exonerator; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorCollector; diff --git a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java similarity index 99% rename from src/main/java/org/torproject/exonerator/ExoneraTorServlet.java rename to src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java index 0ac1d6e..bc52564 100644 --- a/src/main/java/org/torproject/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java @@ -1,7 +1,7 @@ /* Copyright 2011--2017 The Tor Project * See LICENSE for licensing information */ -package org.torproject.exonerator; +package org.torproject.metrics.exonerator; import org.apache.commons.lang3.StringEscapeUtils; diff --git a/src/main/java/org/torproject/exonerator/QueryResponse.java b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java similarity index 99% rename from src/main/java/org/torproject/exonerator/QueryResponse.java rename to src/main/java/org/torproject/metrics/exonerator/QueryResponse.java index 448676d..9646602 100644 --- a/src/main/java/org/torproject/exonerator/QueryResponse.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java @@ -1,7 +1,7 @@ /* Copyright 2017 The Tor Project * See LICENSE for licensing information */ -package org.torproject.exonerator; +package org.torproject.metrics.exonerator; import com.google.gson.Gson; import com.google.gson.annotations.Expose; diff --git a/src/main/java/org/torproject/exonerator/QueryServlet.java b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java similarity index 99% rename from src/main/java/org/torproject/exonerator/QueryServlet.java rename to src/main/java/org/torproject/metrics/exonerator/QueryServlet.java index 3005302..2e44ed7 100644 --- a/src/main/java/org/torproject/exonerator/QueryServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java @@ -1,7 +1,7 @@ /* Copyright 2017 The Tor Project * See LICENSE for licensing information */ -package org.torproject.exonerator; +package org.torproject.metrics.exonerator; import org.apache.commons.codec.binary.Hex; diff --git a/src/main/java/org/torproject/exonerator/ServerMain.java b/src/main/java/org/torproject/metrics/exonerator/ServerMain.java similarity index 95% rename from src/main/java/org/torproject/exonerator/ServerMain.java rename to src/main/java/org/torproject/metrics/exonerator/ServerMain.java index 704c7a5..ca8526f 100644 --- a/src/main/java/org/torproject/exonerator/ServerMain.java +++ b/src/main/java/org/torproject/metrics/exonerator/ServerMain.java @@ -1,7 +1,7 @@ /* Copyright 2017 The Tor Project * See LICENSE for licensing information */ -package org.torproject.exonerator; +package org.torproject.metrics.exonerator; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.resource.Resource; diff --git a/src/main/resources/test-web.xml b/src/main/resources/test-web.xml index 04107f1..e05248e 100644 --- a/src/main/resources/test-web.xml +++ b/src/main/resources/test-web.xml @@ -9,7 +9,7 @@ <servlet> <servlet-name>ExoneraTor</servlet-name> <servlet-class> - org.torproject.exonerator.ExoneraTorServlet + org.torproject.metrics.exonerator.ExoneraTorServlet </servlet-class> </servlet> <servlet-mapping> @@ -51,7 +51,7 @@ <servlet> <servlet-name>Query</servlet-name> <servlet-class> - org.torproject.exonerator.QueryServlet + org.torproject.metrics.exonerator.QueryServlet </servlet-class> </servlet> <servlet-mapping> diff --git a/src/main/resources/web.xml b/src/main/resources/web.xml index 78ededd..62bf96f 100644 --- a/src/main/resources/web.xml +++ b/src/main/resources/web.xml @@ -9,7 +9,7 @@ <servlet> <servlet-name>ExoneraTor</servlet-name> <servlet-class> - org.torproject.exonerator.ExoneraTorServlet + org.torproject.metrics.exonerator.ExoneraTorServlet </servlet-class> </servlet> <servlet-mapping> @@ -51,7 +51,7 @@ <servlet> <servlet-name>Query</servlet-name> <servlet-class> - org.torproject.exonerator.QueryServlet + org.torproject.metrics.exonerator.QueryServlet </servlet-class> </servlet> <servlet-mapping> diff --git a/src/test/java/org/torproject/exonerator/ExoneraTorServletTest.java b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java similarity index 97% rename from src/test/java/org/torproject/exonerator/ExoneraTorServletTest.java rename to src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java index 49d9470..16592c3 100644 --- a/src/test/java/org/torproject/exonerator/ExoneraTorServletTest.java +++ b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java @@ -1,7 +1,7 @@ /* Copyright 2017 The Tor Project * See LICENSE for licensing information */ -package org.torproject.exonerator; +package org.torproject.metrics.exonerator; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/org/torproject/exonerator/QueryResponseTest.java b/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java similarity index 99% rename from src/test/java/org/torproject/exonerator/QueryResponseTest.java rename to src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java index 634cdf5..b949de2 100644 --- a/src/test/java/org/torproject/exonerator/QueryResponseTest.java +++ b/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java @@ -1,7 +1,7 @@ /* Copyright 2017 The Tor Project * See LICENSE for licensing information */ -package org.torproject.exonerator; +package org.torproject.metrics.exonerator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull;