9 files changed, 45 insertions, 45 deletions
diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp
index fffc0b24243..26545cc6493 100644
--- a/cpp/test/Ice/inheritance/AllTests.cpp
+++ b/cpp/test/Ice/inheritance/AllTests.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <TestCommon.h>
 #include <Test.h>
diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp
index f55b43e48e2..83b6e270da4 100644
--- a/cpp/test/Ice/inheritance/Client.cpp
+++ b/cpp/test/Ice/inheritance/Client.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <TestCommon.h>
 #include <Test.h>
diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp
index 27f8964a499..0631f6271bb 100644
--- a/cpp/test/Ice/inheritance/Collocated.cpp
+++ b/cpp/test/Ice/inheritance/Collocated.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <TestI.h>
 
diff --git a/cpp/test/Ice/inheritance/Makefile b/cpp/test/Ice/inheritance/Makefile
index f3502da1d93..fe3a1a85a09 100644
--- a/cpp/test/Ice/inheritance/Makefile
+++ b/cpp/test/Ice/inheritance/Makefile
@@ -1,17 +1,17 @@
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# 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/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp
index d2558b8bc67..d7f269e9534 100644
--- a/cpp/test/Ice/inheritance/Server.cpp
+++ b/cpp/test/Ice/inheritance/Server.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <TestI.h>
 
diff --git a/cpp/test/Ice/inheritance/Test.ice b/cpp/test/Ice/inheritance/Test.ice
index d9b093994bb..a5bcdd48d5c 100644
--- a/cpp/test/Ice/inheritance/Test.ice
+++ b/cpp/test/Ice/inheritance/Test.ice
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef TEST_ICE
 #define TEST_ICE
 
diff --git a/cpp/test/Ice/inheritance/TestI.cpp b/cpp/test/Ice/inheritance/TestI.cpp
index d6e71b32602..052395c55a8 100644
--- a/cpp/test/Ice/inheritance/TestI.cpp
+++ b/cpp/test/Ice/inheritance/TestI.cpp
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #include <Ice/Ice.h>
 #include <TestI.h>
 
diff --git a/cpp/test/Ice/inheritance/TestI.h b/cpp/test/Ice/inheritance/TestI.h
index 2f01f2031f6..4f36b2ec572 100644
--- a/cpp/test/Ice/inheritance/TestI.h
+++ b/cpp/test/Ice/inheritance/TestI.h
@@ -1,17 +1,17 @@
 // **********************************************************************
 //
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
 // ZeroC, Inc.
-// Billerica, MA, USA
+// North Palm Beach, FL, USA
 //
 // All Rights Reserved.
 //
-// Ice is free software; you can redistribute it and/or modify it under
-// the terms of the GNU General Public License version 2 as published by
-// the Free Software Foundation.
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 
+
 #ifndef TESTI_H
 #define TESTI_H
 
diff --git a/cpp/test/Ice/inheritance/run.py b/cpp/test/Ice/inheritance/run.py
index 5ee7c7a1798..7e5c3fdb887 100755
--- a/cpp/test/Ice/inheritance/run.py
+++ b/cpp/test/Ice/inheritance/run.py
@@ -1,18 +1,18 @@
 #!/usr/bin/env python
 # **********************************************************************
 #
-# Copyright (c) 2003
+# Copyright (c) 2003 - 2004
 # ZeroC, Inc.
-# Billerica, MA, USA
+# North Palm Beach, FL, USA
 #
 # All Rights Reserved.
 #
-# Ice is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License version 2 as published by
-# the Free Software Foundation.
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 
+
 import os, sys
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]: