[tor-commits] [metrics-lib/master] Rename properties in descriptor source factory.

[karsten at torproject.org]

commit 9e11172b932faf128f9d7e27dc547c131cb4cf95
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Fri May 20 11:31:53 2016 +0200

    Rename properties in descriptor source factory.
---
 CHANGELOG.md                                               | 4 +++-
 src/org/torproject/descriptor/DescriptorSourceFactory.java | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d2a246..ff233ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Changes in version ?.?.? - 2016-??-??
+# Changes in version 1.2.0 - 2016-05-??
 
  * Medium changes
    - Include the hostname in directory source entries of consensuses
@@ -8,6 +8,8 @@
      the corresponding values, rather than just the whole line.
    - In Torperf results, recognize all percentiles of expected bytes
      read for 0 <= x <= 100 rather than just x = { 10, 20, ..., 90 }.
+   - Rename properties for overriding default descriptor source
+     implementation classes.
 
  * Minor changes
    - Include a Torperf results line with more than one unrecognized
diff --git a/src/org/torproject/descriptor/DescriptorSourceFactory.java b/src/org/torproject/descriptor/DescriptorSourceFactory.java
index 8bab13e..728c3eb 100644
--- a/src/org/torproject/descriptor/DescriptorSourceFactory.java
+++ b/src/org/torproject/descriptor/DescriptorSourceFactory.java
@@ -16,10 +16,10 @@ public final class DescriptorSourceFactory {
       "org.torproject.descriptor.impl.DescriptorCollectorImpl";
 
   /* property names */
-  public final static String PARSER_PROPERTY = "onionoo.parser";
-  public final static String READER_PROPERTY = "onionoo.property";
-  public final static String LOADER_PROPERTY = "onionoo.downloader";
-  public final static String COLLECTOR_PROPERTY = "onionoo.collector";
+  public final static String PARSER_PROPERTY = "descriptor.parser";
+  public final static String READER_PROPERTY = "descriptor.reader";
+  public final static String LOADER_PROPERTY = "descriptor.downloader";
+  public final static String COLLECTOR_PROPERTY = "descriptor.collector";
 
   /**
    * Create a descriptor parser.