summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/Freeze/Makefile10
-rw-r--r--cpp/test/Freeze/complex/Client.cpp10
-rw-r--r--cpp/test/Freeze/complex/Complex.ice10
-rw-r--r--cpp/test/Freeze/complex/Grammar.y10
-rw-r--r--cpp/test/Freeze/complex/Makefile10
-rw-r--r--cpp/test/Freeze/complex/NodeI.h10
-rw-r--r--cpp/test/Freeze/complex/Parser.cpp10
-rw-r--r--cpp/test/Freeze/complex/Parser.h10
-rw-r--r--cpp/test/Freeze/complex/Scanner.l10
-rwxr-xr-xcpp/test/Freeze/complex/run.py10
-rw-r--r--cpp/test/Freeze/dbmap/Client.cpp10
-rw-r--r--cpp/test/Freeze/dbmap/Makefile10
-rwxr-xr-xcpp/test/Freeze/dbmap/run.py10
-rw-r--r--cpp/test/Freeze/evictor/Client.cpp10
-rw-r--r--cpp/test/Freeze/evictor/Makefile10
-rw-r--r--cpp/test/Freeze/evictor/Server.cpp10
-rw-r--r--cpp/test/Freeze/evictor/Test.ice10
-rw-r--r--cpp/test/Freeze/evictor/TestI.cpp10
-rw-r--r--cpp/test/Freeze/evictor/TestI.h10
-rwxr-xr-xcpp/test/Freeze/evictor/run.py10
-rw-r--r--cpp/test/FreezeScript/Makefile10
-rw-r--r--cpp/test/FreezeScript/dbmap/Makefile10
-rw-r--r--cpp/test/FreezeScript/dbmap/makedb.cpp10
-rwxr-xr-xcpp/test/FreezeScript/dbmap/run.py10
-rw-r--r--cpp/test/FreezeScript/evictor/Makefile10
-rw-r--r--cpp/test/FreezeScript/evictor/makedb.cpp10
-rwxr-xr-xcpp/test/FreezeScript/evictor/run.py10
-rw-r--r--cpp/test/Glacier/Makefile10
-rw-r--r--cpp/test/Glacier/starter/Callback.ice10
-rw-r--r--cpp/test/Glacier/starter/CallbackI.cpp10
-rw-r--r--cpp/test/Glacier/starter/CallbackI.h10
-rw-r--r--cpp/test/Glacier/starter/Client.cpp10
-rw-r--r--cpp/test/Glacier/starter/Makefile10
-rw-r--r--cpp/test/Glacier/starter/Server.cpp10
-rwxr-xr-xcpp/test/Glacier/starter/run.py10
-rw-r--r--cpp/test/Ice/Makefile10
-rw-r--r--cpp/test/Ice/adapterDeactivation/AllTests.cpp10
-rw-r--r--cpp/test/Ice/adapterDeactivation/Client.cpp10
-rw-r--r--cpp/test/Ice/adapterDeactivation/Collocated.cpp10
-rw-r--r--cpp/test/Ice/adapterDeactivation/Makefile10
-rw-r--r--cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp10
-rw-r--r--cpp/test/Ice/adapterDeactivation/ServantLocatorI.h10
-rw-r--r--cpp/test/Ice/adapterDeactivation/Server.cpp10
-rw-r--r--cpp/test/Ice/adapterDeactivation/Test.ice10
-rw-r--r--cpp/test/Ice/adapterDeactivation/TestI.cpp10
-rw-r--r--cpp/test/Ice/adapterDeactivation/TestI.h10
-rwxr-xr-xcpp/test/Ice/adapterDeactivation/run.py10
-rw-r--r--cpp/test/Ice/exceptions/AllTests.cpp10
-rw-r--r--cpp/test/Ice/exceptions/Client.cpp10
-rw-r--r--cpp/test/Ice/exceptions/Collocated.cpp10
-rw-r--r--cpp/test/Ice/exceptions/Makefile10
-rw-r--r--cpp/test/Ice/exceptions/Server.cpp10
-rw-r--r--cpp/test/Ice/exceptions/ServerAMD.cpp10
-rw-r--r--cpp/test/Ice/exceptions/Test.ice10
-rw-r--r--cpp/test/Ice/exceptions/TestAMD.ice10
-rw-r--r--cpp/test/Ice/exceptions/TestAMDI.cpp10
-rw-r--r--cpp/test/Ice/exceptions/TestAMDI.h10
-rw-r--r--cpp/test/Ice/exceptions/TestI.cpp10
-rw-r--r--cpp/test/Ice/exceptions/TestI.h10
-rwxr-xr-xcpp/test/Ice/exceptions/run.py10
-rw-r--r--cpp/test/Ice/facets/AllTests.cpp10
-rw-r--r--cpp/test/Ice/facets/Client.cpp10
-rw-r--r--cpp/test/Ice/facets/Collocated.cpp10
-rw-r--r--cpp/test/Ice/facets/Makefile10
-rw-r--r--cpp/test/Ice/facets/Server.cpp10
-rw-r--r--cpp/test/Ice/facets/Test.ice10
-rw-r--r--cpp/test/Ice/facets/TestI.cpp10
-rw-r--r--cpp/test/Ice/facets/TestI.h10
-rwxr-xr-xcpp/test/Ice/facets/run.py10
-rw-r--r--cpp/test/Ice/faultTolerance/AllTests.cpp10
-rw-r--r--cpp/test/Ice/faultTolerance/Client.cpp10
-rw-r--r--cpp/test/Ice/faultTolerance/Makefile10
-rw-r--r--cpp/test/Ice/faultTolerance/Server.cpp10
-rw-r--r--cpp/test/Ice/faultTolerance/Test.ice10
-rw-r--r--cpp/test/Ice/faultTolerance/TestI.cpp10
-rw-r--r--cpp/test/Ice/faultTolerance/TestI.h10
-rwxr-xr-xcpp/test/Ice/faultTolerance/run.py10
-rw-r--r--cpp/test/Ice/gc/Client.cpp10
-rw-r--r--cpp/test/Ice/gc/Makefile10
-rw-r--r--cpp/test/Ice/gc/Test.ice10
-rwxr-xr-xcpp/test/Ice/gc/run.py10
-rw-r--r--cpp/test/Ice/inheritance/AllTests.cpp10
-rw-r--r--cpp/test/Ice/inheritance/Client.cpp10
-rw-r--r--cpp/test/Ice/inheritance/Collocated.cpp10
-rw-r--r--cpp/test/Ice/inheritance/Makefile10
-rw-r--r--cpp/test/Ice/inheritance/Server.cpp10
-rw-r--r--cpp/test/Ice/inheritance/Test.ice10
-rw-r--r--cpp/test/Ice/inheritance/TestI.cpp10
-rw-r--r--cpp/test/Ice/inheritance/TestI.h10
-rwxr-xr-xcpp/test/Ice/inheritance/run.py10
-rw-r--r--cpp/test/Ice/location/AllTests.cpp10
-rw-r--r--cpp/test/Ice/location/Client.cpp10
-rw-r--r--cpp/test/Ice/location/Collocated.cpp10
-rw-r--r--cpp/test/Ice/location/Makefile10
-rw-r--r--cpp/test/Ice/location/Server.cpp10
-rw-r--r--cpp/test/Ice/location/ServerLocator.cpp10
-rw-r--r--cpp/test/Ice/location/ServerLocator.h10
-rw-r--r--cpp/test/Ice/location/Test.ice10
-rw-r--r--cpp/test/Ice/location/TestI.cpp10
-rw-r--r--cpp/test/Ice/location/TestI.h10
-rwxr-xr-xcpp/test/Ice/location/run.py10
-rw-r--r--cpp/test/Ice/objects/AllTests.cpp10
-rw-r--r--cpp/test/Ice/objects/Client.cpp10
-rw-r--r--cpp/test/Ice/objects/Collocated.cpp10
-rw-r--r--cpp/test/Ice/objects/Makefile10
-rw-r--r--cpp/test/Ice/objects/Server.cpp10
-rw-r--r--cpp/test/Ice/objects/Test.ice10
-rw-r--r--cpp/test/Ice/objects/TestI.cpp10
-rw-r--r--cpp/test/Ice/objects/TestI.h10
-rwxr-xr-xcpp/test/Ice/objects/run.py10
-rw-r--r--cpp/test/Ice/operations/AllTests.cpp10
-rw-r--r--cpp/test/Ice/operations/Client.cpp10
-rw-r--r--cpp/test/Ice/operations/Collocated.cpp10
-rw-r--r--cpp/test/Ice/operations/Makefile10
-rw-r--r--cpp/test/Ice/operations/Server.cpp10
-rw-r--r--cpp/test/Ice/operations/ServerAMD.cpp10
-rw-r--r--cpp/test/Ice/operations/Test.ice10
-rw-r--r--cpp/test/Ice/operations/TestAMD.ice10
-rw-r--r--cpp/test/Ice/operations/TestAMDI.cpp10
-rw-r--r--cpp/test/Ice/operations/TestAMDI.h10
-rw-r--r--cpp/test/Ice/operations/TestI.cpp10
-rw-r--r--cpp/test/Ice/operations/TestI.h10
-rw-r--r--cpp/test/Ice/operations/Twoways.cpp10
-rw-r--r--cpp/test/Ice/operations/TwowaysAMI.cpp10
-rwxr-xr-xcpp/test/Ice/operations/run.py10
-rw-r--r--cpp/test/Ice/slicing/Makefile10
-rw-r--r--cpp/test/Ice/slicing/exceptions/AllTests.cpp10
-rw-r--r--cpp/test/Ice/slicing/exceptions/Client.cpp10
-rw-r--r--cpp/test/Ice/slicing/exceptions/Makefile10
-rw-r--r--cpp/test/Ice/slicing/exceptions/Server.cpp10
-rw-r--r--cpp/test/Ice/slicing/exceptions/ServerAMD.cpp10
-rw-r--r--cpp/test/Ice/slicing/exceptions/ServerPrivate.ice10
-rw-r--r--cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice10
-rw-r--r--cpp/test/Ice/slicing/exceptions/Test.ice10
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestAMD.ice10
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestAMDI.cpp10
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestAMDI.h10
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestI.cpp10
-rw-r--r--cpp/test/Ice/slicing/exceptions/TestI.h10
-rwxr-xr-xcpp/test/Ice/slicing/exceptions/run.py10
-rw-r--r--cpp/test/Ice/slicing/objects/AllTests.cpp10
-rw-r--r--cpp/test/Ice/slicing/objects/Client.cpp10
-rw-r--r--cpp/test/Ice/slicing/objects/ClientPrivate.ice10
-rw-r--r--cpp/test/Ice/slicing/objects/Forward.ice10
-rw-r--r--cpp/test/Ice/slicing/objects/Makefile10
-rw-r--r--cpp/test/Ice/slicing/objects/Server.cpp10
-rw-r--r--cpp/test/Ice/slicing/objects/ServerAMD.cpp10
-rw-r--r--cpp/test/Ice/slicing/objects/ServerPrivate.ice10
-rw-r--r--cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice10
-rw-r--r--cpp/test/Ice/slicing/objects/Test.ice10
-rw-r--r--cpp/test/Ice/slicing/objects/TestAMD.ice10
-rw-r--r--cpp/test/Ice/slicing/objects/TestAMDI.cpp10
-rw-r--r--cpp/test/Ice/slicing/objects/TestAMDI.h10
-rw-r--r--cpp/test/Ice/slicing/objects/TestI.cpp10
-rw-r--r--cpp/test/Ice/slicing/objects/TestI.h10
-rwxr-xr-xcpp/test/Ice/slicing/objects/run.py10
-rw-r--r--cpp/test/IcePack/Makefile10
-rw-r--r--cpp/test/IcePack/deployer/AllTests.cpp10
-rw-r--r--cpp/test/IcePack/deployer/Client.cpp10
-rw-r--r--cpp/test/IcePack/deployer/Makefile10
-rw-r--r--cpp/test/IcePack/deployer/Server.cpp10
-rw-r--r--cpp/test/IcePack/deployer/Service.cpp10
-rw-r--r--cpp/test/IcePack/deployer/Test.ice10
-rw-r--r--cpp/test/IcePack/deployer/TestI.cpp10
-rw-r--r--cpp/test/IcePack/deployer/TestI.h10
-rwxr-xr-xcpp/test/IcePack/deployer/run.py10
-rw-r--r--cpp/test/IcePack/simple/AllTests.cpp10
-rw-r--r--cpp/test/IcePack/simple/Client.cpp10
-rw-r--r--cpp/test/IcePack/simple/Makefile10
-rw-r--r--cpp/test/IcePack/simple/Server.cpp10
-rw-r--r--cpp/test/IcePack/simple/Test.ice10
-rw-r--r--cpp/test/IcePack/simple/TestI.cpp10
-rw-r--r--cpp/test/IcePack/simple/TestI.h10
-rwxr-xr-xcpp/test/IcePack/simple/run.py10
-rw-r--r--cpp/test/IceSSL/Makefile10
-rw-r--r--cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp10
-rw-r--r--cpp/test/IceSSL/certificateAndKeyParsing/Makefile10
-rwxr-xr-xcpp/test/IceSSL/certificateAndKeyParsing/run.py10
-rw-r--r--cpp/test/IceSSL/certificateVerification/Client.cpp10
-rw-r--r--cpp/test/IceSSL/certificateVerification/Makefile10
-rw-r--r--cpp/test/IceSSL/certificateVerification/Pinger.ice10
-rw-r--r--cpp/test/IceSSL/certificateVerification/Server.cpp10
-rwxr-xr-xcpp/test/IceSSL/certificateVerification/run.py10
-rw-r--r--cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp10
-rw-r--r--cpp/test/IceSSL/certificateVerifier/Makefile10
-rwxr-xr-xcpp/test/IceSSL/certificateVerifier/run.py10
-rw-r--r--cpp/test/IceSSL/configuration/Configuration.cpp10
-rw-r--r--cpp/test/IceSSL/configuration/Makefile10
-rwxr-xr-xcpp/test/IceSSL/configuration/run.py10
-rw-r--r--cpp/test/IceSSL/loadPEM/LoadPEM.cpp10
-rw-r--r--cpp/test/IceSSL/loadPEM/Makefile10
-rwxr-xr-xcpp/test/IceSSL/loadPEM/run.py10
-rw-r--r--cpp/test/IceStorm/Makefile10
-rw-r--r--cpp/test/IceStorm/federation/Event.ice10
-rw-r--r--cpp/test/IceStorm/federation/Makefile10
-rw-r--r--cpp/test/IceStorm/federation/Publisher.cpp10
-rw-r--r--cpp/test/IceStorm/federation/Subscriber.cpp10
-rwxr-xr-xcpp/test/IceStorm/federation/run.py10
-rwxr-xr-xcpp/test/IceStorm/federation2/run.py10
-rw-r--r--cpp/test/IceStorm/single/Makefile10
-rw-r--r--cpp/test/IceStorm/single/Publisher.cpp10
-rw-r--r--cpp/test/IceStorm/single/Single.ice10
-rw-r--r--cpp/test/IceStorm/single/Subscriber.cpp10
-rwxr-xr-xcpp/test/IceStorm/single/run.py10
-rw-r--r--cpp/test/IceUtil/Makefile10
-rw-r--r--cpp/test/IceUtil/ctrlCHandler/Client.cpp10
-rw-r--r--cpp/test/IceUtil/ctrlCHandler/Makefile10
-rw-r--r--cpp/test/IceUtil/inputUtil/Client.cpp10
-rw-r--r--cpp/test/IceUtil/inputUtil/Makefile10
-rwxr-xr-xcpp/test/IceUtil/inputUtil/run.py10
-rw-r--r--cpp/test/IceUtil/thread/AliveTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/AliveTest.h10
-rw-r--r--cpp/test/IceUtil/thread/Client.cpp10
-rw-r--r--cpp/test/IceUtil/thread/CountDownLatchTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/CountDownLatchTest.h10
-rw-r--r--cpp/test/IceUtil/thread/CreateTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/CreateTest.h10
-rw-r--r--cpp/test/IceUtil/thread/Makefile10
-rw-r--r--cpp/test/IceUtil/thread/MonitorMutexTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/MonitorMutexTest.h10
-rw-r--r--cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/MonitorRecMutexTest.h10
-rw-r--r--cpp/test/IceUtil/thread/MutexTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/MutexTest.h10
-rw-r--r--cpp/test/IceUtil/thread/RWRecMutexTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/RWRecMutexTest.h10
-rw-r--r--cpp/test/IceUtil/thread/RecMutexTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/RecMutexTest.h10
-rw-r--r--cpp/test/IceUtil/thread/StartTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/StartTest.h10
-rw-r--r--cpp/test/IceUtil/thread/StaticMutexTest.cpp10
-rw-r--r--cpp/test/IceUtil/thread/StaticMutexTest.h10
-rw-r--r--cpp/test/IceUtil/thread/TestBase.cpp10
-rw-r--r--cpp/test/IceUtil/thread/TestBase.h10
-rw-r--r--cpp/test/IceUtil/thread/TestSuite.cpp10
-rw-r--r--cpp/test/IceUtil/thread/TestSuite.h10
-rwxr-xr-xcpp/test/IceUtil/thread/run.py10
-rw-r--r--cpp/test/IceUtil/unicode/Client.cpp10
-rw-r--r--cpp/test/IceUtil/unicode/Makefile10
-rwxr-xr-xcpp/test/IceUtil/unicode/run.py10
-rw-r--r--cpp/test/IceUtil/uuid/Client.cpp10
-rw-r--r--cpp/test/IceUtil/uuid/Makefile10
-rwxr-xr-xcpp/test/IceUtil/uuid/run.py10
-rw-r--r--cpp/test/Makefile10
-rw-r--r--cpp/test/Slice/errorDetection/CaseInsensitive.ice10
-rw-r--r--cpp/test/Slice/errorDetection/CaseSensitive.ice10
-rw-r--r--cpp/test/Slice/errorDetection/ChangedMeaning.ice10
-rw-r--r--cpp/test/Slice/errorDetection/ClassRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/ConstDef.ice10
-rw-r--r--cpp/test/Slice/errorDetection/DataMemberRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/DeclaratorMissing.ice10
-rw-r--r--cpp/test/Slice/errorDetection/DerivedRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/DictionaryRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/DuplicateParameter.ice10
-rw-r--r--cpp/test/Slice/errorDetection/DuplicateThrows.ice10
-rw-r--r--cpp/test/Slice/errorDetection/EnumEmpty.ice10
-rw-r--r--cpp/test/Slice/errorDetection/EnumRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/IdentAsKeyword.ice10
-rw-r--r--cpp/test/Slice/errorDetection/IllegalDeclaration.ice10
-rw-r--r--cpp/test/Slice/errorDetection/IllegalDictionary.ice10
-rw-r--r--cpp/test/Slice/errorDetection/IllegalLocal.ice10
-rw-r--r--cpp/test/Slice/errorDetection/IllegalMI.ice10
-rw-r--r--cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice10
-rw-r--r--cpp/test/Slice/errorDetection/InterfaceMismatch.ice10
-rw-r--r--cpp/test/Slice/errorDetection/InterfaceRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/LocalMismatch.ice10
-rw-r--r--cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice10
-rw-r--r--cpp/test/Slice/errorDetection/NotClassOrInterface.ice10
-rw-r--r--cpp/test/Slice/errorDetection/NotException.ice10
-rw-r--r--cpp/test/Slice/errorDetection/NotType.ice10
-rw-r--r--cpp/test/Slice/errorDetection/OperationRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsClass.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsModule.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice10
-rw-r--r--cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice10
-rw-r--r--cpp/test/Slice/errorDetection/Reserved.ice10
-rw-r--r--cpp/test/Slice/errorDetection/SelfContainment.ice10
-rw-r--r--cpp/test/Slice/errorDetection/SequenceRedefinition.ice10
-rw-r--r--cpp/test/Slice/errorDetection/StructMembers.ice10
-rw-r--r--cpp/test/Slice/errorDetection/Undefined.ice10
-rw-r--r--cpp/test/Slice/errorDetection/WrongProxyType.ice10
-rw-r--r--cpp/test/Slice/errorDetection/include/IcePrefix.ice10
-rwxr-xr-xcpp/test/Slice/errorDetection/run.py10
-rw-r--r--cpp/test/include/TestCommon.h10
291 files changed, 1455 insertions, 1455 deletions
diff --git a/cpp/test/Freeze/Makefile b/cpp/test/Freeze/Makefile
index 7f1162b3841..81096ebe07f 100644
--- a/cpp/test/Freeze/Makefile
+++ b/cpp/test/Freeze/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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/Freeze/complex/Client.cpp b/cpp/test/Freeze/complex/Client.cpp
index 1d9942f26a9..c5d8c5e17bb 100644
--- a/cpp/test/Freeze/complex/Client.cpp
+++ b/cpp/test/Freeze/complex/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 <Freeze/Freeze.h>
#include <ComplexDict.h>
#include <TestCommon.h>
diff --git a/cpp/test/Freeze/complex/Complex.ice b/cpp/test/Freeze/complex/Complex.ice
index 171cf1d9372..859e89515a1 100644
--- a/cpp/test/Freeze/complex/Complex.ice
+++ b/cpp/test/Freeze/complex/Complex.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.
//
// **********************************************************************
+
module Complex
{
diff --git a/cpp/test/Freeze/complex/Grammar.y b/cpp/test/Freeze/complex/Grammar.y
index 9039a3fdc88..b867867ef6d 100644
--- a/cpp/test/Freeze/complex/Grammar.y
+++ b/cpp/test/Freeze/complex/Grammar.y
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// 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 <NodeI.h>
#include <Parser.h>
diff --git a/cpp/test/Freeze/complex/Makefile b/cpp/test/Freeze/complex/Makefile
index e7497af09c3..abe21644f51 100644
--- a/cpp/test/Freeze/complex/Makefile
+++ b/cpp/test/Freeze/complex/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/Freeze/complex/NodeI.h b/cpp/test/Freeze/complex/NodeI.h
index 583eec93e20..85aaccc7bcd 100644
--- a/cpp/test/Freeze/complex/NodeI.h
+++ b/cpp/test/Freeze/complex/NodeI.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 NODE_I_H
#define NODE_I_H
diff --git a/cpp/test/Freeze/complex/Parser.cpp b/cpp/test/Freeze/complex/Parser.cpp
index 3b54ba7cbe1..73717c203b0 100644
--- a/cpp/test/Freeze/complex/Parser.cpp
+++ b/cpp/test/Freeze/complex/Parser.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 <Parser.h>
using namespace std;
diff --git a/cpp/test/Freeze/complex/Parser.h b/cpp/test/Freeze/complex/Parser.h
index 569f89a5513..24468b84831 100644
--- a/cpp/test/Freeze/complex/Parser.h
+++ b/cpp/test/Freeze/complex/Parser.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 PARSER_H
#define PARSER_H
diff --git a/cpp/test/Freeze/complex/Scanner.l b/cpp/test/Freeze/complex/Scanner.l
index d5ceadea166..fbc29ed7a83 100644
--- a/cpp/test/Freeze/complex/Scanner.l
+++ b/cpp/test/Freeze/complex/Scanner.l
@@ -2,18 +2,18 @@
// **********************************************************************
//
-// 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 <Parser.h>
#include <Grammar.h>
diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py
index d5689ed59c1..1a04fbfa95f 100755
--- a/cpp/test/Freeze/complex/run.py
+++ b/cpp/test/Freeze/complex/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Freeze/dbmap/Client.cpp b/cpp/test/Freeze/dbmap/Client.cpp
index 7c24ed7abcb..b4a2f9917a7 100644
--- a/cpp/test/Freeze/dbmap/Client.cpp
+++ b/cpp/test/Freeze/dbmap/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 <IceUtil/IceUtil.h>
#include <Freeze/Freeze.h>
#include <TestCommon.h>
diff --git a/cpp/test/Freeze/dbmap/Makefile b/cpp/test/Freeze/dbmap/Makefile
index 7d4f4e1127e..06978ff021e 100644
--- a/cpp/test/Freeze/dbmap/Makefile
+++ b/cpp/test/Freeze/dbmap/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/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py
index fdfd3b8ffc9..acef03da659 100755
--- a/cpp/test/Freeze/dbmap/run.py
+++ b/cpp/test/Freeze/dbmap/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Freeze/evictor/Client.cpp b/cpp/test/Freeze/evictor/Client.cpp
index 9c04e9556a5..0a60b3ae6ee 100644
--- a/cpp/test/Freeze/evictor/Client.cpp
+++ b/cpp/test/Freeze/evictor/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 <IceUtil/Thread.h>
#include <IceUtil/Time.h>
diff --git a/cpp/test/Freeze/evictor/Makefile b/cpp/test/Freeze/evictor/Makefile
index df37bfe509a..4a417b141aa 100644
--- a/cpp/test/Freeze/evictor/Makefile
+++ b/cpp/test/Freeze/evictor/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/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp
index 60f5a2d6e88..8188f5cfdd0 100644
--- a/cpp/test/Freeze/evictor/Server.cpp
+++ b/cpp/test/Freeze/evictor/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 <IceUtil/IceUtil.h>
#include <TestI.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Freeze/evictor/Test.ice b/cpp/test/Freeze/evictor/Test.ice
index cdbe982f481..728d0a4bf19 100644
--- a/cpp/test/Freeze/evictor/Test.ice
+++ b/cpp/test/Freeze/evictor/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/Freeze/evictor/TestI.cpp b/cpp/test/Freeze/evictor/TestI.cpp
index 7e0c8b506c0..8676ffb9398 100644
--- a/cpp/test/Freeze/evictor/TestI.cpp
+++ b/cpp/test/Freeze/evictor/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 <IceUtil/IceUtil.h>
#include <Freeze/Freeze.h>
#include <TestI.h>
diff --git a/cpp/test/Freeze/evictor/TestI.h b/cpp/test/Freeze/evictor/TestI.h
index 4ca6333248a..12e0bc75c77 100644
--- a/cpp/test/Freeze/evictor/TestI.h
+++ b/cpp/test/Freeze/evictor/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 TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Freeze/evictor/run.py b/cpp/test/Freeze/evictor/run.py
index 7d96ff8e315..4f55468b362 100755
--- a/cpp/test/Freeze/evictor/run.py
+++ b/cpp/test/Freeze/evictor/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/FreezeScript/Makefile b/cpp/test/FreezeScript/Makefile
index 32b78528e76..425c5f2f5ed 100644
--- a/cpp/test/FreezeScript/Makefile
+++ b/cpp/test/FreezeScript/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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/FreezeScript/dbmap/Makefile b/cpp/test/FreezeScript/dbmap/Makefile
index 3cf269794de..03143bff480 100644
--- a/cpp/test/FreezeScript/dbmap/Makefile
+++ b/cpp/test/FreezeScript/dbmap/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 = makedb
diff --git a/cpp/test/FreezeScript/dbmap/makedb.cpp b/cpp/test/FreezeScript/dbmap/makedb.cpp
index feba07a89a4..c5a17846942 100644
--- a/cpp/test/FreezeScript/dbmap/makedb.cpp
+++ b/cpp/test/FreezeScript/dbmap/makedb.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 <IceUtil/IceUtil.h>
#include <Freeze/Freeze.h>
#include <IntSMap.h>
diff --git a/cpp/test/FreezeScript/dbmap/run.py b/cpp/test/FreezeScript/dbmap/run.py
index 8a907ba609e..2e19c15c2ea 100755
--- a/cpp/test/FreezeScript/dbmap/run.py
+++ b/cpp/test/FreezeScript/dbmap/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, re, shutil
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/FreezeScript/evictor/Makefile b/cpp/test/FreezeScript/evictor/Makefile
index ba1746fd4e9..aaee7bab525 100644
--- a/cpp/test/FreezeScript/evictor/Makefile
+++ b/cpp/test/FreezeScript/evictor/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 = makedb
diff --git a/cpp/test/FreezeScript/evictor/makedb.cpp b/cpp/test/FreezeScript/evictor/makedb.cpp
index 5543b7ef657..664e266958d 100644
--- a/cpp/test/FreezeScript/evictor/makedb.cpp
+++ b/cpp/test/FreezeScript/evictor/makedb.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 <Freeze/Freeze.h>
#include <IceUtil/AbstractMutex.h>
#include <TestOld.h>
diff --git a/cpp/test/FreezeScript/evictor/run.py b/cpp/test/FreezeScript/evictor/run.py
index 9a9545687bf..a67668b83d7 100755
--- a/cpp/test/FreezeScript/evictor/run.py
+++ b/cpp/test/FreezeScript/evictor/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, re, shutil
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Glacier/Makefile b/cpp/test/Glacier/Makefile
index f63bdd75945..bc5f886511c 100644
--- a/cpp/test/Glacier/Makefile
+++ b/cpp/test/Glacier/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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/Glacier/starter/Callback.ice b/cpp/test/Glacier/starter/Callback.ice
index fd71399aee6..5df246bbb52 100644
--- a/cpp/test/Glacier/starter/Callback.ice
+++ b/cpp/test/Glacier/starter/Callback.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 CALLBACK_ICE
#define CALLBACK_ICE
diff --git a/cpp/test/Glacier/starter/CallbackI.cpp b/cpp/test/Glacier/starter/CallbackI.cpp
index f3669f98947..3942120033c 100644
--- a/cpp/test/Glacier/starter/CallbackI.cpp
+++ b/cpp/test/Glacier/starter/CallbackI.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 <CallbackI.h>
diff --git a/cpp/test/Glacier/starter/CallbackI.h b/cpp/test/Glacier/starter/CallbackI.h
index 743b9219eec..a8c37504bb1 100644
--- a/cpp/test/Glacier/starter/CallbackI.h
+++ b/cpp/test/Glacier/starter/CallbackI.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 CALLBACK_I_H
#define CALLBACK_I_H
diff --git a/cpp/test/Glacier/starter/Client.cpp b/cpp/test/Glacier/starter/Client.cpp
index 427b8f6e57b..98a03c5bd3f 100644
--- a/cpp/test/Glacier/starter/Client.cpp
+++ b/cpp/test/Glacier/starter/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/Application.h>
#include <Glacier/Glacier.h>
#include <TestCommon.h>
diff --git a/cpp/test/Glacier/starter/Makefile b/cpp/test/Glacier/starter/Makefile
index 25f1609241f..556a13ea46f 100644
--- a/cpp/test/Glacier/starter/Makefile
+++ b/cpp/test/Glacier/starter/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/Glacier/starter/Server.cpp b/cpp/test/Glacier/starter/Server.cpp
index 54f55889fb6..c6ea155677e 100644
--- a/cpp/test/Glacier/starter/Server.cpp
+++ b/cpp/test/Glacier/starter/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/Application.h>
#include <CallbackI.h>
diff --git a/cpp/test/Glacier/starter/run.py b/cpp/test/Glacier/starter/run.py
index a2659e77149..18581f6e93a 100755
--- a/cpp/test/Glacier/starter/run.py
+++ b/cpp/test/Glacier/starter/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/Makefile b/cpp/test/Ice/Makefile
index 59c44d43f98..c1d52ef40bb 100644
--- a/cpp/test/Ice/Makefile
+++ b/cpp/test/Ice/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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
index fffcfe737b2..98dbabbe984 100644
--- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp
+++ b/cpp/test/Ice/adapterDeactivation/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/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp
index 114fc7054e2..291c70c5853 100644
--- a/cpp/test/Ice/adapterDeactivation/Client.cpp
+++ b/cpp/test/Ice/adapterDeactivation/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/Application.h>
#include <TestCommon.h>
#include <Test.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
index 61d5453c727..c3efca7f41f 100644
--- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp
+++ b/cpp/test/Ice/adapterDeactivation/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/Application.h>
#include <ServantLocatorI.h>
#include <TestCommon.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Makefile b/cpp/test/Ice/adapterDeactivation/Makefile
index 61cfaa31996..62ad9806000 100644
--- a/cpp/test/Ice/adapterDeactivation/Makefile
+++ b/cpp/test/Ice/adapterDeactivation/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/adapterDeactivation/ServantLocatorI.cpp b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
index 71558de3741..0c159c02665 100644
--- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
+++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.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 <ServantLocatorI.h>
#include <TestCommon.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
index e6c23b650ea..ff851fd9d49 100644
--- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
+++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.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 SERVANT_LOCATOR_I_H
#define SERVANT_LOCATOR_I_H
diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp
index 0b0cc079376..f06060417b8 100644
--- a/cpp/test/Ice/adapterDeactivation/Server.cpp
+++ b/cpp/test/Ice/adapterDeactivation/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/Application.h>
#include <ServantLocatorI.h>
#include <TestCommon.h>
diff --git a/cpp/test/Ice/adapterDeactivation/Test.ice b/cpp/test/Ice/adapterDeactivation/Test.ice
index 7b23a4b05a7..a3b0d2a4cca 100644
--- a/cpp/test/Ice/adapterDeactivation/Test.ice
+++ b/cpp/test/Ice/adapterDeactivation/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/adapterDeactivation/TestI.cpp b/cpp/test/Ice/adapterDeactivation/TestI.cpp
index 7bf4a73595a..d111c693d94 100644
--- a/cpp/test/Ice/adapterDeactivation/TestI.cpp
+++ b/cpp/test/Ice/adapterDeactivation/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 <IceUtil/IceUtil.h>
#include <Ice/Ice.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/adapterDeactivation/TestI.h b/cpp/test/Ice/adapterDeactivation/TestI.h
index 606eddad1a4..f2131b24255 100644
--- a/cpp/test/Ice/adapterDeactivation/TestI.h
+++ b/cpp/test/Ice/adapterDeactivation/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 TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/adapterDeactivation/run.py b/cpp/test/Ice/adapterDeactivation/run.py
index 9e98d7f66bd..9c8cf6abcf6 100755
--- a/cpp/test/Ice/adapterDeactivation/run.py
+++ b/cpp/test/Ice/adapterDeactivation/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index cb11f45c493..19dccabad57 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/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/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp
index 3570f57f283..0100258e7ee 100644
--- a/cpp/test/Ice/exceptions/Client.cpp
+++ b/cpp/test/Ice/exceptions/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/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp
index fd0579c9c89..cf1516e56b3 100644
--- a/cpp/test/Ice/exceptions/Collocated.cpp
+++ b/cpp/test/Ice/exceptions/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/exceptions/Makefile b/cpp/test/Ice/exceptions/Makefile
index f80704e389d..332c563bf02 100644
--- a/cpp/test/Ice/exceptions/Makefile
+++ b/cpp/test/Ice/exceptions/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/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp
index 1e84bc325f2..b3a8c39e607 100644
--- a/cpp/test/Ice/exceptions/Server.cpp
+++ b/cpp/test/Ice/exceptions/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/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp
index 783585613a5..9593e79f1bc 100644
--- a/cpp/test/Ice/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/exceptions/ServerAMD.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 <TestAMDI.h>
diff --git a/cpp/test/Ice/exceptions/Test.ice b/cpp/test/Ice/exceptions/Test.ice
index e2b7a0e5cf9..6fe30d34edc 100644
--- a/cpp/test/Ice/exceptions/Test.ice
+++ b/cpp/test/Ice/exceptions/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/exceptions/TestAMD.ice b/cpp/test/Ice/exceptions/TestAMD.ice
index b528aba6642..327b89df9e1 100644
--- a/cpp/test/Ice/exceptions/TestAMD.ice
+++ b/cpp/test/Ice/exceptions/TestAMD.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_AMD_ICE
#define TEST_AMD_ICE
diff --git a/cpp/test/Ice/exceptions/TestAMDI.cpp b/cpp/test/Ice/exceptions/TestAMDI.cpp
index b0db069f61f..48e8475ead3 100644
--- a/cpp/test/Ice/exceptions/TestAMDI.cpp
+++ b/cpp/test/Ice/exceptions/TestAMDI.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 <TestAMDI.h>
diff --git a/cpp/test/Ice/exceptions/TestAMDI.h b/cpp/test/Ice/exceptions/TestAMDI.h
index ce3bd9eee17..36fb756e307 100644
--- a/cpp/test/Ice/exceptions/TestAMDI.h
+++ b/cpp/test/Ice/exceptions/TestAMDI.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 TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/exceptions/TestI.cpp b/cpp/test/Ice/exceptions/TestI.cpp
index e31f141104e..96d1a5b4369 100644
--- a/cpp/test/Ice/exceptions/TestI.cpp
+++ b/cpp/test/Ice/exceptions/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/exceptions/TestI.h b/cpp/test/Ice/exceptions/TestI.h
index 6345ba7e799..e0a5982bd6c 100644
--- a/cpp/test/Ice/exceptions/TestI.h
+++ b/cpp/test/Ice/exceptions/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 TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/exceptions/run.py b/cpp/test/Ice/exceptions/run.py
index f92e853d990..76a4f6c77a3 100755
--- a/cpp/test/Ice/exceptions/run.py
+++ b/cpp/test/Ice/exceptions/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp
index 4c2782eec47..bcfcbd34e22 100644
--- a/cpp/test/Ice/facets/AllTests.cpp
+++ b/cpp/test/Ice/facets/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/facets/Client.cpp b/cpp/test/Ice/facets/Client.cpp
index 669737999b8..482a4634a2e 100644
--- a/cpp/test/Ice/facets/Client.cpp
+++ b/cpp/test/Ice/facets/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/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp
index e1b9f5365b8..219bfb27d38 100644
--- a/cpp/test/Ice/facets/Collocated.cpp
+++ b/cpp/test/Ice/facets/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/facets/Makefile b/cpp/test/Ice/facets/Makefile
index f3502da1d93..fe3a1a85a09 100644
--- a/cpp/test/Ice/facets/Makefile
+++ b/cpp/test/Ice/facets/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/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp
index 10f667da298..fad55a1fde3 100644
--- a/cpp/test/Ice/facets/Server.cpp
+++ b/cpp/test/Ice/facets/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/facets/Test.ice b/cpp/test/Ice/facets/Test.ice
index 1b4af73e885..e8f202bff53 100644
--- a/cpp/test/Ice/facets/Test.ice
+++ b/cpp/test/Ice/facets/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/facets/TestI.cpp b/cpp/test/Ice/facets/TestI.cpp
index 2dcded20eae..cb3393552e2 100644
--- a/cpp/test/Ice/facets/TestI.cpp
+++ b/cpp/test/Ice/facets/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/facets/TestI.h b/cpp/test/Ice/facets/TestI.h
index 78e351e5350..a3e0d45d002 100644
--- a/cpp/test/Ice/facets/TestI.h
+++ b/cpp/test/Ice/facets/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 TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/facets/run.py b/cpp/test/Ice/facets/run.py
index 9b7ab228a91..f850ddef920 100755
--- a/cpp/test/Ice/facets/run.py
+++ b/cpp/test/Ice/facets/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp
index 4322d38c54f..547f62fd082 100644
--- a/cpp/test/Ice/faultTolerance/AllTests.cpp
+++ b/cpp/test/Ice/faultTolerance/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/faultTolerance/Client.cpp b/cpp/test/Ice/faultTolerance/Client.cpp
index 10946ae5ad9..953a4125c26 100644
--- a/cpp/test/Ice/faultTolerance/Client.cpp
+++ b/cpp/test/Ice/faultTolerance/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/faultTolerance/Makefile b/cpp/test/Ice/faultTolerance/Makefile
index c70dea7da71..0b130f407e7 100644
--- a/cpp/test/Ice/faultTolerance/Makefile
+++ b/cpp/test/Ice/faultTolerance/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/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp
index 2e9ed221516..c1dd94e6e58 100644
--- a/cpp/test/Ice/faultTolerance/Server.cpp
+++ b/cpp/test/Ice/faultTolerance/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/faultTolerance/Test.ice b/cpp/test/Ice/faultTolerance/Test.ice
index 18ef9797ae9..15fa8e63042 100644
--- a/cpp/test/Ice/faultTolerance/Test.ice
+++ b/cpp/test/Ice/faultTolerance/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/faultTolerance/TestI.cpp b/cpp/test/Ice/faultTolerance/TestI.cpp
index 7e2443d5199..b04baadbd52 100644
--- a/cpp/test/Ice/faultTolerance/TestI.cpp
+++ b/cpp/test/Ice/faultTolerance/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/faultTolerance/TestI.h b/cpp/test/Ice/faultTolerance/TestI.h
index 639699ffc1c..5f47ab2fc28 100644
--- a/cpp/test/Ice/faultTolerance/TestI.h
+++ b/cpp/test/Ice/faultTolerance/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 TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index f49d02fc595..18077d5c05d 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/gc/Client.cpp b/cpp/test/Ice/gc/Client.cpp
index 821f0480c3f..f49cc219bb8 100644
--- a/cpp/test/Ice/gc/Client.cpp
+++ b/cpp/test/Ice/gc/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 <IceUtil/Thread.h>
#include <Ice/Ice.h>
#include <TestCommon.h>
diff --git a/cpp/test/Ice/gc/Makefile b/cpp/test/Ice/gc/Makefile
index 7856f96999a..0405b6155e8 100644
--- a/cpp/test/Ice/gc/Makefile
+++ b/cpp/test/Ice/gc/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/gc/Test.ice b/cpp/test/Ice/gc/Test.ice
index 62dc89f1033..fa01b865d5d 100644
--- a/cpp/test/Ice/gc/Test.ice
+++ b/cpp/test/Ice/gc/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/gc/run.py b/cpp/test/Ice/gc/run.py
index 2843d24574c..1a12fe870a5 100755
--- a/cpp/test/Ice/gc/run.py
+++ b/cpp/test/Ice/gc/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 [".", "..", "../..", "../../..", "../../../.."]:
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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp
index 659f82efef8..6eeb9643c13 100644
--- a/cpp/test/Ice/location/AllTests.cpp
+++ b/cpp/test/Ice/location/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/location/Client.cpp b/cpp/test/Ice/location/Client.cpp
index 8f35f4262e9..5e4cebfca84 100644
--- a/cpp/test/Ice/location/Client.cpp
+++ b/cpp/test/Ice/location/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/location/Collocated.cpp b/cpp/test/Ice/location/Collocated.cpp
index 3fff869e5f5..7d35d7d6176 100644
--- a/cpp/test/Ice/location/Collocated.cpp
+++ b/cpp/test/Ice/location/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/location/Makefile b/cpp/test/Ice/location/Makefile
index 10704d1a378..48917843d10 100644
--- a/cpp/test/Ice/location/Makefile
+++ b/cpp/test/Ice/location/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/location/Server.cpp b/cpp/test/Ice/location/Server.cpp
index ed1ee724f48..95eaffbf142 100644
--- a/cpp/test/Ice/location/Server.cpp
+++ b/cpp/test/Ice/location/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 <ServerLocator.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/location/ServerLocator.cpp b/cpp/test/Ice/location/ServerLocator.cpp
index badb267c847..22932bfbec7 100644
--- a/cpp/test/Ice/location/ServerLocator.cpp
+++ b/cpp/test/Ice/location/ServerLocator.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 <Ice/BuiltinSequences.h>
#include <ServerLocator.h>
diff --git a/cpp/test/Ice/location/ServerLocator.h b/cpp/test/Ice/location/ServerLocator.h
index dfdcc2285cc..9b69cc46167 100644
--- a/cpp/test/Ice/location/ServerLocator.h
+++ b/cpp/test/Ice/location/ServerLocator.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 SERVER_LOCATOR_H
#define SERVER_LOCATOR_H
diff --git a/cpp/test/Ice/location/Test.ice b/cpp/test/Ice/location/Test.ice
index ae2549eda42..df89980dfa3 100644
--- a/cpp/test/Ice/location/Test.ice
+++ b/cpp/test/Ice/location/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/location/TestI.cpp b/cpp/test/Ice/location/TestI.cpp
index e91444ae720..524f704d2d7 100644
--- a/cpp/test/Ice/location/TestI.cpp
+++ b/cpp/test/Ice/location/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 <Ice/Locator.h>
#include <TestI.h>
diff --git a/cpp/test/Ice/location/TestI.h b/cpp/test/Ice/location/TestI.h
index d8107c4f647..3fae64a6433 100644
--- a/cpp/test/Ice/location/TestI.h
+++ b/cpp/test/Ice/location/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 TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/location/run.py b/cpp/test/Ice/location/run.py
index 15cd3827506..2b5e2a209ad 100755
--- a/cpp/test/Ice/location/run.py
+++ b/cpp/test/Ice/location/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp
index 0b2ce2e783a..69a8789105c 100644
--- a/cpp/test/Ice/objects/AllTests.cpp
+++ b/cpp/test/Ice/objects/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/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp
index 2eea6e63466..5e75d122ea7 100644
--- a/cpp/test/Ice/objects/Client.cpp
+++ b/cpp/test/Ice/objects/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 <TestI.h>
diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp
index fcb27cf92c6..53b4a28ae32 100644
--- a/cpp/test/Ice/objects/Collocated.cpp
+++ b/cpp/test/Ice/objects/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/objects/Makefile b/cpp/test/Ice/objects/Makefile
index 9f7c5f346b7..14495be3060 100644
--- a/cpp/test/Ice/objects/Makefile
+++ b/cpp/test/Ice/objects/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/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp
index 03f725a52b7..5b6947a9055 100644
--- a/cpp/test/Ice/objects/Server.cpp
+++ b/cpp/test/Ice/objects/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/objects/Test.ice b/cpp/test/Ice/objects/Test.ice
index 14051f2ab39..5e2c75bca60 100644
--- a/cpp/test/Ice/objects/Test.ice
+++ b/cpp/test/Ice/objects/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/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp
index 504f6f013c3..995cd3fc1be 100644
--- a/cpp/test/Ice/objects/TestI.cpp
+++ b/cpp/test/Ice/objects/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/objects/TestI.h b/cpp/test/Ice/objects/TestI.h
index 4be8852ebad..b7f13159f95 100644
--- a/cpp/test/Ice/objects/TestI.h
+++ b/cpp/test/Ice/objects/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 TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/objects/run.py b/cpp/test/Ice/objects/run.py
index c8c6e3d0bda..3bf88cb9c1b 100755
--- a/cpp/test/Ice/objects/run.py
+++ b/cpp/test/Ice/objects/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp
index 6fca5c22398..2a434e12bf3 100644
--- a/cpp/test/Ice/operations/AllTests.cpp
+++ b/cpp/test/Ice/operations/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 <Ice/Locator.h>
#include <TestCommon.h>
diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp
index 70851d9d94c..7e5aeb54de1 100644
--- a/cpp/test/Ice/operations/Client.cpp
+++ b/cpp/test/Ice/operations/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/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp
index b20e1e1c359..466e9a4ff6b 100644
--- a/cpp/test/Ice/operations/Collocated.cpp
+++ b/cpp/test/Ice/operations/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/operations/Makefile b/cpp/test/Ice/operations/Makefile
index 6ba74186ce5..2fd0648ba35 100644
--- a/cpp/test/Ice/operations/Makefile
+++ b/cpp/test/Ice/operations/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/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp
index 116c1a82acf..e97a29dee25 100644
--- a/cpp/test/Ice/operations/Server.cpp
+++ b/cpp/test/Ice/operations/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/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp
index 059ddc69bca..48982e820db 100644
--- a/cpp/test/Ice/operations/ServerAMD.cpp
+++ b/cpp/test/Ice/operations/ServerAMD.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 <TestAMDI.h>
diff --git a/cpp/test/Ice/operations/Test.ice b/cpp/test/Ice/operations/Test.ice
index ad1940d4577..0910350a530 100644
--- a/cpp/test/Ice/operations/Test.ice
+++ b/cpp/test/Ice/operations/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/operations/TestAMD.ice b/cpp/test/Ice/operations/TestAMD.ice
index b157f9613b0..31593f263a8 100644
--- a/cpp/test/Ice/operations/TestAMD.ice
+++ b/cpp/test/Ice/operations/TestAMD.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_AMD_ICE
#define TEST_AMD_ICE
diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp
index 699b5a05aac..c80e8cd19be 100644
--- a/cpp/test/Ice/operations/TestAMDI.cpp
+++ b/cpp/test/Ice/operations/TestAMDI.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 <TestAMDI.h>
#include <functional>
diff --git a/cpp/test/Ice/operations/TestAMDI.h b/cpp/test/Ice/operations/TestAMDI.h
index 6388b366152..5a0c1942199 100644
--- a/cpp/test/Ice/operations/TestAMDI.h
+++ b/cpp/test/Ice/operations/TestAMDI.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 TEST_AMD_I_H
#define TEST_AMD_I_H
diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp
index 3d8e931ee7b..ad4c3e5aa94 100644
--- a/cpp/test/Ice/operations/TestI.cpp
+++ b/cpp/test/Ice/operations/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>
#include <functional>
diff --git a/cpp/test/Ice/operations/TestI.h b/cpp/test/Ice/operations/TestI.h
index 5c9ebfbc354..9d499a48803 100644
--- a/cpp/test/Ice/operations/TestI.h
+++ b/cpp/test/Ice/operations/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 TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp
index 0dc881dbf6b..fd3fd03bd19 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.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/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
index 79e67418598..33132f5f18f 100644
--- a/cpp/test/Ice/operations/TwowaysAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysAMI.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/operations/run.py b/cpp/test/Ice/operations/run.py
index af9bf2be5dc..027ba88fe66 100755
--- a/cpp/test/Ice/operations/run.py
+++ b/cpp/test/Ice/operations/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/slicing/Makefile b/cpp/test/Ice/slicing/Makefile
index 59eec6ea7eb..6ee713c95e1 100644
--- a/cpp/test/Ice/slicing/Makefile
+++ b/cpp/test/Ice/slicing/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 = ../../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/Ice/slicing/exceptions/AllTests.cpp b/cpp/test/Ice/slicing/exceptions/AllTests.cpp
index 60f2921afda..9bd4738616f 100644
--- a/cpp/test/Ice/slicing/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/slicing/exceptions/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/slicing/exceptions/Client.cpp b/cpp/test/Ice/slicing/exceptions/Client.cpp
index bdeb1c7809a..150ddf0836e 100644
--- a/cpp/test/Ice/slicing/exceptions/Client.cpp
+++ b/cpp/test/Ice/slicing/exceptions/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/slicing/exceptions/Makefile b/cpp/test/Ice/slicing/exceptions/Makefile
index 1c327b6d6a9..9b2e3ae4be7 100644
--- a/cpp/test/Ice/slicing/exceptions/Makefile
+++ b/cpp/test/Ice/slicing/exceptions/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/slicing/exceptions/Server.cpp b/cpp/test/Ice/slicing/exceptions/Server.cpp
index a2e87117f35..3ddc2258a72 100644
--- a/cpp/test/Ice/slicing/exceptions/Server.cpp
+++ b/cpp/test/Ice/slicing/exceptions/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/slicing/exceptions/ServerAMD.cpp b/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
index 86bc662a2d8..e9306d1b91f 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/slicing/exceptions/ServerAMD.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 <TestAMDI.h>
diff --git a/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice b/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice
index ea486910461..343dbce5f88 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerPrivate.ice
+++ b/cpp/test/Ice/slicing/exceptions/ServerPrivate.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 SERVERPRIVATE_ICE
#define SERVERPRIVATE_ICE
diff --git a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
index 37580eaff70..08e45b35f37 100644
--- a/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
+++ b/cpp/test/Ice/slicing/exceptions/ServerPrivateAMD.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 SERVERPRIVATEAMD_ICE
#define SERVERPRIVATEAMD_ICE
diff --git a/cpp/test/Ice/slicing/exceptions/Test.ice b/cpp/test/Ice/slicing/exceptions/Test.ice
index cb42aa4d87c..d2543d47aac 100644
--- a/cpp/test/Ice/slicing/exceptions/Test.ice
+++ b/cpp/test/Ice/slicing/exceptions/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/slicing/exceptions/TestAMD.ice b/cpp/test/Ice/slicing/exceptions/TestAMD.ice
index f8dec1fd04e..4cce716566c 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMD.ice
+++ b/cpp/test/Ice/slicing/exceptions/TestAMD.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_AMD_ICE
#define TEST_AMD_ICE
diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp b/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
index 3c79c4b317a..75e009cb52d 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
+++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.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 <TestAMDI.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/exceptions/TestAMDI.h b/cpp/test/Ice/slicing/exceptions/TestAMDI.h
index 4e8c3ad10a0..6da5fee592b 100644
--- a/cpp/test/Ice/slicing/exceptions/TestAMDI.h
+++ b/cpp/test/Ice/slicing/exceptions/TestAMDI.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 TESTAMDI_H
#define TESTAMDI_H
diff --git a/cpp/test/Ice/slicing/exceptions/TestI.cpp b/cpp/test/Ice/slicing/exceptions/TestI.cpp
index 3499713edd3..76d71390cd4 100644
--- a/cpp/test/Ice/slicing/exceptions/TestI.cpp
+++ b/cpp/test/Ice/slicing/exceptions/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 <TestI.h>
#include <Ice/Ice.h>
diff --git a/cpp/test/Ice/slicing/exceptions/TestI.h b/cpp/test/Ice/slicing/exceptions/TestI.h
index 57b165798c6..aa807b7d349 100644
--- a/cpp/test/Ice/slicing/exceptions/TestI.h
+++ b/cpp/test/Ice/slicing/exceptions/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/slicing/exceptions/run.py b/cpp/test/Ice/slicing/exceptions/run.py
index 688bf10710b..c716e9bea5b 100755
--- a/cpp/test/Ice/slicing/exceptions/run.py
+++ b/cpp/test/Ice/slicing/exceptions/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp
index c61240f2ae9..e2c0c190691 100644
--- a/cpp/test/Ice/slicing/objects/AllTests.cpp
+++ b/cpp/test/Ice/slicing/objects/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 <ClientPrivate.h>
diff --git a/cpp/test/Ice/slicing/objects/Client.cpp b/cpp/test/Ice/slicing/objects/Client.cpp
index 8bbb43ea720..c22dea27a7f 100644
--- a/cpp/test/Ice/slicing/objects/Client.cpp
+++ b/cpp/test/Ice/slicing/objects/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 <ClientPrivate.h>
diff --git a/cpp/test/Ice/slicing/objects/ClientPrivate.ice b/cpp/test/Ice/slicing/objects/ClientPrivate.ice
index 75c0f12c9a5..7e583dfe238 100644
--- a/cpp/test/Ice/slicing/objects/ClientPrivate.ice
+++ b/cpp/test/Ice/slicing/objects/ClientPrivate.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 CLIENTPRIVATE_ICE
#define CLIENTPRIVATE_ICE
diff --git a/cpp/test/Ice/slicing/objects/Forward.ice b/cpp/test/Ice/slicing/objects/Forward.ice
index bcf3c459f62..4db43058410 100644
--- a/cpp/test/Ice/slicing/objects/Forward.ice
+++ b/cpp/test/Ice/slicing/objects/Forward.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 FORWARD_ICE
#define FORWARD_ICE
diff --git a/cpp/test/Ice/slicing/objects/Makefile b/cpp/test/Ice/slicing/objects/Makefile
index fed671b853d..c4b19a9a337 100644
--- a/cpp/test/Ice/slicing/objects/Makefile
+++ b/cpp/test/Ice/slicing/objects/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/slicing/objects/Server.cpp b/cpp/test/Ice/slicing/objects/Server.cpp
index a2e87117f35..3ddc2258a72 100644
--- a/cpp/test/Ice/slicing/objects/Server.cpp
+++ b/cpp/test/Ice/slicing/objects/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/slicing/objects/ServerAMD.cpp b/cpp/test/Ice/slicing/objects/ServerAMD.cpp
index 86bc662a2d8..e9306d1b91f 100644
--- a/cpp/test/Ice/slicing/objects/ServerAMD.cpp
+++ b/cpp/test/Ice/slicing/objects/ServerAMD.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 <TestAMDI.h>
diff --git a/cpp/test/Ice/slicing/objects/ServerPrivate.ice b/cpp/test/Ice/slicing/objects/ServerPrivate.ice
index 80b6447e5c4..d0ebdefbe16 100644
--- a/cpp/test/Ice/slicing/objects/ServerPrivate.ice
+++ b/cpp/test/Ice/slicing/objects/ServerPrivate.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 SERVERPRIVATE_ICE
#define SERVERPRIVATE_ICE
diff --git a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice
index b59df25fa0e..d385e2849f0 100644
--- a/cpp/test/Ice/slicing/objects/ServerPrivateAMD.ice
+++ b/cpp/test/Ice/slicing/objects/ServerPrivateAMD.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 SERVERPRIVATE_AMD_ICE
#define SERVERPRIVATE_AMD_ICE
diff --git a/cpp/test/Ice/slicing/objects/Test.ice b/cpp/test/Ice/slicing/objects/Test.ice
index a3344a46474..a20f048ad34 100644
--- a/cpp/test/Ice/slicing/objects/Test.ice
+++ b/cpp/test/Ice/slicing/objects/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/slicing/objects/TestAMD.ice b/cpp/test/Ice/slicing/objects/TestAMD.ice
index 999b3cf7d04..c4815a7cdaf 100644
--- a/cpp/test/Ice/slicing/objects/TestAMD.ice
+++ b/cpp/test/Ice/slicing/objects/TestAMD.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_AMD_ICE
#define TEST_AMD_ICE
diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.cpp b/cpp/test/Ice/slicing/objects/TestAMDI.cpp
index 5cbbd7eba0e..6beed12016a 100644
--- a/cpp/test/Ice/slicing/objects/TestAMDI.cpp
+++ b/cpp/test/Ice/slicing/objects/TestAMDI.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 <TestAMDI.h>
#include <Ice/Ice.h>
#include <sstream>
diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.h b/cpp/test/Ice/slicing/objects/TestAMDI.h
index 80edaa224a5..556866d7ea2 100644
--- a/cpp/test/Ice/slicing/objects/TestAMDI.h
+++ b/cpp/test/Ice/slicing/objects/TestAMDI.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/slicing/objects/TestI.cpp b/cpp/test/Ice/slicing/objects/TestI.cpp
index bd3b752a303..739b0b083e6 100644
--- a/cpp/test/Ice/slicing/objects/TestI.cpp
+++ b/cpp/test/Ice/slicing/objects/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 <TestI.h>
#include <Ice/Ice.h>
#include <sstream>
diff --git a/cpp/test/Ice/slicing/objects/TestI.h b/cpp/test/Ice/slicing/objects/TestI.h
index cb042d8532b..ff53ae76ec3 100644
--- a/cpp/test/Ice/slicing/objects/TestI.h
+++ b/cpp/test/Ice/slicing/objects/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/slicing/objects/run.py b/cpp/test/Ice/slicing/objects/run.py
index e6adb9932c4..9ee46724944 100755
--- a/cpp/test/Ice/slicing/objects/run.py
+++ b/cpp/test/Ice/slicing/objects/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IcePack/Makefile b/cpp/test/IcePack/Makefile
index f60887e8e78..4451caffc0b 100644
--- a/cpp/test/IcePack/Makefile
+++ b/cpp/test/IcePack/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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/IcePack/deployer/AllTests.cpp b/cpp/test/IcePack/deployer/AllTests.cpp
index 05b26f58528..023f271280a 100644
--- a/cpp/test/IcePack/deployer/AllTests.cpp
+++ b/cpp/test/IcePack/deployer/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 <Ice/BuiltinSequences.h>
#include <Ice/IdentityUtil.h>
diff --git a/cpp/test/IcePack/deployer/Client.cpp b/cpp/test/IcePack/deployer/Client.cpp
index bc99559ec2e..63247e4db6f 100644
--- a/cpp/test/IcePack/deployer/Client.cpp
+++ b/cpp/test/IcePack/deployer/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/IcePack/deployer/Makefile b/cpp/test/IcePack/deployer/Makefile
index 9d90dbf44e8..2b55615a783 100644
--- a/cpp/test/IcePack/deployer/Makefile
+++ b/cpp/test/IcePack/deployer/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/IcePack/deployer/Server.cpp b/cpp/test/IcePack/deployer/Server.cpp
index d7194fcc181..6a306710fd7 100644
--- a/cpp/test/IcePack/deployer/Server.cpp
+++ b/cpp/test/IcePack/deployer/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>
#include <TestCommon.h>
diff --git a/cpp/test/IcePack/deployer/Service.cpp b/cpp/test/IcePack/deployer/Service.cpp
index 8cb518b199f..3c4e35f2ae8 100644
--- a/cpp/test/IcePack/deployer/Service.cpp
+++ b/cpp/test/IcePack/deployer/Service.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 <IceBox/IceBox.h>
#include <Freeze/Freeze.h>
diff --git a/cpp/test/IcePack/deployer/Test.ice b/cpp/test/IcePack/deployer/Test.ice
index 3e5dc716f94..19578e1c328 100644
--- a/cpp/test/IcePack/deployer/Test.ice
+++ b/cpp/test/IcePack/deployer/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/IcePack/deployer/TestI.cpp b/cpp/test/IcePack/deployer/TestI.cpp
index fffb9e8feb2..7620b9f8d84 100644
--- a/cpp/test/IcePack/deployer/TestI.cpp
+++ b/cpp/test/IcePack/deployer/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/IcePack/deployer/TestI.h b/cpp/test/IcePack/deployer/TestI.h
index abb1aaff2fc..0e041f2e2ed 100644
--- a/cpp/test/IcePack/deployer/TestI.h
+++ b/cpp/test/IcePack/deployer/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 TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IcePack/deployer/run.py b/cpp/test/IcePack/deployer/run.py
index 64c46ada2eb..8173de5ecde 100755
--- a/cpp/test/IcePack/deployer/run.py
+++ b/cpp/test/IcePack/deployer/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IcePack/simple/AllTests.cpp b/cpp/test/IcePack/simple/AllTests.cpp
index e857fdfbb32..7e9ce0e56e7 100644
--- a/cpp/test/IcePack/simple/AllTests.cpp
+++ b/cpp/test/IcePack/simple/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 <IcePack/Admin.h>
#include <TestCommon.h>
diff --git a/cpp/test/IcePack/simple/Client.cpp b/cpp/test/IcePack/simple/Client.cpp
index 4a96d80576f..fef908b4497 100644
--- a/cpp/test/IcePack/simple/Client.cpp
+++ b/cpp/test/IcePack/simple/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/IcePack/simple/Makefile b/cpp/test/IcePack/simple/Makefile
index 024f0d6e47b..eff57c7affc 100644
--- a/cpp/test/IcePack/simple/Makefile
+++ b/cpp/test/IcePack/simple/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/IcePack/simple/Server.cpp b/cpp/test/IcePack/simple/Server.cpp
index 46af74683ed..92c9e780ffa 100644
--- a/cpp/test/IcePack/simple/Server.cpp
+++ b/cpp/test/IcePack/simple/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/IcePack/simple/Test.ice b/cpp/test/IcePack/simple/Test.ice
index b2485b59317..65fe5377ad3 100644
--- a/cpp/test/IcePack/simple/Test.ice
+++ b/cpp/test/IcePack/simple/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/IcePack/simple/TestI.cpp b/cpp/test/IcePack/simple/TestI.cpp
index c1a36f4000f..b109574486f 100644
--- a/cpp/test/IcePack/simple/TestI.cpp
+++ b/cpp/test/IcePack/simple/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/IcePack/simple/TestI.h b/cpp/test/IcePack/simple/TestI.h
index 2933f01eb6a..3b0e03dbc91 100644
--- a/cpp/test/IcePack/simple/TestI.h
+++ b/cpp/test/IcePack/simple/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 TEST_I_H
#define TEST_I_H
diff --git a/cpp/test/IcePack/simple/run.py b/cpp/test/IcePack/simple/run.py
index 119d32359a2..30083d573b9 100755
--- a/cpp/test/IcePack/simple/run.py
+++ b/cpp/test/IcePack/simple/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceSSL/Makefile b/cpp/test/IceSSL/Makefile
index 0669d93b9a1..1bc382f1f22 100644
--- a/cpp/test/IceSSL/Makefile
+++ b/cpp/test/IceSSL/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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp b/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp
index 5261e92b781..4da8f9d9489 100644
--- a/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.cpp
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/CertificateAndKeyParsing.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 <IceSSL/Exception.h>
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
index 9e731ff0d33..94eef934be3 100644
--- a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/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 = certificateAndKeyParsing
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/run.py b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
index 8360dcc5000..bb23ad244d9 100755
--- a/cpp/test/IceSSL/certificateAndKeyParsing/run.py
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceSSL/certificateVerification/Client.cpp b/cpp/test/IceSSL/certificateVerification/Client.cpp
index 5cfc538380f..5107fc72104 100644
--- a/cpp/test/IceSSL/certificateVerification/Client.cpp
+++ b/cpp/test/IceSSL/certificateVerification/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 <IceSSL/Plugin.h>
#include <IceSSL/Exception.h>
diff --git a/cpp/test/IceSSL/certificateVerification/Makefile b/cpp/test/IceSSL/certificateVerification/Makefile
index cde778df1a3..5393adfaf2a 100644
--- a/cpp/test/IceSSL/certificateVerification/Makefile
+++ b/cpp/test/IceSSL/certificateVerification/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/IceSSL/certificateVerification/Pinger.ice b/cpp/test/IceSSL/certificateVerification/Pinger.ice
index e777b6decdc..401ef8198e6 100644
--- a/cpp/test/IceSSL/certificateVerification/Pinger.ice
+++ b/cpp/test/IceSSL/certificateVerification/Pinger.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 PINGER_ICE
#define PINGER_ICE
diff --git a/cpp/test/IceSSL/certificateVerification/Server.cpp b/cpp/test/IceSSL/certificateVerification/Server.cpp
index 10e193594e8..6134df1960d 100644
--- a/cpp/test/IceSSL/certificateVerification/Server.cpp
+++ b/cpp/test/IceSSL/certificateVerification/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 <IceSSL/RSACertificateGen.h>
#include <IceSSL/RSAKeyPair.h>
diff --git a/cpp/test/IceSSL/certificateVerification/run.py b/cpp/test/IceSSL/certificateVerification/run.py
index 105d19c4b73..035efe4b9dd 100755
--- a/cpp/test/IceSSL/certificateVerification/run.py
+++ b/cpp/test/IceSSL/certificateVerification/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp b/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp
index 586a9a8ccc7..9a53978453d 100644
--- a/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.cpp
+++ b/cpp/test/IceSSL/certificateVerifier/CertificateVerifier.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 <IceSSL/CertificateVerifier.h>
diff --git a/cpp/test/IceSSL/certificateVerifier/Makefile b/cpp/test/IceSSL/certificateVerifier/Makefile
index 37d86c632f3..01f627730f5 100644
--- a/cpp/test/IceSSL/certificateVerifier/Makefile
+++ b/cpp/test/IceSSL/certificateVerifier/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 = certificateVerifier
diff --git a/cpp/test/IceSSL/certificateVerifier/run.py b/cpp/test/IceSSL/certificateVerifier/run.py
index 44b6ed69667..0aa389acfaf 100755
--- a/cpp/test/IceSSL/certificateVerifier/run.py
+++ b/cpp/test/IceSSL/certificateVerifier/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceSSL/configuration/Configuration.cpp b/cpp/test/IceSSL/configuration/Configuration.cpp
index 1cd6f0a582b..eae0eee57cb 100644
--- a/cpp/test/IceSSL/configuration/Configuration.cpp
+++ b/cpp/test/IceSSL/configuration/Configuration.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 <IceSSL/Exception.h>
diff --git a/cpp/test/IceSSL/configuration/Makefile b/cpp/test/IceSSL/configuration/Makefile
index ebb92b5e5c7..2f720084158 100644
--- a/cpp/test/IceSSL/configuration/Makefile
+++ b/cpp/test/IceSSL/configuration/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 = configuration
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py
index 4b74edab0d4..291aa2fdf63 100755
--- a/cpp/test/IceSSL/configuration/run.py
+++ b/cpp/test/IceSSL/configuration/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceSSL/loadPEM/LoadPEM.cpp b/cpp/test/IceSSL/loadPEM/LoadPEM.cpp
index bcfb649aba1..4290f5404c7 100644
--- a/cpp/test/IceSSL/loadPEM/LoadPEM.cpp
+++ b/cpp/test/IceSSL/loadPEM/LoadPEM.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 <IceSSL/Exception.h>
diff --git a/cpp/test/IceSSL/loadPEM/Makefile b/cpp/test/IceSSL/loadPEM/Makefile
index d10898705e4..37d24b4b91e 100644
--- a/cpp/test/IceSSL/loadPEM/Makefile
+++ b/cpp/test/IceSSL/loadPEM/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 = loadPEM
diff --git a/cpp/test/IceSSL/loadPEM/run.py b/cpp/test/IceSSL/loadPEM/run.py
index 18760b91ce8..3804058d88a 100755
--- a/cpp/test/IceSSL/loadPEM/run.py
+++ b/cpp/test/IceSSL/loadPEM/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceStorm/Makefile b/cpp/test/IceStorm/Makefile
index 0417c1bc735..411b7dc5666 100644
--- a/cpp/test/IceStorm/Makefile
+++ b/cpp/test/IceStorm/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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/IceStorm/federation/Event.ice b/cpp/test/IceStorm/federation/Event.ice
index e8d5c8d3ea6..c581aa6c606 100644
--- a/cpp/test/IceStorm/federation/Event.ice
+++ b/cpp/test/IceStorm/federation/Event.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 EVENT_ICE
#define EVENT_ICE
diff --git a/cpp/test/IceStorm/federation/Makefile b/cpp/test/IceStorm/federation/Makefile
index 38457b1ceb7..9883d812633 100644
--- a/cpp/test/IceStorm/federation/Makefile
+++ b/cpp/test/IceStorm/federation/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 = ../../..
PUBLISHER = publisher
diff --git a/cpp/test/IceStorm/federation/Publisher.cpp b/cpp/test/IceStorm/federation/Publisher.cpp
index ab5b856135d..3f644a3c649 100644
--- a/cpp/test/IceStorm/federation/Publisher.cpp
+++ b/cpp/test/IceStorm/federation/Publisher.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 <IceStorm/IceStorm.h>
#include <Event.h>
diff --git a/cpp/test/IceStorm/federation/Subscriber.cpp b/cpp/test/IceStorm/federation/Subscriber.cpp
index 5b82c669858..c5432280162 100644
--- a/cpp/test/IceStorm/federation/Subscriber.cpp
+++ b/cpp/test/IceStorm/federation/Subscriber.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 <IceStorm/IceStorm.h>
#include <Event.h>
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index 7ec9e6fb61a..50f46e33f48 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/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
import time
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index 2e9e30f0c76..4b59e352778 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/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
import time
diff --git a/cpp/test/IceStorm/single/Makefile b/cpp/test/IceStorm/single/Makefile
index 4a480d66ed6..4c632857ba2 100644
--- a/cpp/test/IceStorm/single/Makefile
+++ b/cpp/test/IceStorm/single/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 = ../../..
PUBLISHER = publisher
diff --git a/cpp/test/IceStorm/single/Publisher.cpp b/cpp/test/IceStorm/single/Publisher.cpp
index 01ccb76ebb1..fa95ee6c44c 100644
--- a/cpp/test/IceStorm/single/Publisher.cpp
+++ b/cpp/test/IceStorm/single/Publisher.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 <IceStorm/IceStorm.h>
#include <Single.h>
diff --git a/cpp/test/IceStorm/single/Single.ice b/cpp/test/IceStorm/single/Single.ice
index 75d9aa5c32a..4febe657333 100644
--- a/cpp/test/IceStorm/single/Single.ice
+++ b/cpp/test/IceStorm/single/Single.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 SINGLE_ICE
#define SINGLE_ICE
diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp
index 1e0fe6474db..07a438bc913 100644
--- a/cpp/test/IceStorm/single/Subscriber.cpp
+++ b/cpp/test/IceStorm/single/Subscriber.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 <IceStorm/IceStorm.h>
#include <Single.h>
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py
index f5d183ce87a..afbb19fee8f 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/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
import time
diff --git a/cpp/test/IceUtil/Makefile b/cpp/test/IceUtil/Makefile
index 46ad5ba2298..7990ed2c1f7 100644
--- a/cpp/test/IceUtil/Makefile
+++ b/cpp/test/IceUtil/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 = ../..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/IceUtil/ctrlCHandler/Client.cpp b/cpp/test/IceUtil/ctrlCHandler/Client.cpp
index ef2444a3ead..3d8e17e22f7 100644
--- a/cpp/test/IceUtil/ctrlCHandler/Client.cpp
+++ b/cpp/test/IceUtil/ctrlCHandler/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 <TestCommon.h>
#include <IceUtil/CtrlCHandler.h>
#include <IceUtil/Thread.h>
diff --git a/cpp/test/IceUtil/ctrlCHandler/Makefile b/cpp/test/IceUtil/ctrlCHandler/Makefile
index 93c28e32751..1874d2ea655 100644
--- a/cpp/test/IceUtil/ctrlCHandler/Makefile
+++ b/cpp/test/IceUtil/ctrlCHandler/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/IceUtil/inputUtil/Client.cpp b/cpp/test/IceUtil/inputUtil/Client.cpp
index 1662dcfe84e..d1c4e969f82 100644
--- a/cpp/test/IceUtil/inputUtil/Client.cpp
+++ b/cpp/test/IceUtil/inputUtil/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 <IceUtil/Unicode.h>
#include <IceUtil/InputUtil.h>
#include <TestCommon.h>
diff --git a/cpp/test/IceUtil/inputUtil/Makefile b/cpp/test/IceUtil/inputUtil/Makefile
index 93c28e32751..1874d2ea655 100644
--- a/cpp/test/IceUtil/inputUtil/Makefile
+++ b/cpp/test/IceUtil/inputUtil/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/IceUtil/inputUtil/run.py b/cpp/test/IceUtil/inputUtil/run.py
index 1476ce6470a..42b1afb4870 100755
--- a/cpp/test/IceUtil/inputUtil/run.py
+++ b/cpp/test/IceUtil/inputUtil/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceUtil/thread/AliveTest.cpp b/cpp/test/IceUtil/thread/AliveTest.cpp
index 4a7667dc496..69c70cb02f7 100644
--- a/cpp/test/IceUtil/thread/AliveTest.cpp
+++ b/cpp/test/IceUtil/thread/AliveTest.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 <IceUtil/IceUtil.h>
#include <AliveTest.h>
#include <TestCommon.h>
diff --git a/cpp/test/IceUtil/thread/AliveTest.h b/cpp/test/IceUtil/thread/AliveTest.h
index 1239c917cfd..5dccc703664 100644
--- a/cpp/test/IceUtil/thread/AliveTest.h
+++ b/cpp/test/IceUtil/thread/AliveTest.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 ALIVE_TEST_H
#define ALIVE_TEST_H
diff --git a/cpp/test/IceUtil/thread/Client.cpp b/cpp/test/IceUtil/thread/Client.cpp
index 50468fbcac4..44583d91650 100644
--- a/cpp/test/IceUtil/thread/Client.cpp
+++ b/cpp/test/IceUtil/thread/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 <IceUtil/IceUtil.h>
#include <stdlib.h>
diff --git a/cpp/test/IceUtil/thread/CountDownLatchTest.cpp b/cpp/test/IceUtil/thread/CountDownLatchTest.cpp
index 4351f6140d7..c042a6fa05e 100644
--- a/cpp/test/IceUtil/thread/CountDownLatchTest.cpp
+++ b/cpp/test/IceUtil/thread/CountDownLatchTest.cpp
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2004
+// 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 <IceUtil/IceUtil.h>
#include <CountDownLatchTest.h>
diff --git a/cpp/test/IceUtil/thread/CountDownLatchTest.h b/cpp/test/IceUtil/thread/CountDownLatchTest.h
index 27f1f0a2f29..d035e593605 100644
--- a/cpp/test/IceUtil/thread/CountDownLatchTest.h
+++ b/cpp/test/IceUtil/thread/CountDownLatchTest.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 COUNT_DOWN_LATCH_TEST_H
#define COUNT_DOWN_LATCH_TEST_H
diff --git a/cpp/test/IceUtil/thread/CreateTest.cpp b/cpp/test/IceUtil/thread/CreateTest.cpp
index f7ac4f5c965..45b2ff2a827 100644
--- a/cpp/test/IceUtil/thread/CreateTest.cpp
+++ b/cpp/test/IceUtil/thread/CreateTest.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 <IceUtil/IceUtil.h>
#include <stdio.h>
diff --git a/cpp/test/IceUtil/thread/CreateTest.h b/cpp/test/IceUtil/thread/CreateTest.h
index ae7a08eeb66..c27c69ca430 100644
--- a/cpp/test/IceUtil/thread/CreateTest.h
+++ b/cpp/test/IceUtil/thread/CreateTest.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 CREATE_TEST_H
#define CREATE_TEST_H
diff --git a/cpp/test/IceUtil/thread/Makefile b/cpp/test/IceUtil/thread/Makefile
index e9d679a5a7e..ce2a7f2717a 100644
--- a/cpp/test/IceUtil/thread/Makefile
+++ b/cpp/test/IceUtil/thread/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/IceUtil/thread/MonitorMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
index 9e8c6a660ef..ba4b06fdefd 100644
--- a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MonitorMutexTest.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 <IceUtil/IceUtil.h>
#include <MonitorMutexTest.h>
diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.h b/cpp/test/IceUtil/thread/MonitorMutexTest.h
index c7d850dfcc7..763715c8425 100644
--- a/cpp/test/IceUtil/thread/MonitorMutexTest.h
+++ b/cpp/test/IceUtil/thread/MonitorMutexTest.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 MONITOR_MUTEX_TEST_H
#define MONITOR_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
index a437a568ba5..6eb404d548b 100644
--- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.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 <IceUtil/IceUtil.h>
#include <MonitorRecMutexTest.h>
diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h b/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
index e5cc7d5ebda..1d86d92d476 100644
--- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.h
+++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.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 MONITOR_REC_MUTEX_TEST_H
#define MONITOR_REC_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/MutexTest.cpp b/cpp/test/IceUtil/thread/MutexTest.cpp
index fa3d1ecd36c..6ae2d136480 100644
--- a/cpp/test/IceUtil/thread/MutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MutexTest.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 <IceUtil/IceUtil.h>
#include <MutexTest.h>
diff --git a/cpp/test/IceUtil/thread/MutexTest.h b/cpp/test/IceUtil/thread/MutexTest.h
index 19238b4607a..8d4447a1a3f 100644
--- a/cpp/test/IceUtil/thread/MutexTest.h
+++ b/cpp/test/IceUtil/thread/MutexTest.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 MUTEX_TEST_H
#define MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/RWRecMutexTest.cpp b/cpp/test/IceUtil/thread/RWRecMutexTest.cpp
index 48b1edb23a2..d225861eacb 100644
--- a/cpp/test/IceUtil/thread/RWRecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/RWRecMutexTest.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 <IceUtil/IceUtil.h>
#include <RWRecMutexTest.h>
diff --git a/cpp/test/IceUtil/thread/RWRecMutexTest.h b/cpp/test/IceUtil/thread/RWRecMutexTest.h
index a3a7b4a271d..40a81a9707d 100644
--- a/cpp/test/IceUtil/thread/RWRecMutexTest.h
+++ b/cpp/test/IceUtil/thread/RWRecMutexTest.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 RW_REC_MUTEX_TEST_H
#define RE_REC_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/RecMutexTest.cpp b/cpp/test/IceUtil/thread/RecMutexTest.cpp
index 44673fab719..ea9a887fda0 100644
--- a/cpp/test/IceUtil/thread/RecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/RecMutexTest.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 <IceUtil/IceUtil.h>
#include <RecMutexTest.h>
diff --git a/cpp/test/IceUtil/thread/RecMutexTest.h b/cpp/test/IceUtil/thread/RecMutexTest.h
index cd149949dda..353df8d40a6 100644
--- a/cpp/test/IceUtil/thread/RecMutexTest.h
+++ b/cpp/test/IceUtil/thread/RecMutexTest.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 REC_MUTEX_TEST_H
#define REC_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/StartTest.cpp b/cpp/test/IceUtil/thread/StartTest.cpp
index 791ffba4b27..4774fdaffb3 100644
--- a/cpp/test/IceUtil/thread/StartTest.cpp
+++ b/cpp/test/IceUtil/thread/StartTest.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 <IceUtil/IceUtil.h>
#include <stdio.h>
diff --git a/cpp/test/IceUtil/thread/StartTest.h b/cpp/test/IceUtil/thread/StartTest.h
index bf9f13602f5..5e91df42136 100644
--- a/cpp/test/IceUtil/thread/StartTest.h
+++ b/cpp/test/IceUtil/thread/StartTest.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 START_TEST_H
#define START_TEST_H
diff --git a/cpp/test/IceUtil/thread/StaticMutexTest.cpp b/cpp/test/IceUtil/thread/StaticMutexTest.cpp
index 34635a35ead..0c37a7cefb5 100644
--- a/cpp/test/IceUtil/thread/StaticMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/StaticMutexTest.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 <IceUtil/IceUtil.h>
#include <StaticMutexTest.h>
diff --git a/cpp/test/IceUtil/thread/StaticMutexTest.h b/cpp/test/IceUtil/thread/StaticMutexTest.h
index 19321512b16..2b0e54a1389 100644
--- a/cpp/test/IceUtil/thread/StaticMutexTest.h
+++ b/cpp/test/IceUtil/thread/StaticMutexTest.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 STATIC_MUTEX_TEST_H
#define STATIC_MUTEX_TEST_H
diff --git a/cpp/test/IceUtil/thread/TestBase.cpp b/cpp/test/IceUtil/thread/TestBase.cpp
index 83093580b3d..3e7da6a7e55 100644
--- a/cpp/test/IceUtil/thread/TestBase.cpp
+++ b/cpp/test/IceUtil/thread/TestBase.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 <IceUtil/IceUtil.h>
#include <TestBase.h>
diff --git a/cpp/test/IceUtil/thread/TestBase.h b/cpp/test/IceUtil/thread/TestBase.h
index e7b840eff3f..26c2d2dd924 100644
--- a/cpp/test/IceUtil/thread/TestBase.h
+++ b/cpp/test/IceUtil/thread/TestBase.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 TEST_BASE_H
#define TEST_BASE_H
diff --git a/cpp/test/IceUtil/thread/TestSuite.cpp b/cpp/test/IceUtil/thread/TestSuite.cpp
index e261f6dccc0..c933840624a 100644
--- a/cpp/test/IceUtil/thread/TestSuite.cpp
+++ b/cpp/test/IceUtil/thread/TestSuite.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 <TestSuite.h>
#include <CountDownLatchTest.h>
#include <MutexTest.h>
diff --git a/cpp/test/IceUtil/thread/TestSuite.h b/cpp/test/IceUtil/thread/TestSuite.h
index b0ab3e1c229..429b02479d7 100644
--- a/cpp/test/IceUtil/thread/TestSuite.h
+++ b/cpp/test/IceUtil/thread/TestSuite.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 TEST_SUITE_H
#define TEST_SUITE_H
diff --git a/cpp/test/IceUtil/thread/run.py b/cpp/test/IceUtil/thread/run.py
index 876a014b6a5..711fe3912fe 100755
--- a/cpp/test/IceUtil/thread/run.py
+++ b/cpp/test/IceUtil/thread/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceUtil/unicode/Client.cpp b/cpp/test/IceUtil/unicode/Client.cpp
index 522256c6af3..7b7432bef29 100644
--- a/cpp/test/IceUtil/unicode/Client.cpp
+++ b/cpp/test/IceUtil/unicode/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 <IceUtil/Unicode.h>
#include <TestCommon.h>
#include <fstream>
diff --git a/cpp/test/IceUtil/unicode/Makefile b/cpp/test/IceUtil/unicode/Makefile
index 93c28e32751..1874d2ea655 100644
--- a/cpp/test/IceUtil/unicode/Makefile
+++ b/cpp/test/IceUtil/unicode/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/IceUtil/unicode/run.py b/cpp/test/IceUtil/unicode/run.py
index 2b6251ab237..d9385d3b429 100755
--- a/cpp/test/IceUtil/unicode/run.py
+++ b/cpp/test/IceUtil/unicode/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/IceUtil/uuid/Client.cpp b/cpp/test/IceUtil/uuid/Client.cpp
index f01fefc1769..293aa8c3602 100644
--- a/cpp/test/IceUtil/uuid/Client.cpp
+++ b/cpp/test/IceUtil/uuid/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 <IceUtil/UUID.h>
#include <IceUtil/Time.h>
#include <TestCommon.h>
diff --git a/cpp/test/IceUtil/uuid/Makefile b/cpp/test/IceUtil/uuid/Makefile
index 93c28e32751..1874d2ea655 100644
--- a/cpp/test/IceUtil/uuid/Makefile
+++ b/cpp/test/IceUtil/uuid/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/IceUtil/uuid/run.py b/cpp/test/IceUtil/uuid/run.py
index c409ff641c1..e52a1dde3d0 100755
--- a/cpp/test/IceUtil/uuid/run.py
+++ b/cpp/test/IceUtil/uuid/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 [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/Makefile b/cpp/test/Makefile
index d6c9d0a6f4c..933fc016466 100644
--- a/cpp/test/Makefile
+++ b/cpp/test/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 = ..
include $(top_srcdir)/config/Make.rules
diff --git a/cpp/test/Slice/errorDetection/CaseInsensitive.ice b/cpp/test/Slice/errorDetection/CaseInsensitive.ice
index 9e6eed087de..d246347b901 100644
--- a/cpp/test/Slice/errorDetection/CaseInsensitive.ice
+++ b/cpp/test/Slice/errorDetection/CaseInsensitive.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.
//
// **********************************************************************
+
interface i1
{
void op();
diff --git a/cpp/test/Slice/errorDetection/CaseSensitive.ice b/cpp/test/Slice/errorDetection/CaseSensitive.ice
index 851972cffde..2e50d5c073c 100644
--- a/cpp/test/Slice/errorDetection/CaseSensitive.ice
+++ b/cpp/test/Slice/errorDetection/CaseSensitive.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, 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.
//
// **********************************************************************
+
module M1
{
};
diff --git a/cpp/test/Slice/errorDetection/ChangedMeaning.ice b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
index e7fc3ad6fdb..81e1b7669fd 100644
--- a/cpp/test/Slice/errorDetection/ChangedMeaning.ice
+++ b/cpp/test/Slice/errorDetection/ChangedMeaning.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, 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.
//
// **********************************************************************
+
sequence<long> ls;
struct s00
diff --git a/cpp/test/Slice/errorDetection/ClassRedefinition.ice b/cpp/test/Slice/errorDetection/ClassRedefinition.ice
index 7fe9a575034..9570ea69f23 100644
--- a/cpp/test/Slice/errorDetection/ClassRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/ClassRedefinition.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.
//
// **********************************************************************
+
interface Foo { long op(); };
class Class1 implements Foo { byte b; };
class Class1 implements Foo { long l; };
diff --git a/cpp/test/Slice/errorDetection/ConstDef.ice b/cpp/test/Slice/errorDetection/ConstDef.ice
index e82b9f9c0ea..b773e5c08a5 100644
--- a/cpp/test/Slice/errorDetection/ConstDef.ice
+++ b/cpp/test/Slice/errorDetection/ConstDef.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, 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.
//
// **********************************************************************
+
//
// Basic checks (all OK)
//
diff --git a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice b/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
index 74f035941d6..a3c69a17a0b 100644
--- a/cpp/test/Slice/errorDetection/DataMemberRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DataMemberRedefinition.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.
//
// **********************************************************************
+
class C
{
int member;
diff --git a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice b/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
index 7c0691ee393..c2c00fa758a 100644
--- a/cpp/test/Slice/errorDetection/DeclaratorMissing.ice
+++ b/cpp/test/Slice/errorDetection/DeclaratorMissing.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.
//
// **********************************************************************
+
interface Foo
{
int bar(string, long l, out bool, out short s);
diff --git a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice b/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
index ca9ecb93239..9615678b86d 100644
--- a/cpp/test/Slice/errorDetection/DerivedRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DerivedRedefinition.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.
//
// **********************************************************************
+
interface Base1
{
void op();
diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
index 16e57aeb547..c461230a9f5 100644
--- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.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.
//
// **********************************************************************
+
dictionary<int, long> Dictionary;
dictionary<int, long> Dictionary;
dictionary<int, long> foo;
diff --git a/cpp/test/Slice/errorDetection/DuplicateParameter.ice b/cpp/test/Slice/errorDetection/DuplicateParameter.ice
index 63ab01d5f2a..69a4870740f 100644
--- a/cpp/test/Slice/errorDetection/DuplicateParameter.ice
+++ b/cpp/test/Slice/errorDetection/DuplicateParameter.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.
//
// **********************************************************************
+
class Foo
{
long l;
diff --git a/cpp/test/Slice/errorDetection/DuplicateThrows.ice b/cpp/test/Slice/errorDetection/DuplicateThrows.ice
index 8c99d0b2d8c..81a1743245f 100644
--- a/cpp/test/Slice/errorDetection/DuplicateThrows.ice
+++ b/cpp/test/Slice/errorDetection/DuplicateThrows.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, 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.
//
// **********************************************************************
+
exception e {};
exception e2 {};
interface i2 { void op() throws ::e, e; };
diff --git a/cpp/test/Slice/errorDetection/EnumEmpty.ice b/cpp/test/Slice/errorDetection/EnumEmpty.ice
index 7f366ba5dae..34e452e6521 100644
--- a/cpp/test/Slice/errorDetection/EnumEmpty.ice
+++ b/cpp/test/Slice/errorDetection/EnumEmpty.ice
@@ -1,15 +1,15 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, 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.
//
// **********************************************************************
+
enum foo {};
diff --git a/cpp/test/Slice/errorDetection/EnumRedefinition.ice b/cpp/test/Slice/errorDetection/EnumRedefinition.ice
index cb803a2a9e2..d951aa3c8f8 100644
--- a/cpp/test/Slice/errorDetection/EnumRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/EnumRedefinition.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// 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.
//
// **********************************************************************
+
enum E1 { A, B, C };
enum E1 { D, E, F };
diff --git a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
index 7ba89e11f7f..682ceea93c8 100644
--- a/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/EnumeratorRedefinition.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// 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.
//
// **********************************************************************
+
enum Enum1 { A, B, C };
enum Enum2 { A, B, E };
diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice b/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
index e809768abdf..84abdf65e62 100644
--- a/cpp/test/Slice/errorDetection/IdentAsKeyword.ice
+++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.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.
//
// **********************************************************************
+
INTERFACE i { void op(); };
exception Void {};
diff --git a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
index d2d6dbf9e63..7ad0bdec8c7 100644
--- a/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
+++ b/cpp/test/Slice/errorDetection/IllegalDeclaration.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// 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.
//
// **********************************************************************
+
exception E;
struct S;
diff --git a/cpp/test/Slice/errorDetection/IllegalDictionary.ice b/cpp/test/Slice/errorDetection/IllegalDictionary.ice
index 9e8190c90ee..b83f48d088f 100644
--- a/cpp/test/Slice/errorDetection/IllegalDictionary.ice
+++ b/cpp/test/Slice/errorDetection/IllegalDictionary.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, 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.
//
// **********************************************************************
+
dictionary<bool, long> d1; // OK
dictionary<byte, long> d2; // OK
dictionary<short, long> d3; // OK
diff --git a/cpp/test/Slice/errorDetection/IllegalLocal.ice b/cpp/test/Slice/errorDetection/IllegalLocal.ice
index b20d9042ff4..dce7da03fb5 100644
--- a/cpp/test/Slice/errorDetection/IllegalLocal.ice
+++ b/cpp/test/Slice/errorDetection/IllegalLocal.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, 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.
//
// **********************************************************************
+
interface i1 {};
local interface i2 extends i1 {}; // OK
diff --git a/cpp/test/Slice/errorDetection/IllegalMI.ice b/cpp/test/Slice/errorDetection/IllegalMI.ice
index 905d88fbda2..4376479b2ea 100644
--- a/cpp/test/Slice/errorDetection/IllegalMI.ice
+++ b/cpp/test/Slice/errorDetection/IllegalMI.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.
//
// **********************************************************************
+
module M1
{
diff --git a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
index 3f8a2f8f2c7..c362ab85eb6 100644
--- a/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.ice
+++ b/cpp/test/Slice/errorDetection/IllegalUseOfKeyword.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.
//
// **********************************************************************
+
exception module;
exception void
{
diff --git a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice b/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
index a4d318f842e..1543f0948a0 100644
--- a/cpp/test/Slice/errorDetection/InterfaceMismatch.ice
+++ b/cpp/test/Slice/errorDetection/InterfaceMismatch.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.
//
// **********************************************************************
+
interface Foo1;
class Foo1;
class Foo1 { void op(); };
diff --git a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice b/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
index 079c2598fba..887ccb84e43 100644
--- a/cpp/test/Slice/errorDetection/InterfaceRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/InterfaceRedefinition.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.
//
// **********************************************************************
+
interface Intf1 { void op(); };
interface Intf1 { void op(); };
interface Intf1;
diff --git a/cpp/test/Slice/errorDetection/LocalMismatch.ice b/cpp/test/Slice/errorDetection/LocalMismatch.ice
index 95cfb1af655..ed4e454593b 100644
--- a/cpp/test/Slice/errorDetection/LocalMismatch.ice
+++ b/cpp/test/Slice/errorDetection/LocalMismatch.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.
//
// **********************************************************************
+
interface Intf1;
local interface Intf1;
local interface Intf1 { void op(); };
diff --git a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
index 607f51df1b3..243e7f100ba 100644
--- a/cpp/test/Slice/errorDetection/NameCanNotBeUsed.ice
+++ b/cpp/test/Slice/errorDetection/NameCanNotBeUsed.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.
//
// **********************************************************************
+
class Foo
{
void Foo();
diff --git a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice b/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
index e45e68518fc..e64d1afaf11 100644
--- a/cpp/test/Slice/errorDetection/NotClassOrInterface.ice
+++ b/cpp/test/Slice/errorDetection/NotClassOrInterface.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.
//
// **********************************************************************
+
sequence<int> Seq;
sequence<int> Sequence1;
sequence<int> Sequence2;
diff --git a/cpp/test/Slice/errorDetection/NotException.ice b/cpp/test/Slice/errorDetection/NotException.ice
index b9f071b05e3..00f09483bde 100644
--- a/cpp/test/Slice/errorDetection/NotException.ice
+++ b/cpp/test/Slice/errorDetection/NotException.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.
//
// **********************************************************************
+
module M
{
diff --git a/cpp/test/Slice/errorDetection/NotType.ice b/cpp/test/Slice/errorDetection/NotType.ice
index 887eae4da17..d39d49bb19c 100644
--- a/cpp/test/Slice/errorDetection/NotType.ice
+++ b/cpp/test/Slice/errorDetection/NotType.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.
//
// **********************************************************************
+
module Module1 { };
module Module2 { };
module Module3 { };
diff --git a/cpp/test/Slice/errorDetection/OperationRedefinition.ice b/cpp/test/Slice/errorDetection/OperationRedefinition.ice
index 805aa79da0b..5f438d4b4cd 100644
--- a/cpp/test/Slice/errorDetection/OperationRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/OperationRedefinition.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.
//
// **********************************************************************
+
class C
{
void operation();
diff --git a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
index 791a4abaa6f..ccbb63b2121 100644
--- a/cpp/test/Slice/errorDetection/ParamsOutOfOrder.ice
+++ b/cpp/test/Slice/errorDetection/ParamsOutOfOrder.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.
//
// **********************************************************************
+
interface Foo
{
void bar(long l1, out long l2, long l3);
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice b/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
index 1a73e7138b2..32e1531d99a 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsClass.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsClass.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.
//
// **********************************************************************
+
sequence<int> Sequence1;
class Sequence1;
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
index a9c9358dae2..6130ae4644b 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsDataMember.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.
//
// **********************************************************************
+
class C
{
void operation();
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
index b2c4a464b8f..37a6552babc 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsDictionary.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// 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.
//
// **********************************************************************
+
class C { long l; };
dictionary<string, int> C;
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
index 82bc756cb0d..f310276a5c0 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnum.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// 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.
//
// **********************************************************************
+
class C { long l; };
enum C { A, B, C };
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice
index 29c5f0ca8c7..957b25982b1 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsEnumerator.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.
//
// **********************************************************************
+
class C { long l; };
sequence<int> Seq;
enum E { C, Seq, blah };
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
index e5b1ead69f6..908708f87a9 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsInterface.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsInterface.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.
//
// **********************************************************************
+
sequence<int> Sequence1;
interface Sequence1;
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice b/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
index abf2f743e69..a33ba4626a3 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsModule.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsModule.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.
//
// **********************************************************************
+
sequence<int> Seq;
module Seq;
module Mod { };
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
index 831faab2a83..6c44335fd6e 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsOperation.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsOperation.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.
//
// **********************************************************************
+
class C
{
int member;
diff --git a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
index fb7e73cd7b5..8a537f11eed 100644
--- a/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
+++ b/cpp/test/Slice/errorDetection/RedefinitionAsSequence.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// 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.
//
// **********************************************************************
+
class C { long l; };
sequence<int> C;
diff --git a/cpp/test/Slice/errorDetection/Reserved.ice b/cpp/test/Slice/errorDetection/Reserved.ice
index 08fc1ceee5b..63ff7d7d4cc 100644
--- a/cpp/test/Slice/errorDetection/Reserved.ice
+++ b/cpp/test/Slice/errorDetection/Reserved.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.
//
// **********************************************************************
+
#include <include/IcePrefix.ice> // No error should be caused by this file
module OK
diff --git a/cpp/test/Slice/errorDetection/SelfContainment.ice b/cpp/test/Slice/errorDetection/SelfContainment.ice
index b2e81a94823..e9fd5ae5d31 100644
--- a/cpp/test/Slice/errorDetection/SelfContainment.ice
+++ b/cpp/test/Slice/errorDetection/SelfContainment.ice
@@ -1,17 +1,17 @@
// **********************************************************************
//
-// Copyright (c) 2003
+// Copyright (c) 2003 - 2004
// ZeroC, Inc.
-// Huntsville, AL, 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.
//
// **********************************************************************
+
struct x
{
int i;
diff --git a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
index 224db53bacd..7d4370d43b2 100644
--- a/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/SequenceRedefinition.ice
@@ -1,16 +1,16 @@
// **********************************************************************
//
-// 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.
//
// **********************************************************************
+
sequence<int> Seq;
sequence<int> Seq;
diff --git a/cpp/test/Slice/errorDetection/StructMembers.ice b/cpp/test/Slice/errorDetection/StructMembers.ice
index 601aa8bb267..705778c1b4c 100644
--- a/cpp/test/Slice/errorDetection/StructMembers.ice
+++ b/cpp/test/Slice/errorDetection/StructMembers.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.
//
// **********************************************************************
+
struct s1 // Illegal empty struct
{
};
diff --git a/cpp/test/Slice/errorDetection/Undefined.ice b/cpp/test/Slice/errorDetection/Undefined.ice
index d87eb0d8a1e..067f68ec365 100644
--- a/cpp/test/Slice/errorDetection/Undefined.ice
+++ b/cpp/test/Slice/errorDetection/Undefined.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.
//
// **********************************************************************
+
sequence<Foo> FooSequence;
dictionary<Foo, Bar> FooBarDictionary;
interface BarIntf extends Foo { void op(); };
diff --git a/cpp/test/Slice/errorDetection/WrongProxyType.ice b/cpp/test/Slice/errorDetection/WrongProxyType.ice
index 8d23164a507..e3033579b8d 100644
--- a/cpp/test/Slice/errorDetection/WrongProxyType.ice
+++ b/cpp/test/Slice/errorDetection/WrongProxyType.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.
//
// **********************************************************************
+
sequence<int> Seq;
dictionary<Seq, int> Dict;
diff --git a/cpp/test/Slice/errorDetection/include/IcePrefix.ice b/cpp/test/Slice/errorDetection/include/IcePrefix.ice
index 2181fe53c97..bc86c2bcf08 100644
--- a/cpp/test/Slice/errorDetection/include/IcePrefix.ice
+++ b/cpp/test/Slice/errorDetection/include/IcePrefix.ice
@@ -1,15 +1,15 @@
// **********************************************************************
//
-// 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.
//
// **********************************************************************
+
module IceSomething {};
diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py
index 32faa3cb45f..a676b64246d 100755
--- a/cpp/test/Slice/errorDetection/run.py
+++ b/cpp/test/Slice/errorDetection/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, re
for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h
index edefac9ba98..f62214209c1 100644
--- a/cpp/test/include/TestCommon.h
+++ b/cpp/test/include/TestCommon.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 TEST_COMMON_H
#define TEST_COMMON_H