Filter on correct package prefix for Curator

21 files changed, 23 insertions, 23 deletions

diff --git a/vespalog/src/main/java/com/yahoo/log/InvalidLogFormatException.java b/vespalog/src/main/java/com/yahoo/log/InvalidLogFormatException.java
index ed09b6b0eaa..37d43b37952 100644
--- a/vespalog/src/main/java/com/yahoo/log/InvalidLogFormatException.java
+++ b/vespalog/src/main/java/com/yahoo/log/InvalidLogFormatException.java
@@ -5,7 +5,7 @@ package com.yahoo.log;
  * This (checked) exception is used to flag invalid log messages,
  * primarily for use in the factory methods of LogMessage.
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class InvalidLogFormatException extends Exception
 {
diff --git a/vespalog/src/main/java/com/yahoo/log/LogMessage.java b/vespalog/src/main/java/com/yahoo/log/LogMessage.java
index 608290026b6..1e2b9dfdab0 100644
--- a/vespalog/src/main/java/com/yahoo/log/LogMessage.java
+++ b/vespalog/src/main/java/com/yahoo/log/LogMessage.java
@@ -15,7 +15,7 @@ import com.yahoo.log.event.MalformedEventException;
  * chosen the name LogMessage to avoid confusion with LogRecord
  * which is used in java.util.logging.
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class LogMessage
 {
diff --git a/vespalog/src/main/java/com/yahoo/log/LogSetup.java b/vespalog/src/main/java/com/yahoo/log/LogSetup.java
index 50b0032d6b7..12b1411b17e 100644
--- a/vespalog/src/main/java/com/yahoo/log/LogSetup.java
+++ b/vespalog/src/main/java/com/yahoo/log/LogSetup.java
@@ -187,7 +187,7 @@ public class LogSetup {
         public boolean isLoggable(LogRecord record) {
             if (record.getLoggerName() == null) return true;
             if (!record.getLoggerName().startsWith("org.apache.zookeeper.") &&
-                    !record.getLoggerName().startsWith("com.netflix.curator")) {
+                    !record.getLoggerName().startsWith("org.apache.curator")) {
                 return true;
             }
             fileHandler.publish(record);
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Collection.java b/vespalog/src/main/java/com/yahoo/log/event/Collection.java
index 52d0cbe5ab5..efd70742e2f 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Collection.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Collection.java
@@ -3,7 +3,7 @@ package com.yahoo.log.event;
 
 /**
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class Collection extends Event {
     public Collection () {
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Count.java b/vespalog/src/main/java/com/yahoo/log/event/Count.java
index 4e422b3ec8c..175e8b9f69f 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Count.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Count.java
@@ -3,7 +3,7 @@ package com.yahoo.log.event;
 
 /**
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class Count extends Event {
     public Count () {
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Crash.java b/vespalog/src/main/java/com/yahoo/log/event/Crash.java
index 12de9879df7..7732938b809 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Crash.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Crash.java
@@ -3,7 +3,7 @@ package com.yahoo.log.event;
 
 /**
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class Crash extends Event {
     public Crash () {
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Event.java b/vespalog/src/main/java/com/yahoo/log/event/Event.java
index d3bd621c3ac..76fdf16c4ef 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Event.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Event.java
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
  * logging events, rather than making events him/herself and stuffing
  * them through the logging API.
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public abstract class Event implements Serializable {
     private static Logger log = Logger.getLogger(Event.class.getName());
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Progress.java b/vespalog/src/main/java/com/yahoo/log/event/Progress.java
index 398dd10a8e6..e16dbce7b2d 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Progress.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Progress.java
@@ -3,7 +3,7 @@ package com.yahoo.log.event;
 
 /**
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class Progress extends Event {
     public Progress () {
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Reloaded.java b/vespalog/src/main/java/com/yahoo/log/event/Reloaded.java
index cdd2bd8c261..8f976588446 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Reloaded.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Reloaded.java
@@ -3,7 +3,7 @@ package com.yahoo.log.event;
 
 /**
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class Reloaded extends Event {
     public Reloaded () {
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Reloading.java b/vespalog/src/main/java/com/yahoo/log/event/Reloading.java
index 60f0d0aa729..617e2881b0c 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Reloading.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Reloading.java
@@ -3,7 +3,7 @@ package com.yahoo.log.event;
 
 /**
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class Reloading extends Event {
     public Reloading () {
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Started.java b/vespalog/src/main/java/com/yahoo/log/event/Started.java
index 228dce3894b..4fa3853daaf 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Started.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Started.java
@@ -3,7 +3,7 @@ package com.yahoo.log.event;
 
 /**
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class Started extends Event {
     public Started () {
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Starting.java b/vespalog/src/main/java/com/yahoo/log/event/Starting.java
index f8c8f04b5f8..8c3dee28271 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Starting.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Starting.java
@@ -3,7 +3,7 @@ package com.yahoo.log.event;
 
 /**
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class Starting extends Event {
     public Starting () {
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Stopped.java b/vespalog/src/main/java/com/yahoo/log/event/Stopped.java
index 10e627ee85b..7964a956b28 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Stopped.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Stopped.java
@@ -3,7 +3,7 @@ package com.yahoo.log.event;
 
 /**
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class Stopped extends Event {
     public Stopped () {
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Stopping.java b/vespalog/src/main/java/com/yahoo/log/event/Stopping.java
index 3868db7016d..1bc2f91f4e9 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Stopping.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Stopping.java
@@ -3,7 +3,7 @@ package com.yahoo.log.event;
 
 /**
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class Stopping extends Event {
     public Stopping () {
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Unknown.java b/vespalog/src/main/java/com/yahoo/log/event/Unknown.java
index cf807f98fa7..e9fa1a2e530 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Unknown.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Unknown.java
@@ -3,7 +3,7 @@ package com.yahoo.log.event;
 
 /**
  *
- * @author <a href="mailto:borud@yahoo-inc.com">Bjorn Borud </a>
+ * @author Bjorn Borud
  */
 public class Unknown extends Event {
     public Unknown() {
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Value.java b/vespalog/src/main/java/com/yahoo/log/event/Value.java
index 8214a111426..f694627bb12 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Value.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Value.java
@@ -3,7 +3,7 @@ package com.yahoo.log.event;
 
 /**
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class Value extends Event {
     public Value () {
diff --git a/vespalog/src/test/java/com/yahoo/log/LogLevelTestCase.java b/vespalog/src/test/java/com/yahoo/log/LogLevelTestCase.java
index 1b1c75ca518..0a19b900b97 100644
--- a/vespalog/src/test/java/com/yahoo/log/LogLevelTestCase.java
+++ b/vespalog/src/test/java/com/yahoo/log/LogLevelTestCase.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.*;
 /**
  * Testcases for LogLevel
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class LogLevelTestCase {
 
diff --git a/vespalog/src/test/java/com/yahoo/log/LogSetupTestCase.java b/vespalog/src/test/java/com/yahoo/log/LogSetupTestCase.java
index bbb3e039562..70eb65b1463 100644
--- a/vespalog/src/test/java/com/yahoo/log/LogSetupTestCase.java
+++ b/vespalog/src/test/java/com/yahoo/log/LogSetupTestCase.java
@@ -18,7 +18,7 @@ import static org.hamcrest.CoreMatchers.is;
 /**
  * Make sure we can install the logging stuff properly.
  *
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author Bjorn Borud
  */
 public class LogSetupTestCase {
     // For testing zookeeper log records
@@ -45,7 +45,7 @@ public class LogSetupTestCase {
         zookeeperLogRecord.setMillis(1107011348029L);
 
         curatorLogRecord = new LogRecord(Level.WARNING, "curator log record");
-        curatorLogRecord.setLoggerName("com.netflix.curator.utils.DefaultTracerDriver");
+        curatorLogRecord.setLoggerName("org.apache.curator.utils.DefaultTracerDriver");
         curatorLogRecord.setMillis(1107011348029L);
 
         hostname = Util.getHostName();
@@ -63,7 +63,7 @@ public class LogSetupTestCase {
         zookeeperLogRecordError.setMillis(1107011348029L);
 
         curatorLogRecordError = new LogRecord(Level.SEVERE, "curator log record");
-        curatorLogRecordError.setLoggerName("com.netflix.curator.utils.DefaultTracerDriver");
+        curatorLogRecordError.setLoggerName("org.apache.curator.utils.DefaultTracerDriver");
         curatorLogRecordError.setMillis(1107011348029L);
 
         notzookeeperLogRecord = new LogRecord(Level.WARNING, "not zookeeper log record");
diff --git a/vespalog/src/test/java/com/yahoo/log/UtilTestCase.java b/vespalog/src/test/java/com/yahoo/log/UtilTestCase.java
index e7f93ea2611..760382b5c62 100644
--- a/vespalog/src/test/java/com/yahoo/log/UtilTestCase.java
+++ b/vespalog/src/test/java/com/yahoo/log/UtilTestCase.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 /**
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class UtilTestCase {
 
diff --git a/vespalog/src/test/java/com/yahoo/log/VespaFormatterTestCase.java b/vespalog/src/test/java/com/yahoo/log/VespaFormatterTestCase.java
index 7ceae03e9ab..5dac2e34786 100644
--- a/vespalog/src/test/java/com/yahoo/log/VespaFormatterTestCase.java
+++ b/vespalog/src/test/java/com/yahoo/log/VespaFormatterTestCase.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.is;
 
 /**
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class VespaFormatterTestCase {
 
diff --git a/vespalog/src/test/java/com/yahoo/log/VespaLogHandlerTestCase.java b/vespalog/src/test/java/com/yahoo/log/VespaLogHandlerTestCase.java
index 4518253561f..3e51d194a5e 100644
--- a/vespalog/src/test/java/com/yahoo/log/VespaLogHandlerTestCase.java
+++ b/vespalog/src/test/java/com/yahoo/log/VespaLogHandlerTestCase.java
@@ -18,7 +18,7 @@ import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.*;
 
 /**
- * @author  <a href="mailto:borud@yahoo-inc.com">Bjorn Borud</a>
+ * @author  Bjorn Borud
  */
 public class VespaLogHandlerTestCase {
     protected static String hostname;