Remove or update outdated copyright notices

14 files changed, 51 insertions, 168 deletions

diff --git a/fastlib/src/vespa/fastlib/io/bufferedfile.h b/fastlib/src/vespa/fastlib/io/bufferedfile.h
index fcd297bc414..db96d0d6a42 100644
--- a/fastlib/src/vespa/fastlib/io/bufferedfile.h
+++ b/fastlib/src/vespa/fastlib/io/bufferedfile.h
@@ -1,14 +1,4 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-//************************************************************************
-/**
- * Class definitions for Fast_BufferedInputStream
- *
- */
-/*
- * Creation date    : 2001-05-22
- * Copyright (c)    : 1997-2002 Fast Search & Transfer ASA
- *                    ALL RIGHTS RESERVED
- *************************************************************************/
 
 #pragma once
 
diff --git a/fastlib/src/vespa/fastlib/io/bufferedoutputstream.cpp b/fastlib/src/vespa/fastlib/io/bufferedoutputstream.cpp
index fff52b5c363..432e7200e66 100644
--- a/fastlib/src/vespa/fastlib/io/bufferedoutputstream.cpp
+++ b/fastlib/src/vespa/fastlib/io/bufferedoutputstream.cpp
@@ -1,16 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
-*******************************************************************************
-*
-* @author Markus Bjartveit Krüger
-* @date            Creation date: 2001-10-30
-*
-* Generic buffered output stream
-*
-* Copyright (c)  : 2001 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
+/*
+ * Generic buffered output stream
+ *
+ * Author: Markus Bjartveit Krüger
+ */
 
 #include "bufferedoutputstream.h"
 #include <cstring>
diff --git a/fastlib/src/vespa/fastlib/io/fileinputstream.cpp b/fastlib/src/vespa/fastlib/io/fileinputstream.cpp
index c9a7cc753b5..ddb6f12d467 100644
--- a/fastlib/src/vespa/fastlib/io/fileinputstream.cpp
+++ b/fastlib/src/vespa/fastlib/io/fileinputstream.cpp
@@ -1,16 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
-*******************************************************************************
-*
-* @author Stein Hardy Danielsen
-* @date            Creation date: 2000-10-07
-*
-* FileInputStream class implementation
-*
-* Copyright (c)  : 1997-2000 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
+/*
+ * Author: Stein Hardy Danielsen
+ */
 
 #include "fileinputstream.h"
 
diff --git a/fastlib/src/vespa/fastlib/io/fileoutputstream.cpp b/fastlib/src/vespa/fastlib/io/fileoutputstream.cpp
index 649a1852ecf..df969434d60 100644
--- a/fastlib/src/vespa/fastlib/io/fileoutputstream.cpp
+++ b/fastlib/src/vespa/fastlib/io/fileoutputstream.cpp
@@ -1,16 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
-*******************************************************************************
-*
-* @author Stein Hardy Danielsen
-* @date            Creation date: 2000-10-07
-*
-* FileOutputStream class implementation
-*
-* Copyright (c)  : 1997-2000 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
+/*
+ * Author: Stein Hardy Danielsen
+ */
 
 #include "fileoutputstream.h"
 #include <vespa/fastos/file.h>
diff --git a/fastlib/src/vespa/fastlib/io/filterinputstream.h b/fastlib/src/vespa/fastlib/io/filterinputstream.h
index 55b705eba63..41fbda89bde 100644
--- a/fastlib/src/vespa/fastlib/io/filterinputstream.h
+++ b/fastlib/src/vespa/fastlib/io/filterinputstream.h
@@ -1,16 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
-*******************************************************************************
-*
-* @author Stein Hardy Danielsen
-* @date            Creation date: 2000-1-14
-*
-* Generic filter input stream
-*
-* Copyright (c)  : 1997-1999 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
+/*
+ * Generic filter input stream
+ *
+ * Author: Stein Hardy Danielsen
+ */
 #pragma once
 
 #include "inputstream.h"
diff --git a/fastlib/src/vespa/fastlib/io/outputstream.h b/fastlib/src/vespa/fastlib/io/outputstream.h
index 78eb93fac0f..a783d8786a7 100644
--- a/fastlib/src/vespa/fastlib/io/outputstream.h
+++ b/fastlib/src/vespa/fastlib/io/outputstream.h
@@ -1,16 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
-*******************************************************************************
-*
-* @author Stein Hardy Danielsen
-* @date            Creation date: 2000-1-14
-*
-* Generic output stream interface
-*
-* Copyright (c)  : 1997-1999 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
+/*
+ * Generic output stream interface
+ *
+ * Author Stein Hardy Danielsen
+ */
 #pragma once
 
 #include <cstdlib>
diff --git a/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.cpp b/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.cpp
index 123f34fdd4d..899a5a3ab83 100644
--- a/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.cpp
+++ b/fastlib/src/vespa/fastlib/net/httpchunkedinputstream.cpp
@@ -1,16 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
-*******************************************************************************
-*
-* @author Markus Bjartveit Krüger
-* @date            Creation date: 2001-11-21
-*
-* HTTP chunked input stream.
-*
-* Copyright (c)  : 2001 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
+/*
+ * HTTP chunked input stream.
+ *
+ * Author: Markus Bjartveit Krüger
+ */
 
 #include "httpchunkedinputstream.h"
 #include <cstring>
diff --git a/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.cpp b/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.cpp
index 673cbe4eca5..67bcee98bd6 100644
--- a/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.cpp
+++ b/fastlib/src/vespa/fastlib/net/httpchunkedoutputstream.cpp
@@ -1,16 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
-*******************************************************************************
-*
-* @author Markus Bjartveit Krüger
-* @date            Creation date: 2001-11-21
-*
-* HTTP chunked output stream.
-*
-* Copyright (c)  : 2001 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
+/*
+ * HTTP chunked output stream.
+ *
+ * Author: Markus Bjartveit Krüger
+ */
 
 #include "httpchunkedoutputstream.h"
 #include <cassert>
diff --git a/fastlib/src/vespa/fastlib/net/httpserver.h b/fastlib/src/vespa/fastlib/net/httpserver.h
index 9f320924e34..571a6108181 100644
--- a/fastlib/src/vespa/fastlib/net/httpserver.h
+++ b/fastlib/src/vespa/fastlib/net/httpserver.h
@@ -1,16 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
-*******************************************************************************
-*
-* @author Stein Hardy Danielsen
-* @date            Creation date: 2000-1-7
-*
-* Generic http server and connection classes
-*
-* Copyright (c)  : 1997-1999 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
+/*
+ * Generic http server and connection classes
+ *
+ * Author: Stein Hardy Danielsen
+ */
 
 
 #pragma once
@@ -30,19 +23,9 @@ class Fast_HTTPServer;
 #define FASTLIB_SUCCESS (0)
 #define FASTLIB_FAILURE (1)
 
-/**
-********************************************************************************
-*
-* Generic HTTP connection class
-* @author Stein Hardy Danielsen
-* @date            Creation date: 2000-1-7
-*
-* Generic HTTP connection class
-*
-* Copyright (c)  : 1997-1999 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
+/*
+ * Generic HTTP connection class
+ */
 
 // Error codes
 #define FASTLIB_HTTPSERVER_NEWTHREADFAILED (2)
@@ -135,18 +118,9 @@ public:
 
 
 
