Copyright fixes

15 files changed, 42 insertions, 115 deletions

diff --git a/cpp/demo/Glacier/session/Makefile b/cpp/demo/Glacier/session/Makefile
index 059ce8c0a08..a358656b557 100644
--- a/cpp/demo/Glacier/session/Makefile
+++ b/cpp/demo/Glacier/session/Makefile
@@ -1,17 +1,12 @@
 # **********************************************************************
 #
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
-
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/fixCopyright.py b/cpp/fixCopyright.py
index a4dd6720d02..0b97143aa87 100755
--- a/cpp/fixCopyright.py
+++ b/cpp/fixCopyright.py
@@ -17,22 +17,14 @@ def usage():
 #
 def copyright(commentMark):
     result = [ ]
-    result.append(commentMark)
-    result.append(" **********************************************************************\n")
-    result.append(commentMark)
-    result.append("\n")
-    result.append(commentMark)
-    result.append(" Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.\n")
-    result.append(commentMark)
-    result.append("\n")
-    result.append(commentMark)
-    result.append(" This copy of Ice is licensed to you under the terms described in the\n")
-    result.append(commentMark)
-    result.append(" ICE_LICENSE file included in this distribution.\n")
-    result.append(commentMark)
-    result.append("\n")
-    result.append(commentMark)
-    result.append(" **********************************************************************\n")
+    result.append(commentMark + " **********************************************************************\n")
+    result.append(commentMark + "\n")
+    result.append(commentMark + " Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.\n")
+    result.append(commentMark + "\n")
+    result.append(commentMark + " This copy of Ice is licensed to you under the terms described in the\n")
+    result.append(commentMark + " ICE_LICENSE file included in this distribution.\n")
+    result.append(commentMark + "\n")
+    result.append(commentMark + " **********************************************************************\n")
     return result
 
 
