[tor-commits] [collector/master] Extended .gitignore, replaced ERNIE by CollecTor, and changed copyright year for the touched files.

[karsten at torproject.org]

commit 9b6c3054d9a2f4b184ea96fad2dcfa58a90bdb81
Author: iwakeh <iwakeh at torproject.org>
Date:   Thu Apr 28 20:17:27 2016 +0000

    Extended .gitignore, replaced ERNIE by CollecTor, and changed copyright year for the touched files.
---
 .gitignore                                                        | 2 ++
 .../torproject/collector/bridgedescs/SanitizedBridgesWriter.java  | 8 ++++----
 .../collector/bridgepools/BridgePoolAssignmentsProcessor.java     | 8 ++++----
 src/org/torproject/collector/exitlists/ExitListDownloader.java    | 8 ++++----
 src/org/torproject/collector/main/LoggingConfiguration.java       | 4 ++--
 src/org/torproject/collector/relaydescs/ArchiveWriter.java        | 8 ++++----
 src/org/torproject/collector/torperf/TorperfDownloader.java       | 8 ++++----
 7 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index f7d045e..ec941d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,6 @@ log/
 rsync/
 stats/
 tarballs/
+generated
+lib
 
diff --git a/src/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
index cf2a1d0..4aa13ea 100644
--- a/src/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
+++ b/src/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -1,4 +1,4 @@
-/* Copyright 2010--2012 The Tor Project
+/* Copyright 2010--2016 The Tor Project
  * See LICENSE for licensing information */
 package org.torproject.collector.bridgedescs;
 