-/**
-********************************************************************************
-*
-* Generic HTTP server class
-*
-* @author Stein Hardy Danielsen
-* @date            Creation date: 2000-1-7
-*
-* Copyright (c)  : 1997-1999 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
+/*
+ * Generic HTTP server class
+ */
 class Fast_HTTPServer : public FastOS_Runnable
 {
 private:
diff --git a/fastlib/src/vespa/fastlib/net/url.cpp b/fastlib/src/vespa/fastlib/net/url.cpp
index 4f7fe74ab4e..39a49777225 100644
--- a/fastlib/src/vespa/fastlib/net/url.cpp
+++ b/fastlib/src/vespa/fastlib/net/url.cpp
@@ -1,15 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
- *
- * @file url.cpp
- * @author Michael Susæg
- * @date Creation date: 1999-11-23
- *
  * This file contains different URL string functions
  *
- * Copyright (c)        : 1997-2000 Fast Search & Transfer ASA.
- *                        ALL RIGHTS RESERVED
- *
+ * Author: Michael Susæg
  */
 
 
diff --git a/fastlib/src/vespa/fastlib/net/url.h b/fastlib/src/vespa/fastlib/net/url.h
index 4cc25f8b58d..2dd4827b0db 100644
--- a/fastlib/src/vespa/fastlib/net/url.h
+++ b/fastlib/src/vespa/fastlib/net/url.h
@@ -1,15 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
- *
- * @file url.h
- * @author Michael Susæg
- * @date Creation date:
- *
- * This file is the header file for the url class.
- *
- * Copyright (c)        : 1997-2000 Fast Search & Transfer ASA.
- *                        ALL RIGHTS RESERVED
- *
+/*
+ * Author: Michael Susæg
  */
 
 #pragma once
diff --git a/fastlib/src/vespa/fastlib/testsuite/suite.h b/fastlib/src/vespa/fastlib/testsuite/suite.h
index 94c629f5d2c..94e756387bf 100644
--- a/fastlib/src/vespa/fastlib/testsuite/suite.h
+++ b/fastlib/src/vespa/fastlib/testsuite/suite.h
@@ -1,13 +1,10 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**************************************************************************
- * @author Bård Kvalheim
+ * Author: Bård Kvalheim
  *
  * A test suite. Modified from the suite written by Chuck Allison.
  * http://www.cuj.com/archive/1809/feature.html
  *
- * @date Creation date: 2000-12-15
- * Copyright (c) : 1997-1999 Fast Search & Transfer ASA
- * ALL RIGHTS RESERVED
  * Licensed to Yahoo, and relicensed under the terms of the Apache 2.0 license
  *
  * The usage of suite is simple:
diff --git a/fastlib/src/vespa/fastlib/testsuite/test.h b/fastlib/src/vespa/fastlib/testsuite/test.h
index 7ee04984da0..ea17e64dba2 100644
--- a/fastlib/src/vespa/fastlib/testsuite/test.h
+++ b/fastlib/src/vespa/fastlib/testsuite/test.h
@@ -1,14 +1,10 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**************************************************************************
- * @author Bård Kvalheim
+ * Author: Bård Kvalheim
  *
  * The test class of the testsuite. Written by Chuck Allison.
  * http://www.cuj.com/archive/1809/feature.html
  *
- * @date Creation date: 2000-12-15
- * Copyright (c)    : 1997-2000 Fast Search & Transfer ASA
- *                    ALL RIGHTS RESERVED
- *
  * Apart for a trick the usage of the test class is very simple:
  *
  * mytest.h:
diff --git a/fastlib/src/vespa/fastlib/text/apps/extcase.cpp b/fastlib/src/vespa/fastlib/text/apps/extcase.cpp
index 5e5f3a04492..b713523af08 100644
--- a/fastlib/src/vespa/fastlib/text/apps/extcase.cpp
+++ b/fastlib/src/vespa/fastlib/text/apps/extcase.cpp
@@ -1,17 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
- * @author Tor Egge
- * @author Vidar Larsen
- *
+/*
  * Extract case information from Unicode property files.
- * This program read the UnicodeData-4.0.0.txt file and generates
+ * This program reads the UnicodeData-4.0.0.txt file and generates
  * the unicodeutil-lowercase.cpp file that gives a mapping from
  * unicode characters to their lowercase equivalents.
  *
- * Copyright (C) 2000 - 2003 Fast Search & Transfer ASA
- * Copyright (C) 2003 Overture Services Norway AS
- *
- *                ALL RIGHTS RESERVED
+ * Author: Tor Egge
+ * Author: Vidar Larsen
  */
 
 #include <vespa/fastlib/io/bufferedfile.h>