@@ -48,6 +40,7 @@ def replaceCopyright(file, commentMark, commentBegin, commentEnd, newCopyrightLi
     copyrightFound = 0
 
     beforeCopyrightLines = []
+    oldCopyrightLines = []
     newLines = []
 
     justDone = 0
@@ -60,7 +53,8 @@ def replaceCopyright(file, commentMark, commentBegin, commentEnd, newCopyrightLi
                 commentFound = 1
                 if not copyrightFound and x.lower().find("copyright") != -1:
                     copyrightFound = 1
-                # skip this comment line                  
+                # skip this comment line 
+                oldCopyrightLines.append(x)            
             else:
                 if not done:
                     done = 1
@@ -79,7 +73,6 @@ def replaceCopyright(file, commentMark, commentBegin, commentEnd, newCopyrightLi
                     justDone = 0                    
                 else:
                     newLines.append(x)
-
     else:
          for x in oldLines:
             if not done:
@@ -113,7 +106,8 @@ def replaceCopyright(file, commentMark, commentBegin, commentEnd, newCopyrightLi
 
     oldFile.close()
 
-    if copyrightFound:
+    if copyrightFound and newCopyrightLines != oldCopyrightLines:
+
         origFile = file + ".orig"
         shutil.copy2(file, origFile)
 
@@ -133,6 +127,7 @@ def replaceCopyright(file, commentMark, commentBegin, commentEnd, newCopyrightLi
 
         newFile.writelines(newLines)
         newFile.close()        
+        print "------ Replaced copyright in " + file + " -------"
 
     return copyrightFound
 
@@ -191,9 +186,7 @@ def replaceAllCopyrights(path):
                 skip = 1
 
             if not skip:
-                if replaceCopyright(fullpath, commentMark, commentBegin, commentEnd, copyrightLines):
-                    print "Replaced copyright in " + fullpath
-                else:
+                if replaceCopyright(fullpath, commentMark, commentBegin, commentEnd, copyrightLines) == 0:
                     print "***** WARNING: Did not find copyright in " + fullpath                   
 
 #
diff --git a/cpp/src/Glacier/Makefile b/cpp/src/Glacier/Makefile
index 7f621304e96..cbca16159dd 100644
--- a/cpp/src/Glacier/Makefile
+++ b/cpp/src/Glacier/Makefile
@@ -1,17 +1,12 @@
 # **********************************************************************
 #
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
-
 top_srcdir	= ../..
 
 LIBFILENAME     = $(call mklibfilename,Glacier,$(VERSION))
diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile
index b7385aa21ba..933db49c224 100644
--- a/cpp/src/IcePack/Makefile
+++ b/cpp/src/IcePack/Makefile
@@ -1,17 +1,12 @@
 # **********************************************************************
 #
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
-
 top_srcdir	= ../..
 
 LIBFILENAME     = $(call mklibfilename,IcePack,$(VERSION))
diff --git a/cpp/src/IcePatch/Makefile b/cpp/src/IcePatch/Makefile
index a6c63e3d1e5..b34b7f1559e 100644
--- a/cpp/src/IcePatch/Makefile
+++ b/cpp/src/IcePatch/Makefile
@@ -1,17 +1,12 @@
 # **********************************************************************
 #
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
-
 top_srcdir	= ../..
 
 LIBFILENAME     = $(call mklibfilename,IcePatch,$(VERSION))
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index a503f0532b5..d933f820c9e 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -59,21 +59,16 @@ Slice::changeInclude(const string& orig, const vector<string>& includePaths)
 void
 Slice::printHeader(Output& out)
 {
-    static const char* header = 
+    static const char* header =
 "// **********************************************************************\n"
 "//\n"
-"// Copyright (c) 2003\n"
-"// ZeroC, Inc.\n"
-"// Billerica, MA, USA\n"
+"// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// All Rights Reserved.\n"
-"//\n"
-"// Ice is free software; you can redistribute it and/or modify it under\n"
-"// the terms of the GNU General Public License version 2 as published by\n"
-"// the Free Software Foundation.\n"
+"// This copy of Ice is licensed to you under the terms described in the\n"
+"// ICE_LICENSE file included in this distribution.\n"
 "//\n"
 "// **********************************************************************\n"
-	;
+        ;
 
     out << header;
     out << "\n// Ice version " << ICE_STRING_VERSION;
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 9daefd0b2c0..cc9b3072e70 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -1303,15 +1303,10 @@ Slice::JavaGenerator::printHeader()
     static const char* header =
 "// **********************************************************************\n"
 "//\n"
-"// Copyright (c) 2003\n"
-"// ZeroC, Inc.\n"
-"// Billerica, MA, USA\n"
+"// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// All Rights Reserved.\n"
-"//\n"
-"// Ice is free software; you can redistribute it and/or modify it under\n"
-"// the terms of the GNU General Public License version 2 as published by\n"
-"// the Free Software Foundation.\n"
+"// This copy of Ice is licensed to you under the terms described in the\n"
+"// ICE_LICENSE file included in this distribution.\n"
 "//\n"
 "// **********************************************************************\n"
         ;
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 4e18b7abc86..9767f577f1e 100755
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -609,15 +609,10 @@ Slice::Gen::printHeader()
     static const char* header =
 "// **********************************************************************\n"
 "//\n"
-"// Copyright (c) 2003\n"
-"// ZeroC, Inc.\n"
-"// Billerica, MA, USA\n"
+"// Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.\n"
 "//\n"
-"// All Rights Reserved.\n"
-"//\n"
-"// Ice is free software; you can redistribute it and/or modify it under\n"
-"// the terms of the GNU General Public License version 2 as published by\n"
-"// the Free Software Foundation.\n"
+"// This copy of Ice is licensed to you under the terms described in the\n"
+"// ICE_LICENSE file included in this distribution.\n"
 "//\n"
 "// **********************************************************************\n"
         ;
diff --git a/cpp/src/slice2docbook/Gen.cpp b/cpp/src/slice2docbook/Gen.cpp
index 14357189587..032f402b2e8 100644
--- a/cpp/src/slice2docbook/Gen.cpp
+++ b/cpp/src/slice2docbook/Gen.cpp
@@ -725,15 +725,14 @@ Slice::Gen::printHeader()
 {
     static const char* header =
 "<!--\n"
-"**********************************************************************\n"
-"Copyright (c) 2003\n"
-"ZeroC, Inc.\n"
-"Billerica, MA, USA\n"
+" **********************************************************************\n"
 "\n"
-"All Rights Reserved\n"
+" Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.\n"
 "\n"
-"Generated by the `slice2docbook' converter\n"
-"**********************************************************************\n"
+" This copy of Ice is licensed to you under the terms described in the\n"
+" ICE_LICENSE file included in this distribution.\n"
+"\n"
+" **********************************************************************\n"
 "-->";
     
     O.zeroIndent();
diff --git a/cpp/test/Glacier/starter/Makefile b/cpp/test/Glacier/starter/Makefile
index 38bb1809a25..e1b857ab170 100644
--- a/cpp/test/Glacier/starter/Makefile
+++ b/cpp/test/Glacier/starter/Makefile
@@ -1,17 +1,12 @@
 # **********************************************************************
 #
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
-
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
index 607373adf0f..5fae1783de2 100644
--- a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
@@ -1,17 +1,12 @@
 # **********************************************************************
 #
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
-
 top_srcdir	= ../../..
 
 CLIENT		= certificateAndKeyParsing
diff --git a/cpp/test/IceSSL/certificateVerification/Makefile b/cpp/test/IceSSL/certificateVerification/Makefile
index 69d1c84bbc7..f0a2ef645e1 100644
--- a/cpp/test/IceSSL/certificateVerification/Makefile
+++ b/cpp/test/IceSSL/certificateVerification/Makefile
@@ -1,17 +1,12 @@
 # **********************************************************************
 #
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
-
 top_srcdir	= ../../..
 
 CLIENT		= client
diff --git a/cpp/test/IceSSL/certificateVerifier/Makefile b/cpp/test/IceSSL/certificateVerifier/Makefile
index 0a82c9a76bc..0cf0d83295a 100644
--- a/cpp/test/IceSSL/certificateVerifier/Makefile
+++ b/cpp/test/IceSSL/certificateVerifier/Makefile
@@ -1,17 +1,12 @@
 # **********************************************************************
 #
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
-
 top_srcdir	= ../../..
 
 CLIENT		= certificateVerifier
diff --git a/cpp/test/IceSSL/configuration/Makefile b/cpp/test/IceSSL/configuration/Makefile
index 089ce882e46..a4c0125428d 100644
--- a/cpp/test/IceSSL/configuration/Makefile
+++ b/cpp/test/IceSSL/configuration/Makefile
@@ -1,17 +1,12 @@
 # **********************************************************************
 #
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
-
 top_srcdir	= ../../..
 
 CLIENT		= configuration
diff --git a/cpp/test/IceSSL/loadPEM/Makefile b/cpp/test/IceSSL/loadPEM/Makefile
index 5affda2367a..c82503046c6 100644
--- a/cpp/test/IceSSL/loadPEM/Makefile
+++ b/cpp/test/IceSSL/loadPEM/Makefile
@@ -1,17 +1,12 @@
 # **********************************************************************
 #
-# Copyright (c) 2003 - 2004
-# ZeroC, Inc.
-# North Palm Beach, FL, USA
-#
-# All Rights Reserved.
+# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
-
 top_srcdir	= ../../..
 
 CLIENT		= loadPEM