@@ -54,7 +54,7 @@ public class SanitizedBridgesWriter extends Thread {
     new LoggingConfiguration("bridge-descriptors");
     Logger logger = Logger.getLogger(
         SanitizedBridgesWriter.class.getName());
-    logger.info("Starting bridge-descriptors module of ERNIE.");
+    logger.info("Starting bridge-descriptors module of CollecTor.");
 
     // Initialize configuration
     Configuration config = new Configuration();
@@ -62,7 +62,7 @@ public class SanitizedBridgesWriter extends Thread {
     // Use lock file to avoid overlapping runs
     LockFile lf = new LockFile("bridge-descriptors");
     if (!lf.acquireLock()) {
-      logger.severe("Warning: ERNIE is already running or has not exited "
+      logger.severe("Warning: CollecTor is already running or has not exited "
           + "cleanly! Exiting!");
       System.exit(1);
     }
@@ -73,7 +73,7 @@ public class SanitizedBridgesWriter extends Thread {
     // Remove lock file
     lf.releaseLock();
 
-    logger.info("Terminating bridge-descriptors module of ERNIE.");
+    logger.info("Terminating bridge-descriptors module of CollecTor.");
   }
 
   private Configuration config;
diff --git a/src/org/torproject/collector/bridgepools/BridgePoolAssignmentsProcessor.java b/src/org/torproject/collector/bridgepools/BridgePoolAssignmentsProcessor.java
index 33f28e2..b682316 100644
--- a/src/org/torproject/collector/bridgepools/BridgePoolAssignmentsProcessor.java
+++ b/src/org/torproject/collector/bridgepools/BridgePoolAssignmentsProcessor.java
@@ -1,4 +1,4 @@
-/* Copyright 2011--2012 The Tor Project
+/* Copyright 2011--2016 The Tor Project
  * See LICENSE for licensing information */
 package org.torproject.collector.bridgepools;
 
@@ -40,7 +40,7 @@ public class BridgePoolAssignmentsProcessor extends Thread {
     new LoggingConfiguration("bridge-pool-assignments");
     Logger logger = Logger.getLogger(
         BridgePoolAssignmentsProcessor.class.getName());
-    logger.info("Starting bridge-pool-assignments module of ERNIE.");
+    logger.info("Starting bridge-pool-assignments module of CollecTor.");
 
     // Initialize configuration
     Configuration config = new Configuration();
@@ -48,7 +48,7 @@ public class BridgePoolAssignmentsProcessor extends Thread {
     // Use lock file to avoid overlapping runs
     LockFile lf = new LockFile("bridge-pool-assignments");
     if (!lf.acquireLock()) {
-      logger.severe("Warning: ERNIE is already running or has not exited "
+      logger.severe("Warning: CollecTor is already running or has not exited "
           + "cleanly! Exiting!");
       System.exit(1);
     }
@@ -59,7 +59,7 @@ public class BridgePoolAssignmentsProcessor extends Thread {
     // Remove lock file
     lf.releaseLock();
 
-    logger.info("Terminating bridge-pool-assignments module of ERNIE.");
+    logger.info("Terminating bridge-pool-assignments module of CollecTor.");
   }
 
   private Configuration config;
diff --git a/src/org/torproject/collector/exitlists/ExitListDownloader.java b/src/org/torproject/collector/exitlists/ExitListDownloader.java
index 4f202d8..7e019b0 100644
--- a/src/org/torproject/collector/exitlists/ExitListDownloader.java
+++ b/src/org/torproject/collector/exitlists/ExitListDownloader.java
@@ -1,4 +1,4 @@
-/* Copyright 2010--2012 The Tor Project
+/* Copyright 2010--2016 The Tor Project
  * See LICENSE for licensing information */
 package org.torproject.collector.exitlists;
 
@@ -36,7 +36,7 @@ public class ExitListDownloader extends Thread {
     /* Initialize logging configuration. */
     new LoggingConfiguration("exit-lists");
     Logger logger = Logger.getLogger(ExitListDownloader.class.getName());
-    logger.info("Starting exit-lists module of ERNIE.");
+    logger.info("Starting exit-lists module of CollecTor.");
 
     // Initialize configuration
     Configuration config = new Configuration();
@@ -44,7 +44,7 @@ public class ExitListDownloader extends Thread {
     // Use lock file to avoid overlapping runs
     LockFile lf = new LockFile("exit-lists");
     if (!lf.acquireLock()) {
-      logger.severe("Warning: ERNIE is already running or has not exited "
+      logger.severe("Warning: CollecTor is already running or has not exited "
           + "cleanly! Exiting!");
       System.exit(1);
     }
@@ -55,7 +55,7 @@ public class ExitListDownloader extends Thread {
     // Remove lock file
     lf.releaseLock();
 
-    logger.info("Terminating exit-lists module of ERNIE.");
+    logger.info("Terminating exit-lists module of CollecTor.");
   }
 
   public ExitListDownloader(Configuration config) {
diff --git a/src/org/torproject/collector/main/LoggingConfiguration.java b/src/org/torproject/collector/main/LoggingConfiguration.java
index 4da527b..f3a620c 100644
--- a/src/org/torproject/collector/main/LoggingConfiguration.java
+++ b/src/org/torproject/collector/main/LoggingConfiguration.java
@@ -1,4 +1,4 @@
-/* Copyright 2010--2012 The Tor Project
+/* Copyright 2010--2016 The Tor Project
  * See LICENSE for licensing information */
 package org.torproject.collector.main;
 
@@ -18,7 +18,7 @@ import java.util.logging.Logger;
 /**
  * Initialize logging configuration.
  *
- * Log levels used by ERNIE:
+ * Log levels used by CollecTor:
  *
  * - SEVERE: An event made it impossible to continue program execution.
  * - WARNING: A potential problem occurred that requires the operator to
diff --git a/src/org/torproject/collector/relaydescs/ArchiveWriter.java b/src/org/torproject/collector/relaydescs/ArchiveWriter.java
index da83bd1..a4bddff 100644
--- a/src/org/torproject/collector/relaydescs/ArchiveWriter.java
+++ b/src/org/torproject/collector/relaydescs/ArchiveWriter.java
@@ -1,4 +1,4 @@
-/* Copyright 2010--2014 The Tor Project
+/* Copyright 2010--2016 The Tor Project
  * See LICENSE for licensing information */
 package org.torproject.collector.relaydescs;
 
@@ -41,7 +41,7 @@ public class ArchiveWriter extends Thread {
     /* Initialize logging configuration. */
     new LoggingConfiguration("relay-descriptors");
     Logger logger = Logger.getLogger(ArchiveWriter.class.getName());
-    logger.info("Starting relay-descriptors module of ERNIE.");
+    logger.info("Starting relay-descriptors module of CollecTor.");
 
     // Initialize configuration
     Configuration config = new Configuration();
@@ -49,7 +49,7 @@ public class ArchiveWriter extends Thread {
     // Use lock file to avoid overlapping runs
     LockFile lf = new LockFile("relay-descriptors");
     if (!lf.acquireLock()) {
-      logger.severe("Warning: ERNIE is already running or has not exited "
+      logger.severe("Warning: CollecTor is already running or has not exited "
           + "cleanly! Exiting!");
       System.exit(1);
     }
@@ -64,7 +64,7 @@ public class ArchiveWriter extends Thread {
     // Remove lock file
     lf.releaseLock();
 
-    logger.info("Terminating relay-descriptors module of ERNIE.");
+    logger.info("Terminating relay-descriptors module of CollecTor.");
   }
 
   private Configuration config;
diff --git a/src/org/torproject/collector/torperf/TorperfDownloader.java b/src/org/torproject/collector/torperf/TorperfDownloader.java
index 2b65552..a1483c2 100644
--- a/src/org/torproject/collector/torperf/TorperfDownloader.java
+++ b/src/org/torproject/collector/torperf/TorperfDownloader.java
@@ -1,4 +1,4 @@
-/* Copyright 2012 The Tor Project
+/* Copyright 2012-2016 The Tor Project
  * See LICENSE for licensing information */
 package org.torproject.collector.torperf;
 
@@ -36,7 +36,7 @@ public class TorperfDownloader extends Thread {
     /* Initialize logging configuration. */
     new LoggingConfiguration("torperf");
     Logger logger = Logger.getLogger(TorperfDownloader.class.getName());
-    logger.info("Starting torperf module of ERNIE.");
+    logger.info("Starting torperf module of CollecTor.");
 
     // Initialize configuration
     Configuration config = new Configuration();
@@ -44,7 +44,7 @@ public class TorperfDownloader extends Thread {
     // Use lock file to avoid overlapping runs
     LockFile lf = new LockFile("torperf");
     if (!lf.acquireLock()) {
-      logger.severe("Warning: ERNIE is already running or has not exited "
+      logger.severe("Warning: CollecTor is already running or has not exited "
           + "cleanly! Exiting!");
       System.exit(1);
     }
@@ -55,7 +55,7 @@ public class TorperfDownloader extends Thread {
     // Remove lock file
     lf.releaseLock();
 
-    logger.info("Terminating torperf module of ERNIE.");
+    logger.info("Terminating torperf module of CollecTor.");
   }
 
   private Configuration config;